AT&T 1712 and 1802 release code

[so.git] / common / src / main / java / org / openecomp / mso / client / policy / PolicyRestClient.java

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java b/common/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
similarity index 88%
rename from bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
rename to common/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
index 4ed2a88..77fec34 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
+++ b/common/src/main/java/org/openecomp/mso/client/policy/PolicyRestClient.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -37,10 +37,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class PolicyRestClient extends RestClient {
 
-       private static final String X_ECOMP_REQUESTID = String.valueOf(UUID.randomUUID());
+       private static final UUID X_ECOMP_REQUESTID = UUID.randomUUID();
        private final PolicyRestProperties properties;
        public PolicyRestClient(PolicyRestProperties props, PolicyServiceType serviceType) {
-               super(props, Optional.of(UriBuilder.fromPath(serviceType.toString()).build()));
+               super(props, UUID.randomUUID(), Optional.of(UriBuilder.fromPath(serviceType.toString()).build()));
                this.properties = props;
                this.getClient();
        }
@@ -59,8 +59,8 @@ public class PolicyRestClient extends RestClient {
        }
 
        @Override
-       public RestClient addRequestId(String requestId) {
-               this.headerMap.put("X-ECOMP-RequestID", requestId);
+       public RestClient addRequestId(UUID requestId) {
+               this.headerMap.put("X-ECOMP-RequestID", requestId.toString());
                return this;
        }
-}
\ No newline at end of file
+}