Author: jbernhardt Date: Mon Jan 21 13:57:47 2013 New Revision: 1436350 URL: http://svn.apache.org/viewvc?rev=1436350&view=rev Log: [SYNCOPE-281] Removed redundant annotations
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java syncope/trunk/common/src/main/java/org/apache/syncope/common/services/LoggerService.java syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java?rev=1436350&r1=1436349&r2=1436350&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java Mon Jan 21 13:57:47 2013 @@ -19,6 +19,7 @@ package org.apache.syncope.common.services; import java.util.List; + import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; @@ -34,8 +35,6 @@ import org.apache.syncope.common.to.Conn import org.apache.syncope.common.to.ConnInstanceTO; import org.apache.syncope.common.to.SchemaTO; import org.apache.syncope.common.types.ConnConfProperty; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; @Path("connectors") public interface ConnectorService { @@ -71,7 +70,6 @@ public interface ConnectorService { ConnInstanceTO read(@PathParam("connectorId") Long connectorId); @GET - @RequestMapping(method = RequestMethod.GET, value = "/{resourceName}/connectorBean") ConnInstanceTO readConnectorBean( @MatrixParam("resourceName") String resourceName); @@ -82,6 +80,5 @@ public interface ConnectorService { @POST @Path("validate") - @RequestMapping(method = RequestMethod.POST, value = "/check") boolean validate(ConnInstanceTO connectorTO); } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/LoggerService.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/LoggerService.java?rev=1436350&r1=1436349&r2=1436350&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/LoggerService.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/LoggerService.java Mon Jan 21 13:57:47 2013 @@ -18,8 +18,8 @@ */ package org.apache.syncope.common.services; -import ch.qos.logback.classic.Level; import java.util.List; + import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.PUT; @@ -28,30 +28,26 @@ import javax.ws.rs.PathParam; import org.apache.syncope.common.to.LoggerTO; import org.apache.syncope.common.types.AuditLoggerName; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; + +import ch.qos.logback.classic.Level; @Path("logger") public interface LoggerService { //TODO use list(LoggerType) signature for both normal logger and audit logger instead of two different methods @GET - @RequestMapping(method = RequestMethod.GET, value = "/log/list") List<LoggerTO> listLogs(); @GET @Path("audit") - @RequestMapping(method = RequestMethod.GET, value = "/audit/list") List<AuditLoggerName> listAudits(); @PUT @Path("{name}/level") - @RequestMapping(method = RequestMethod.POST, value = "/log/{name}/{level}") LoggerTO update(@PathParam("name") String name, Level level); @DELETE @Path("{name}") - @RequestMapping(method = RequestMethod.GET, value = "/log/delete/{name}") LoggerTO delete(@PathParam("name") String name); // TODO refactor this method to use update() Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java?rev=1436350&r1=1436349&r2=1436350&view=diff ============================================================================== --- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java Mon Jan 21 13:57:47 2013 @@ -19,6 +19,7 @@ package org.apache.syncope.common.services; import java.util.List; + import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; @@ -34,8 +35,6 @@ import javax.ws.rs.core.Response; import org.apache.syncope.common.to.ReportExecTO; import org.apache.syncope.common.to.ReportTO; import org.apache.syncope.common.types.ReportExecExportFormat; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; @Path("reports") public interface ReportService { @@ -86,11 +85,9 @@ public interface ReportService { @DELETE @Path("{reportId}") - @RequestMapping(method = RequestMethod.GET, value = "/delete/{reportId}") ReportTO delete(@PathParam("reportId") Long reportId); @DELETE @Path("executions/{executionId}") - @RequestMapping(method = RequestMethod.GET, value = "/execution/delete/{executionId}") ReportExecTO deleteExecution(@PathParam("executionId") Long executionId); }