Update http query part

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / http / client / HttpRequestProcessor.java

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/http/client/HttpRequestProcessor.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/http/client/HttpRequestProcessor.java
index b2414a5..225a228 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/http/client/HttpRequestProcessor.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/http/client/HttpRequestProcessor.java
@@ -41,20 +41,32 @@ public class HttpRequestProcessor {
                httpRequest = HttpClientUtils.getHttpRequest(requestMethod);
        }
        
-       public String process(String url) throws ClientProtocolException, IOException
+       public HttpResult process(String url) throws ClientProtocolException, IOException
        {
                httpRequest.setURI(URI.create(url));
                
                HttpResponse response = httpClient.execute(httpRequest);
+               
+               HttpResult httpResult = buildHttpResult(response);
+               
+               return httpResult;
+       }
+
+       private HttpResult buildHttpResult(HttpResponse response) throws IOException {
                HttpEntity resEntity = response.getEntity();
                String responseContent = "";
                if (resEntity != null) {
                        responseContent = EntityUtils.toString(resEntity, CommonConstants.UTF_8);
                        EntityUtils.consume(resEntity);
                }
-               httpClient.close();
                
-               return responseContent;
+               HttpResult httpResult = new HttpResult();
+               httpResult.setStatusCode(response.getStatusLine().getStatusCode());
+               httpResult.setStatusCause(response.getStatusLine().getReasonPhrase());
+               httpResult.setHeaders(response.getAllHeaders());
+               httpResult.setContent(responseContent);
+               
+               return httpResult;
        }
 
        public void addHdeader(String key, String value) {