Extract required(...) method

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

diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/DmaapResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/DmaapResource.java
index d7fb507..955cab7 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/DmaapResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/DmaapResource.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,11 +24,14 @@
 package org.onap.dmaap.dbcapi.resources;
 
 
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
+import org.onap.dmaap.dbcapi.model.ApiError;
+import org.onap.dmaap.dbcapi.model.Dmaap;
+import org.onap.dmaap.dbcapi.service.DmaapService;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -41,13 +44,6 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
-import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
-import org.onap.dmaap.dbcapi.model.ApiError;
-import org.onap.dmaap.dbcapi.model.Dmaap;
-import org.onap.dmaap.dbcapi.service.ApiService;
-import org.onap.dmaap.dbcapi.service.DmaapService;
-
-
 
 @Path("/dmaap")
 @Api( value= "dmaap", description = "Endpoint for this instance of DMaaP object containing values for this OpenDCAE deployment" )
@@ -59,7 +55,8 @@ public class DmaapResource extends BaseLoggingClass {
 
        private DmaapService dmaapService = new DmaapService();
        private ResponseBuilder responseBuilder = new ResponseBuilder();
-       
+       private RequiredChecker checker = new RequiredChecker();
+
        @GET
        @ApiOperation( value = "return dmaap details", notes = "returns the `dmaap` object, which contains system wide configuration settings", response = Dmaap.class)
     @ApiResponses( value = {
@@ -71,7 +68,7 @@ public class DmaapResource extends BaseLoggingClass {
                Dmaap d =  dmaapService.getDmaap();
                return responseBuilder.success(d);
        }
-       
+
        @POST
        @ApiOperation( value = "return dmaap details", notes = "Create a new DMaaP set system wide configuration settings for the *dcaeEnvironment*.  Deprecated with introduction of persistence in 1610.", response = Dmaap.class)
     @ApiResponses( value = {
@@ -79,26 +76,22 @@ public class DmaapResource extends BaseLoggingClass {
         @ApiResponse( code = 400, message = "Error", response = ApiError.class )
     })
        public Response addDmaap( Dmaap obj ) {
-               ApiService check = new ApiService();    
 
-               try { //check for required fields
-                       check.required( "dmaapName", obj.getDmaapName(), "^\\S+$" );  //no white space allowed in dmaapName
-                       check.required( "dmaapProvUrl", obj.getDrProvUrl(), "" );
-                       check.required( "topicNsRoot", obj.getTopicNsRoot(), "" );
-                       check.required( "bridgeAdminTopic", obj.getBridgeAdminTopic(), "" );
+               try {
+                       validateRequiredFields(obj);
                } catch( RequiredFieldException rfe ) {
-                       return responseBuilder.error(check.getErr());
+                       return responseBuilder.error(rfe.getApiError());
                }
-       
+
                Dmaap d =  dmaapService.addDmaap(obj);
                if ( d == null ) {
                        return responseBuilder.notFound();
 
-               } 
+               }
 
                return responseBuilder.success(d);
        }
-       
+
        @PUT
        @ApiOperation( value = "return dmaap details", notes = "Update system settings for *dcaeEnvironment*.", response = Dmaap.class)
     @ApiResponses( value = {
@@ -106,23 +99,25 @@ public class DmaapResource extends BaseLoggingClass {
         @ApiResponse( code = 400, message = "Error", response = ApiError.class )
     })
        public Response updateDmaap(  Dmaap obj ) {
-               ApiService check = new ApiService();
 
-               try { //check for required fields
-                       check.required( "dmaapName", obj.getDmaapName(), "^\\S+$" );  //no white space allowed in dmaapName
-                       check.required( "dmaapProvUrl", obj.getDrProvUrl(), "" );
-                       check.required( "topicNsRoot", obj.getTopicNsRoot(), "" );
-                       check.required( "bridgeAdminTopic", obj.getBridgeAdminTopic(), "" );
+               try {
+                       validateRequiredFields(obj);
                } catch( RequiredFieldException rfe ) {
-                       return responseBuilder.error(check.getErr());
+                       return responseBuilder.error(rfe.getApiError());
                }
+
                Dmaap d =  dmaapService.updateDmaap(obj);
                if ( d != null ) {
                        return responseBuilder.success(d);
                } else {
                        return responseBuilder.notFound();
-               }       
+               }
+       }
+
+       private void validateRequiredFields(Dmaap obj) throws RequiredFieldException {
+               checker.required( "dmaapName", obj.getDmaapName(), "^\\S+$" );  //no white space allowed in dmaapName
+               checker.required( "dmaapProvUrl", obj.getDrProvUrl());
+               checker.required( "topicNsRoot", obj.getTopicNsRoot());
+               checker.required( "bridgeAdminTopic", obj.getBridgeAdminTopic());
        }
-       
-       
 }