X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FDR_SubService.java;h=0a583a0db0082e58f461eeb25bb9324c5575742e;hb=c52d9c91d54f7e8b0500cebba00255b3e6b08c13;hp=2fd75d09e562578f9ab76798617bad9172344491;hpb=f633d09a8006467fb94f0fe9e44133f5c36434f0;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java
index 2fd75d0..0a583a0 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java
@@ -65,11 +65,11 @@ public class DR_SubService extends BaseLoggingClass {
 		
 	public List<DR_Sub> getAllDr_Subs() {
 		logger.debug( "enter getAllDR_Subs()");
-		return new ArrayList<DR_Sub>(dr_subs.values());
+		return new ArrayList<>(dr_subs.values());
 	}
 	
 	public ArrayList<DR_Sub> getDr_SubsByFeedId( String pubId ) {
-		ArrayList<DR_Sub> someSubs = new ArrayList<DR_Sub>();
+		ArrayList<DR_Sub> someSubs = new ArrayList<>();
 		for( DR_Sub sub : dr_subs.values() ) {
 			if ( pubId.equals(  sub.getFeedId()  )) {
 				someSubs.add( sub );
@@ -98,7 +98,7 @@ public class DR_SubService extends BaseLoggingClass {
 		String resp = prov.doPostDr_Sub( sub, apiError );
 		if ( "Yes".equals(unit_test) ) {
 			resp = simulateResp( sub, "POST" );
-			apiError.setCode(200);
+			apiError.setCode(201);
 		}
 		logger.debug( "addDr_Sub resp=" + resp );
 
@@ -110,7 +110,7 @@ public class DR_SubService extends BaseLoggingClass {
 			snew.setLastMod();
 			addEgressRoute( snew, apiError );
 			dr_subs.put( snew.getSubId(), snew );	
-			apiError.setCode(200);
+			apiError.setCode(201);
 		} else {
 			apiError.setCode(400);
 		}
@@ -173,6 +173,11 @@ public class DR_SubService extends BaseLoggingClass {
 	}
 		
 	public void removeDr_Sub( String key, ApiError apiError ) {
+		removeDr_Sub( key, apiError, true );
+		return;
+	}
+	
+	public void removeDr_Sub( String key, ApiError apiError, boolean hitDR ) {
 		logger.debug( "enter removeDR_Subs()");
 		
 		DR_Sub sub = dr_subs.get( key );
@@ -180,11 +185,15 @@ public class DR_SubService extends BaseLoggingClass {
 			apiError.setCode(Status.NOT_FOUND.getStatusCode());
 			apiError.setFields( "subId");
 			apiError.setMessage("subId " + key + " not found");
-		} else {	
-			DrProvConnection prov = new DrProvConnection();
-			prov.makeSubPutConnection( key );
-			String resp = prov.doDeleteDr_Sub( sub, apiError );
-			logger.debug( "resp=" + resp );
+		} else {
+			if ( hitDR ) {
+				DrProvConnection prov = new DrProvConnection();
+				prov.makeSubPutConnection( key );
+				String resp = prov.doDeleteDr_Sub( sub, apiError );
+				logger.debug( "resp=" + resp );
+			} else {
+				apiError.setCode(200);
+			}
 			
 			if ( apiError.is2xx() || unit_test.equals( "Yes" ) ) {
 				dr_subs.remove(key);
@@ -209,8 +218,8 @@ public class DR_SubService extends BaseLoggingClass {
 			server, subid, sub.getUsername(), sub.getUserpwd());
 		String links = String.format( "\"links\": {\"feed\": \"https://dr-prov/feedlog/%s\", \"self\": \"https://dr-prov/sub/%s\", \"log\": \"https://dr-prov/sublog/%s\" }", 
 				sub.getFeedId(),
-				sub.getSubId(),
-				sub.getSubId() );
+				subid,
+				subid );
 		ret += links + "}";
 		logger.info( "DR_SubService:simulateResp=" + ret);