X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fclient%2FDrProvConnection.java;h=3cb3d672b92bfe712bfb03546d611236d0b4c041;hb=d6ac6f8b10e90411dd650d6f7a9ee51179e39bfc;hp=eda36534f9f5c38d32c26999204b328f1ca40381;hpb=8a187a47e78e60e79c56f14ab560db7140eeaa2e;p=dmaap%2Fdbcapi.git

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 eda3653..3cb3d67 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
@@ -59,9 +59,9 @@ public class DrProvConnection extends BaseLoggingClass {
 		}
 		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");
+		behalfHeader = p.getProperty( "DR.onBehalfHeader", "X-DMAAP-DR-ON-BEHALF-OF");
+		feedContentType = p.getProperty( "DR.feedContentType", "application/vnd.dmaap-dr.feed");
+		subContentType = p.getProperty( "DR.subContentType", "application/vnd.dmaap-dr.subscription");
 		logger.info( "provURL=" + provURL + " provApi=" + provApi + " behalfHeader=" + behalfHeader
 				+ " feedContentType=" + feedContentType + " subContentType=" + subContentType );
 			
@@ -243,19 +243,10 @@ public class DrProvConnection extends BaseLoggingClass {
 
 		try {
 			uc.setRequestMethod("POST");
-//			uc.setRequestProperty("Content-Type", feedContenType );
-//			uc.setRequestProperty( "charset", "utf-8");
-//			uc.setRequestProperty( behalfHeader, postFeed.getOwner() );
-//			uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
-//			uc.setUseCaches(false);
-//			uc.setDoOutput(true);	
-			OutputStream os = null;
-	
-			
+
+
 			try {
                  uc.connect();
-                 os = uc.getOutputStream();
-
 
             } catch (ProtocolException pe) {
                  // Rcvd error instead of 100-Continue
@@ -264,6 +255,7 @@ public class DrProvConnection extends BaseLoggingClass {
                      // without this, Java will connect multiple times to the server to run the same request
                      uc.setDoOutput(false);
                  } catch (Exception e) {
+                 	logger.error(e.getMessage(), e);
                  }
             }
 			rc = uc.getResponseCode();
@@ -278,12 +270,14 @@ public class DrProvConnection extends BaseLoggingClass {
             	err.setMessage(responsemessage);
             }
 		} catch (Exception e) {
-            System.err.println("Unable to read response  " );
+            logger.error("Unable to read response  " );
             e.printStackTrace();
         }		finally {
 			try {
 				uc.disconnect();
-			} catch ( Exception e ) {}
+			} catch ( Exception e ) {
+				logger.error(e.getMessage(), e);
+			}
 		}
 	
 		return rc;
@@ -417,7 +411,7 @@ public class DrProvConnection extends BaseLoggingClass {
             if (rc >= 200 && rc < 300 ) {
      			responseBody = bodyToString( uc.getInputStream() );
     			logger.info( "responseBody=" + responseBody );
-
+    			err.setCode( rc );
             } else if ( rc == 404 ) {
             	err.setCode( rc );
             	err.setFields( "feedid");
@@ -521,8 +515,8 @@ public class DrProvConnection extends BaseLoggingClass {
             err.setCode( 500 );
         	err.setMessage("Backend connection refused");
 		} catch (Exception e) {
-            System.err.println("Unable to read response  " );
-            e.printStackTrace();
+            logger.error("Unable to read response  " );
+            logger.error(e.getMessage(), e);
         } finally {
         	uc.disconnect();
         }
@@ -542,22 +536,13 @@ public class DrProvConnection extends BaseLoggingClass {
 		logger.info( "templog:doGetNodes at 12.10.14.11"  );
 	
 			uc.setRequestMethod("GET");
-		
-			//uc.setRequestProperty("Content-Type", subContentType );
-			//uc.setRequestProperty( "charset", "utf-8");
-			//uc.setRequestProperty( behalfHeader, "DGL" );
-			//uc.setRequestProperty( "Content-Length", Integer.toString( postData.length ));
-			//uc.setUseCaches(false);
-			//uc.setDoOutput(true);
-			OutputStream os = null;
 			int rc = -1;
 			
 		logger.info( "templog:doGetNodes at 12.10.14.12"  );
 			try {
-                 uc.connect();
-		logger.info( "templog:doGetNodes at 12.10.14.13"  );
-                 //os = uc.getOutputStream();
-                 //os.write( postData );
+                uc.connect();
+				logger.info( "templog:doGetNodes at 12.10.14.13"  );
+
 
             } catch (ProtocolException pe) {
 		logger.info( "templog:doGetNodes at 12.10.14.14"  );