Start of DR API diverge

Change-Id: I3ae888b3fb6b21172e1336002df7b5ba2674f339
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1000

4 files changed, 71 insertions, 28 deletions

diff --git a/pom.xml b/pom.xml
index 4592e2d..2650e46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,7 +381,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jettyVersion>9.4.12.RC2</jettyVersion> 
 		<eelf.version>1.0.0</eelf.version>
-		<artifact.version>1.0.20-SNAPSHOT</artifact.version>
+		<artifact.version>1.0.21-SNAPSHOT</artifact.version>
 		<!-- SONAR -->
 		<jacoco.version>0.7.7.201606060606</jacoco.version>
 		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
index cc6f02c..eda3653 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
@@ -28,6 +28,7 @@ import org.onap.dmaap.dbcapi.model.ApiError;
 import org.onap.dmaap.dbcapi.model.DR_Sub;
 import org.onap.dmaap.dbcapi.model.Feed;
 import org.onap.dmaap.dbcapi.service.DmaapService;
+import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
@@ -43,6 +44,10 @@ public class DrProvConnection extends BaseLoggingClass {
 	   
    
 	private String provURL;
+	private	String provApi;
+	private	String	behalfHeader;
+	private	String	feedContentType;
+	private	String	subContentType;
 	
 	private HttpsURLConnection uc;
 
@@ -52,6 +57,13 @@ public class DrProvConnection extends BaseLoggingClass {
 		if ( provURL.length() < 1 ) {
 			errorLogger.error( DmaapbcLogMessageEnum.PREREQ_DMAAP_OBJECT, "getDrProvUrl");
 		}
+		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
+		provApi = p.getProperty( "DR.provApi", "ONAP" );
+		behalfHeader = p.getProperty( "DR.onBehalfHeader", "X-DR-ON-BEHALF-OF");
+		feedContentType = p.getProperty( "DR.feedContentType", "application/vnc.dr.feed");
+		subContentType = p.getProperty( "DR.subContentType", "application/vnd.dr.subscription");
+		logger.info( "provURL=" + provURL + " provApi=" + provApi + " behalfHeader=" + behalfHeader
+				+ " feedContentType=" + feedContentType + " subContentType=" + subContentType );
 			
 	}
 	
@@ -143,9 +155,9 @@ public class DrProvConnection extends BaseLoggingClass {
 		try {
 			logger.info( "uc=" + uc );
 			uc.setRequestMethod("POST");
-			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.feed");
+			uc.setRequestProperty("Content-Type", feedContentType);
 			uc.setRequestProperty( "charset", "utf-8");
-			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", postFeed.getOwner() );
+			uc.setRequestProperty( behalfHeader, postFeed.getOwner() );
 			uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			uc.setDoOutput(true);
@@ -231,9 +243,9 @@ public class DrProvConnection extends BaseLoggingClass {
 
 		try {
 			uc.setRequestMethod("POST");
-//			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.feed");
+//			uc.setRequestProperty("Content-Type", feedContenType );
 //			uc.setRequestProperty( "charset", "utf-8");
-//			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", postFeed.getOwner() );
+//			uc.setRequestProperty( behalfHeader, postFeed.getOwner() );
 //			uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 //			uc.setUseCaches(false);
 //			uc.setDoOutput(true);	
@@ -280,7 +292,7 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 	public String doPostDr_Sub( DR_Sub postSub, ApiError err ) {
 		logger.info( "entry: doPostDr_Sub() "  );
-		byte[] postData = postSub.getBytes();
+		byte[] postData = postSub.getBytes(provApi );
 		logger.info( "post fields=" + postData );
 		String responsemessage = null;
 		String responseBody = null;
@@ -289,9 +301,9 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 			uc.setRequestMethod("POST");
 		
-			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.subscription");
+			uc.setRequestProperty("Content-Type", subContentType );
 			uc.setRequestProperty( "charset", "utf-8");
-			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", "DGL" );
+			uc.setRequestProperty( behalfHeader, "DGL" );
 			uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			uc.setDoOutput(true);
@@ -361,9 +373,9 @@ public class DrProvConnection extends BaseLoggingClass {
 		try {
 			logger.info( "uc=" + uc );
 			uc.setRequestMethod("PUT");
-			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.feed");
+			uc.setRequestProperty("Content-Type", feedContentType );
 			uc.setRequestProperty( "charset", "utf-8");
-			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", putFeed.getOwner() );
+			uc.setRequestProperty( behalfHeader, putFeed.getOwner() );
 			uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			uc.setDoOutput(true);
@@ -445,7 +457,7 @@ public class DrProvConnection extends BaseLoggingClass {
 	}
 	public String doPutDr_Sub(DR_Sub postSub, ApiError err) {
 		logger.info( "entry: doPutDr_Sub() "  );
-		byte[] postData = postSub.getBytes();
+		byte[] postData = postSub.getBytes(provApi);
 		logger.info( "post fields=" + postData );
 		String responsemessage = null;
 		String responseBody = null;
@@ -454,9 +466,9 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 			uc.setRequestMethod("PUT");
 		
-			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.subscription");
+			uc.setRequestProperty("Content-Type", subContentType );
 			uc.setRequestProperty( "charset", "utf-8");
-			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", "DGL" );
+			uc.setRequestProperty( behalfHeader, "DGL" );
 			uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			uc.setDoOutput(true);
@@ -531,9 +543,9 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 			uc.setRequestMethod("GET");
 		
-			//uc.setRequestProperty("Content-Type", "application/vnd.att-dr.subscription");
+			//uc.setRequestProperty("Content-Type", subContentType );
 			//uc.setRequestProperty( "charset", "utf-8");
-			//uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", "DGL" );
+			//uc.setRequestProperty( behalfHeader, "DGL" );
 			//uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			//uc.setUseCaches(false);
 			//uc.setDoOutput(true);
@@ -616,9 +628,9 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 			uc.setRequestMethod("PUT");
 		
-			//uc.setRequestProperty("Content-Type", "application/vnd.att-dr.subscription");
+			//uc.setRequestProperty("Content-Type", subContentType );
 			//uc.setRequestProperty( "charset", "utf-8");
-			//uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", "DGL" );
+			//uc.setRequestProperty( behalfHeader, "DGL" );
 			//uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			//uc.setDoOutput(true);
@@ -688,9 +700,9 @@ public class DrProvConnection extends BaseLoggingClass {
 		try {
 			logger.info( "uc=" + uc );
 			uc.setRequestMethod("DELETE");
-			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.feed");
+			uc.setRequestProperty("Content-Type", feedContentType );
 			uc.setRequestProperty( "charset", "utf-8");
-			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", putFeed.getOwner() );
+			uc.setRequestProperty( behalfHeader, putFeed.getOwner() );
 			//uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			uc.setDoOutput(true);
@@ -773,7 +785,7 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 	public String doDeleteDr_Sub(DR_Sub delSub, ApiError err) {
 		logger.info( "entry: doDeleteDr_Sub() "  );
-		byte[] postData = delSub.getBytes();
+		byte[] postData = delSub.getBytes(provApi);
 		logger.info( "post fields=" + postData );
 		String responsemessage = null;
 		String responseBody = null;
@@ -782,9 +794,9 @@ public class DrProvConnection extends BaseLoggingClass {
 	
 			uc.setRequestMethod("DELETE");
 		
-			uc.setRequestProperty("Content-Type", "application/vnd.att-dr.subscription");
+			uc.setRequestProperty("Content-Type", subContentType);
 			uc.setRequestProperty( "charset", "utf-8");
-			uc.setRequestProperty( "X-ATT-DR-ON-BEHALF-OF", "DGL" );
+			uc.setRequestProperty( behalfHeader, "DGL" );
 			//uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
 			uc.setUseCaches(false);
 			uc.setDoOutput(true);
diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java b/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java
index e089881..a5d9999 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java
@@ -184,12 +184,35 @@ public class DR_Sub extends DmaapObject {
 
 
 
-	public byte[] getBytes() {
+	public byte[] getBytes(String provApi) {
+		if ( "AT&T".equals(provApi)) {
+			return toProvJSONforATT().getBytes(StandardCharsets.UTF_8);
+		}
 		return toProvJSON().getBytes(StandardCharsets.UTF_8);
 	}
-	// returns the DR_Sub object in JSON that conforms to DR Prov Server expectations
-	public String toProvJSON() {
+	// returns the DR_Sub object in JSON that conforms to ONAP DR Prov Server expectations
+	public String toProvJSON() {	
+		// this is the original DR API that was contributed to ONAP
+		String postJSON = String.format("{\"suspend\": \"%s\", \"delivery\": "
+				+ "{\"url\": \"%s\", \"user\": \"%s\", \"password\": \"%s\", \"use100\":  \"%s\"}"
+				+ ", \"metadataOnly\": %s, \"groupid\": \"%s\", \"follow_redirect\": %s "
+				+ "}", 
+				this.suspended,
+				this.getDeliveryURL(), 
+				this.getUsername(),
+				this.getUserpwd(),
+				this.isUse100(),
+				"false",
+				"0",
+				"true");	
 		
+		logger.info( postJSON );
+		return postJSON;
+	}
+	// returns the DR_Sub object in JSON that conforms to AT&T DR Prov Server expectations
+	// In Jan, 2019, the DR API used internally at AT&T diverged, so this function can be used in
+	// that runtime environment
+	public String toProvJSONforATT() {	
 		// in DR 3.0, API v2.1 a new groupid field is added.  We are not using this required field so just set it to 0.
 		// we send this regardless of DR Release because older versions of DR seem to safely ignore it
 		// and soon those versions won't be around anyway...
@@ -197,10 +220,16 @@ public class DR_Sub extends DmaapObject {
 		// We are setting it to "true" because that is the general behavior desired in OpenDCAE.
 		// But it is really a no-op for OpenDCAE because we've deployed DR with the SYSTEM-level parameter for FOLLOW_REDIRECTS set to true.
 		// In the event we abandon that, then setting the sub attribute to true will be a good thing.
+		// Update Jan, 2019: added guaranteed_delivery and guaranteed_sequence with value false for
+		// backwards compatibility
 		// TODO:
 		//   - introduce Bus Controller API support for these attributes
 		//   - store the default values in the DB
-		String postJSON = String.format("{\"suspend\": \"%s\", \"delivery\": {\"url\": \"%s\", \"user\": \"%s\", \"password\": \"%s\", \"use100\":  \"%s\"}, \"metadataOnly\": %s, \"groupid\": \"%s\", \"follow_redirect\": %s }", 
+		String postJSON = String.format("{\"suspend\": \"%s\", \"delivery\": "
+				+ "{\"url\": \"%s\", \"user\": \"%s\", \"password\": \"%s\", \"use100\":  \"%s\"}"
+				+ ", \"metadataOnly\": %s, \"groupid\": \"%s\", \"follow_redirect\": %s "
+				+ ", \"guaranteed_delivery\": %s, \"guaranteed_sequence\": %s "
+				+ "}", 
 				this.suspended,
 				this.getDeliveryURL(), 
 				this.getUsername(),
@@ -208,7 +237,9 @@ public class DR_Sub extends DmaapObject {
 				this.isUse100(),
 				"false",
 				"0",
-				"true");	
+				"true",
+				"false",
+				"false");	
 		
 		logger.info( postJSON );
 		return postJSON;
diff --git a/version.properties b/version.properties
index 6623284..e04b5bc 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=20
+patch=21
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins