X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FTopicResource.java;h=96b6a4ab8049cd914e1049a158b695473cb06de1;hb=31cbc922a7971a5f20d5790a1fbbd6b38a49af13;hp=4f442c91320e4ea453eddb4088fd44393ab118e1;hpb=93a4c80c63d074ff15ce81c894f0921fab1d7bef;p=dmaap%2Fdbcapi.git

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..96b6a4a 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
@@ -63,6 +63,7 @@ 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();
 	
 	public TopicResource() {
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
@@ -109,12 +110,12 @@ public class TopicResource extends BaseLoggingClass {
 		ApiService check = new ApiService();
 
 		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();
@@ -182,10 +183,10 @@ public class TopicResource extends BaseLoggingClass {
 		ApiService check = new ApiService();
 
 		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());
@@ -212,10 +213,10 @@ public class TopicResource extends BaseLoggingClass {
 		ApiService check = new ApiService();
 
 		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() );
 		if ( mrc == null ) {