Merge "Added setting pnf name in pnf-pnp"

[so.git] / mso-api-handlers / mso-api-handler-infra / src / main / java / org / openecomp / mso / apihandlerinfra / MsoRequest.java

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
index 59c78b5..3f6cc35 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/MsoRequest.java
@@ -85,7 +85,6 @@ public class MsoRequest {
 
     private String requestId;
     private String requestXML;
-    private String requestJSON;
     private String requestUri;
     private VnfRequest vnfReq;
     private RequestInfo requestInfo;
@@ -118,8 +117,6 @@ public class MsoRequest {
     private OwningEntity owningEntity;
 
     private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.APIH);
-    private static final String NOT_PROVIDED = "not provided";
-
     protected AbstractSessionFactoryManager requestsDbSessionFactoryManager = new RequestsDbSessionFactoryManager ();
 
     MsoRequest (String requestId) {
@@ -913,9 +910,8 @@ public class MsoRequest {
     }
 
     public void updateFinalStatus (Status status) {
-        int result = 0;
         try {
-            result = (RequestsDatabase.getInstance()).updateInfraFinalStatus (requestId,
+            (RequestsDatabase.getInstance()).updateInfraFinalStatus (requestId,
                                                               status.toString (),
                                                               this.errorMessage,
                                                               this.progress,
@@ -1154,7 +1150,7 @@ public class MsoRequest {
        mapper.setSerializationInclusion(Include.NON_NULL);
        //mapper.configure(Feature.WRAP_ROOT_VALUE, true);
        msoLogger.debug ("building sir from object " + sir);
-       requestJSON = mapper.writeValueAsString(sir);
+       String requestJSON = mapper.writeValueAsString(sir);
        
        // Perform mapping from VID-style modelInfo fields to ASDC-style modelInfo fields