diff options
Diffstat (limited to 'cmso-optimizer/src')
9 files changed, 12 insertions, 23 deletions
diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java index 96f2ef2..61c1eb8 100755 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafAuthProvider.java @@ -55,7 +55,7 @@ public class AafAuthProvider implements AuthenticationProvider { AafClientCache clientCache;
@Override
- public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+ public Authentication authenticate(Authentication authentication) {
String name = authentication.getName();
String password = authentication.getCredentials().toString();
String sessionId = null;
@@ -66,10 +66,8 @@ public class AafAuthProvider implements AuthenticationProvider { sessionId = webAuthDetails.getRemoteAddress() + ":" + webAuthDetails.getSessionId();
}
}
- if (env.getProperty(AafProperties.aafEnabled.toString(), Boolean.class, true)) {
- if (clientCache.authenticate(name, password, sessionId) != AuthorizationResult.Authenticated) {
+ if ((env.getProperty(AafProperties.aafEnabled.toString(), Boolean.class, true)) && (clientCache.authenticate(name, password, sessionId) != AuthorizationResult.Authenticated)) {
return null;
- }
}
return new UsernamePasswordAuthenticationToken(name, password, new ArrayList<>());
diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java index 0dc18db..1ce581a 100755 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java @@ -138,14 +138,12 @@ public class AafClientCache { cacheAge = now;
}
permissions = cache.get(getCacheKey(auth));
- if (permissions == null) {
- if (!auth.get("password").equals("")) {
+ if ((permissions == null) && (!auth.get("password").equals(""))) {
permissions = getPermissionsFromAaf(auth);
if (permissions != null) {
cache.put(getCacheKey(auth), permissions);
}
}
- }
}
return permissions;
}
diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafUserRole.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafUserRole.java index 295221c..cda740f 100755 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafUserRole.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafUserRole.java @@ -158,7 +158,7 @@ public class AafUserRole { while (!inNodes.isEmpty() && !matchNodes.isEmpty()) {
String inNode = inNodes.remove(0);
String matchNode = matchNodes.get(0);
- if (matchNode.equals(inNode) || matchNode.equals("*")) {
+ if (matchNode.equals(inNode) || "*".equals(matchNode)) {
matchNodes.remove(0);
} else {
if (!matchNode.equals("**")) {
@@ -174,10 +174,10 @@ public class AafUserRole { // We have incoming nodes remaining, see if we can wildcard them
if (matchNodes.size() == 1) {
- if (matchNodes.get(0).equals("**")) {
+ if ("**".equals(matchNodes.get(0))) {
return true;
}
- if (inNodes.size() == 1 && matchNodes.get(0).equals("*")) {
+ if (inNodes.size() == 1 && "*".equals(matchNodes.get(0))) {
return true;
}
}
diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/availability/timewindows/RecurringWindows.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/availability/timewindows/RecurringWindows.java index b3829c3..bbed8ad 100644 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/availability/timewindows/RecurringWindows.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/availability/timewindows/RecurringWindows.java @@ -237,9 +237,7 @@ public class RecurringWindows { String rdata = "RRULE:FREQ=MINUTELY;INTERVAL=" + durationInSeconds / 60; DateTime start = new DateTime(window.getStartTime().toInstant().toEpochMilli()); - DateTimeIterator recur = - DateTimeIteratorFactory.createDateTimeIterator(rdata, start, DateTimeZone.UTC, true); - return recur; + return DateTimeIteratorFactory.createDateTimeIterator(rdata, start, DateTimeZone.UTC, true); } diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/ticketmgt/TicketMgtClient.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/ticketmgt/TicketMgtClient.java index 1ba21e0..109493b 100644 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/ticketmgt/TicketMgtClient.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/ticketmgt/TicketMgtClient.java @@ -119,7 +119,7 @@ public class TicketMgtClient { } private ActiveTicketsRequest buildRequest(OptimizerRequest optimizerRequest) - throws JsonParseException, JsonMappingException, IOException { + throws IOException { UUID uuid = UUID.fromString(optimizerRequest.getRequestId()); Topology topologyRow = topologyRequestManager.getExistingTopology(uuid); String topologyString = topologyRow.getTopology(); diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/topology/TopologyRequestManager.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/topology/TopologyRequestManager.java index f62a851..a3f4e6d 100644 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/topology/TopologyRequestManager.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/clients/topology/TopologyRequestManager.java @@ -96,8 +96,7 @@ public class TopologyRequestManager { * @throws JsonMappingException the json mapping exception * @throws IOException Signals that an I/O exception has occurred. */ - public TopologyResponse getTopologyResponse(UUID uuid) - throws JsonParseException, JsonMappingException, IOException { + public TopologyResponse getTopologyResponse(UUID uuid) throws IOException { Topology row = getExistingTopology(uuid); if (row != null) { String responseString = row.getTopology(); diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/common/BasicAuthenticatorFilter.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/common/BasicAuthenticatorFilter.java index 20a6b21..f098ed2 100644 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/common/BasicAuthenticatorFilter.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/common/BasicAuthenticatorFilter.java @@ -102,8 +102,7 @@ public class BasicAuthenticatorFilter implements ClientRequestFilter { private static String getToken(String auth) { try { - String token = new String(DatatypeConverter.parseBase64Binary(auth)); - return token; + return new String(DatatypeConverter.parseBase64Binary(auth)); } catch (Exception e) { return auth; } diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java index 9aa439c..02d8886 100644 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/filters/CmsoClientFilters.java @@ -68,10 +68,8 @@ public class CmsoClientFilters implements ClientRequestFilter, ClientResponseFil String transactionId = (String) headers.getFirst(MessageHeaders.HeadersEnum.TransactionID.toString()); String mdcId = MDC.get(MDC_KEY_REQUEST_ID); - if (transactionId == null || transactionId.equals("")) { - if (mdcId != null) { + if ((transactionId == null || transactionId.equals("")) && (mdcId != null)) { headers.add(HeadersEnum.TransactionID.toString(), mdcId); - } } headers.add(HeadersEnum.FromAppID.toString(), appId); } diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/service/rs/AdminToolImpl.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/service/rs/AdminToolImpl.java index 93da842..2aea09c 100644 --- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/service/rs/AdminToolImpl.java +++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/service/rs/AdminToolImpl.java @@ -53,8 +53,7 @@ public class AdminToolImpl implements AdminTool { return Response.ok("").build(); } String encrypted = PropertiesManagement.getEncryptedValue(id); - Response response = Response.ok(encrypted).build(); - return response; + return Response.ok(encrypted).build(); } } |