diff options
3 files changed, 19 insertions, 20 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java index 4cf9023b7c..7444e1c881 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameter.java @@ -20,7 +20,7 @@ package org.openecomp.mso.openstack.utils; - +import java.util.Objects; public class MsoHeatEnvironmentParameter { @@ -66,20 +66,11 @@ public class MsoHeatEnvironmentParameter { } MsoHeatEnvironmentParameter hep = (MsoHeatEnvironmentParameter) o; // If the name of the parameter is the same, then they're equal - if (hep.getName().equals(this.getName())) { - return true; - } - return false; + return hep.getName().equals(this.getName()); } public int hashCode() { - int result = 0; - try { - result = this.name.hashCode(); - } catch (Exception e) { - // in case it's null - return zero - } - return result; + return Objects.hashCode(this.name); } diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java index dfb9f36e9a..ea9ca62bf5 100644 --- a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java +++ b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java @@ -21,6 +21,7 @@ package org.openecomp.mso.rest; import java.io.IOException; +import java.util.Arrays; import org.apache.http.Header; import org.apache.http.HttpResponse; @@ -44,7 +45,7 @@ public class APIResponse { * @param httpResponse used to create headers * @return http headers */ - private HttpHeader[] buildHeaders(final HttpResponse httpResponse) { + private static HttpHeader[] buildHeaders(final HttpResponse httpResponse) { final Header[] headers = httpResponse.getAllHeaders(); HttpHeader[] httpHeaders = new HttpHeader[headers.length]; @@ -102,7 +103,12 @@ public class APIResponse { * @return http response body */ public byte[] getResponseBodyAsByteArray() { - return this.responseBody; + // avoid exposing internals, create copy + if (this.responseBody != null) { + return Arrays.copyOf(this.responseBody, this.responseBody.length); + } else { + return null; + } } /** @@ -125,11 +131,7 @@ public class APIResponse { */ public HttpHeader[] getAllHeaders() { // avoid exposing internals, create copy - HttpHeader[] copy = new HttpHeader[this.headers.length]; - for (int i = 0; i < this.headers.length; ++i) { - copy[i] = headers[i]; - } - return copy; + return Arrays.copyOf(this.headers, this.headers.length); } public String getFirstHeader(String name) { @@ -43,6 +43,7 @@ <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> + <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> <sitePath>/content/sites/site/org/openecomp/mso/${project.version}</sitePath> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> </properties> @@ -120,8 +121,13 @@ <repository> <id>ecomp-staging</id> <name>MSO Staging Repository</name> - <url>${nexusproxy}/content/repositories/staging/</url> + <url>${nexusproxy}/${stagingNexusPath}</url> </repository> + <repository> + <id>ecomp-snapshots</id> + <name>MSO Snapshot Repository</name> + <url>${nexusproxy}/${snapshotNexusPath}</url> + </repository> <!-- Camunda Web Repository --> <repository> <id>CamundaWebRepo</id> |