From aa3fac0c2021c54b626bbc6a13848e2af5e04c3c Mon Sep 17 00:00:00 2001 From: "Smokowski, Steve (ss835w)" Date: Thu, 2 Aug 2018 08:55:18 -0400 Subject: Resolve Sonar Blocking issues Issue-ID: SO-788 Change-Id: I4496ef16c56c980a81031ad01fcbb1524d135ea8 Signed-off-by: Smokowski, Steve (ss835w) --- .../java/org/onap/so/adapters/vdu/VduArtifact.java | 31 +++++++++++++--------- .../org/onap/so/client/aai/AAIRestClientI.java | 2 -- .../org/onap/so/client/aai/AAIRestClientImpl.java | 19 ------------- 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduArtifact.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduArtifact.java index a53cd0ce49..575853a21f 100644 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduArtifact.java +++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduArtifact.java @@ -22,6 +22,8 @@ package org.onap.so.adapters.vdu; import java.util.Arrays; import java.util.Objects; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; public class VduArtifact { @@ -35,6 +37,21 @@ public class VduArtifact { private byte[] content; private ArtifactType type; + @Override + public boolean equals(final Object other) { + if (!(other instanceof VduArtifact)) { + return false; + } + VduArtifact castOther = (VduArtifact) other; + return new EqualsBuilder().append(name, castOther.name).append(content, castOther.content) + .append(type, castOther.type).isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(name).append(content).append(type).toHashCode(); + } + // Default constructor public VduArtifact() {} @@ -64,17 +81,5 @@ public class VduArtifact { this.type = type; } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - VduArtifact that = (VduArtifact) o; - return Objects.equals(name, that.name) && - Arrays.equals(content, that.content) && - type == that.type; - } + } diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java b/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java index b56a6779cc..16d80c42d9 100644 --- a/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java +++ b/common/src/main/java/org/onap/so/client/aai/AAIRestClientI.java @@ -39,8 +39,6 @@ public interface AAIRestClientI { List getPhysicalServerByVnfId(String vnfId, String transactionLoggingUuid) throws UnsupportedEncodingException, JsonParseException, JsonMappingException, IOException; - void updateMaintenceFlag(String vnfId,boolean inMaint, String transactionLoggingUuid) throws Exception; - void updateMaintenceFlagVnfId(String vnfId, boolean inMaint, String transactionLoggingUuid) throws Exception; GenericVnf getVnfByName(String vnfId, String transactionLoggingUuid) throws Exception; diff --git a/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java b/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java index b471a1e53d..251ca7f614 100644 --- a/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java +++ b/common/src/main/java/org/onap/so/client/aai/AAIRestClientImpl.java @@ -115,25 +115,6 @@ public class AAIRestClientImpl implements AAIRestClientI { return results; } - @Override - public void updateMaintenceFlag(String vnfName, boolean inMaint, String transactionLoggingUuid) throws IOException { - UUID requestId; - try { - requestId = UUID.fromString(transactionLoggingUuid); - } catch (IllegalArgumentException e) { - logger.warn("could not parse uuid: " + transactionLoggingUuid + " creating valid uuid automatically"); - requestId = UUID.randomUUID(); - } - GenericVnfs genericVnfs = new AAIResourcesClient(ENDPOINT_VERSION).get(GenericVnfs.class, - AAIUriFactory.createResourceUri(AAIObjectPlurals.GENERIC_VNF).queryParam("vnf-name", vnfName)).orElse(null); - if (genericVnfs.getGenericVnf().size() > 1) { - throw new IndexOutOfBoundsException("Multiple Generic Vnfs Returned"); - } - - GenericVnf genericVnf = genericVnfs.getGenericVnf().get(0); - updateMaintenceFlagVnfId(genericVnf.getVnfId(), inMaint, transactionLoggingUuid); - } - @Override public void updateMaintenceFlagVnfId(String vnfId, boolean inMaint, String transactionLoggingUuid) throws IOException { -- cgit 1.2.3-korg