From 013cd547c4fdafa16450863c043e5969b268351d Mon Sep 17 00:00:00 2001 From: rama-huawei Date: Wed, 27 Sep 2017 15:52:13 +0530 Subject: Replaced with the diamnod operator Issue-Id:SO-118 Change-Id: Iaad28a363586cd8b42e86bd7e854faa9e716c59d Signed-off-by: rama-huawei --- .../src/main/java/org/openecomp/mso/cloud/CloudConfig.java | 6 +++--- .../java/org/openecomp/mso/cloud/CloudConfigIdentityMapper.java | 1 + .../org/openecomp/mso/cloud/IdentityAuthenticationTypeAbstract.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'adapters/mso-adapter-utils') diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java index eac76c74a5..23230071c7 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfig.java @@ -56,9 +56,9 @@ public class CloudConfig { private boolean validCloudConfig = false; @JsonProperty("identity_services") - private Map identityServices = new HashMap(); + private Map identityServices = new HashMap<>(); @JsonProperty("cloud_sites") - private Map cloudSites = new HashMap(); + private Map cloudSites = new HashMap<>(); private static ObjectMapper mapper = new ObjectMapper(); @@ -135,7 +135,7 @@ public class CloudConfig { if (version == null || version.equals(cs.getAic_version())) { return cs; } - } else if (cs.getId().equalsIgnoreCase("default")) { + } else if ("default".equalsIgnoreCase(cs.getId())) { // save it off in case we need it defaultCloudSite = cs.clone(); } diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigIdentityMapper.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigIdentityMapper.java index 53fc7a55f1..9677d0ee1c 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigIdentityMapper.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigIdentityMapper.java @@ -23,6 +23,7 @@ package org.openecomp.mso.cloud; * This interface provides the method signature for mapping registration. * All mappings should be registered by the implementing class. */ +@FunctionalInterface public interface CloudConfigIdentityMapper { public void registerAllMappings(); diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/IdentityAuthenticationTypeAbstract.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/IdentityAuthenticationTypeAbstract.java index f40c7d9882..41f70e4492 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/IdentityAuthenticationTypeAbstract.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/IdentityAuthenticationTypeAbstract.java @@ -72,7 +72,7 @@ public abstract class IdentityAuthenticationTypeAbstract { @Override public final boolean equals(Object other) { - return ((this.identityType != null) && (other != null) && (other instanceof IdentityAuthenticationTypeAbstract) && (this.identityType.equals(other.toString()))); + return (this.identityType != null) && (other != null) && (other instanceof IdentityAuthenticationTypeAbstract) && (this.identityType.equals(other.toString())); } @Override -- cgit 1.2.3-korg