Refactor tests for TopicResource class

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / resources / TopicResource.java

diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
index 4f442c9..01926b7 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
@@ -46,7 +46,6 @@ import org.onap.dmaap.dbcapi.model.ApiError;
 import org.onap.dmaap.dbcapi.model.ReplicationType;
 import org.onap.dmaap.dbcapi.model.FqtnType;
 import org.onap.dmaap.dbcapi.model.Topic;
-import org.onap.dmaap.dbcapi.service.ApiService;
 import org.onap.dmaap.dbcapi.service.TopicService;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
@@ -63,6 +62,8 @@ public class TopicResource extends BaseLoggingClass {
        private static String defaultReplicationCount;
        private TopicService mr_topicService = new TopicService();
        private ResponseBuilder responseBuilder = new ResponseBuilder();
+       private RequiredChecker checker = new RequiredChecker();
+       static final String UNSUPPORTED_PUT_MSG = "Method /PUT not supported for /topics";
        
        public TopicResource() {
                DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
@@ -101,20 +102,17 @@ public class TopicResource extends BaseLoggingClass {
            @ApiResponse( code = 200, message = "Success", response = Topic.class),
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
-       public Response  addTopic( 
-                       Topic topic,
-                       @QueryParam("useExisting") String useExisting
-                       ) {
+       public Response  addTopic(Topic topic, @QueryParam("useExisting") String useExisting) {
                logger.info( "addTopic request: " + topic  + " useExisting=" + useExisting );
-               ApiService check = new ApiService();
+               ApiError apiError = new ApiError();
 
                try {
-                       check.required( "topicName", topic.getTopicName(), "^\\S+$" );  //no white space allowed in topicName
-                       check.required( "topicDescription", topic.getTopicDescription(), "" );
-                       check.required( "owner", topic.getOwner(), "" );
+                       checker.required( "topicName", topic.getTopicName(), "^\\S+$" );  //no white space allowed in topicName
+                       checker.required( "topicDescription", topic.getTopicDescription());
+                       checker.required( "owner", topic.getOwner());
                } catch( RequiredFieldException rfe ) {
-                       logger.error("Error", rfe);
-                       return responseBuilder.error(check.getErr());
+                       logger.error("Error", rfe.getApiError());
+                       return responseBuilder.error(rfe.getApiError());
                }
                
                ReplicationType t = topic.getReplicationCase();
@@ -140,11 +138,11 @@ public class TopicResource extends BaseLoggingClass {
                        flag = "true".compareToIgnoreCase( useExisting ) == 0;
                }
                
-               Topic mrc =  mr_topicService.addTopic(topic, check.getErr(), flag);
-               if ( mrc != null && check.getErr().is2xx() ) {
+               Topic mrc =  mr_topicService.addTopic(topic, apiError, flag);
+               if ( mrc != null && apiError.is2xx() ) {
                        return responseBuilder.success(CREATED.getStatusCode(), mrc);
                }
-               return responseBuilder.error(check.getErr());
+               return responseBuilder.error(apiError);
        }
        
        @PUT
@@ -156,15 +154,13 @@ public class TopicResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        @Path("/{topicId}")
-       public Response updateTopic( 
-                       @PathParam("topicId") String topicId
-                       ) {
-               ApiService check = new ApiService();
+       public Response updateTopic(@PathParam("topicId") String topicId) {
+               ApiError apiError = new ApiError();
 
-               check.setCode(Status.BAD_REQUEST.getStatusCode());
-               check.setMessage( "Method /PUT not supported for /topics");
+               apiError.setCode(Status.BAD_REQUEST.getStatusCode());
+               apiError.setMessage(UNSUPPORTED_PUT_MSG);
                
-               return responseBuilder.error(check.getErr());
+               return responseBuilder.error(apiError);
        }
                
        @DELETE
@@ -176,23 +172,21 @@ public class TopicResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        @Path("/{topicId}")
-       public Response deleteTopic( 
-                       @PathParam("topicId") String id
-                       ){
-               ApiService check = new ApiService();
+       public Response deleteTopic(@PathParam("topicId") String id){
+               ApiError apiError = new ApiError();
 
                try {
-                       check.required( "fqtn", id, "" );
+                       checker.required( "fqtn", id);
                } catch( RequiredFieldException rfe ) {
-                       logger.error("Error", rfe);
-                       return responseBuilder.error(check.getErr());
+                       logger.error("Error", rfe.getApiError());
+                       return responseBuilder.error(rfe.getApiError());
                }
                
-               mr_topicService.removeTopic(id, check.getErr());
-               if ( check.getErr().is2xx()) {
+               mr_topicService.removeTopic(id, apiError);
+               if (apiError.is2xx()) {
                        return responseBuilder.success(Status.NO_CONTENT.getStatusCode(), null);
                } 
-               return responseBuilder.error(check.getErr());
+               return responseBuilder.error(apiError);
        }
        
 
@@ -205,21 +199,19 @@ public class TopicResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        @Path("/{topicId}")
-       public Response getTopic( 
-                       @PathParam("topicId") String id
-                       ) {
+       public Response getTopic(@PathParam("topicId") String id) {
                logger.info("Entry: /GET " + id);
-               ApiService check = new ApiService();
+               ApiError apiError = new ApiError();
 
                try {
-                       check.required( "topicName", id, "^\\S+$" );  //no white space allowed in topicName
+                       checker.required( "topicName", id, "^\\S+$" );  //no white space allowed in topicName
                } catch( RequiredFieldException rfe ) {
-                       logger.error("Error", rfe);
-                       return responseBuilder.error(check.getErr());
+                       logger.error("Error", rfe.getApiError());
+                       return responseBuilder.error(rfe.getApiError());
                }
-               Topic mrc =  mr_topicService.getTopic( id, check.getErr() );
+               Topic mrc =  mr_topicService.getTopic(id, apiError);
                if ( mrc == null ) {
-                       return responseBuilder.error(check.getErr());
+                       return responseBuilder.error(apiError);
                }
                return responseBuilder.success(mrc);
                }