diff options
Diffstat (limited to 'cmso-service/src/main/java')
3 files changed, 6 insertions, 8 deletions
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java index 332ca73..0a7a69e 100755 --- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java @@ -66,11 +66,9 @@ 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-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java index 8a1633a..70cee66 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java @@ -199,7 +199,7 @@ public class CmsoServiceImpl extends CommonServiceImpl implements CmsoService { } private OptimizedScheduleMessage adaptScheduleMessage(CmsoMessage sm) - throws CmsoException, JsonParseException, JsonMappingException, IOException { + throws CmsoException, IOException { OptimizedScheduleMessage osm = new OptimizedScheduleMessage(); osm.setScheduleId(sm.getScheduleId()); osm.setDomain(sm.getDomain()); @@ -266,7 +266,7 @@ public class CmsoServiceImpl extends CommonServiceImpl implements CmsoService { } private Object getRequestFromCallbackData(String node, String value) - throws CmsoException, JsonParseException, JsonMappingException, IOException { + throws CmsoException, IOException { ObjectMapper om = new ObjectMapper(); JsonNode json = om.readValue(value, JsonNode.class); JsonNode details = json.get("requestDetails"); diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CommonServiceImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CommonServiceImpl.java index e4dec7c..1bb4d0a 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CommonServiceImpl.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CommonServiceImpl.java @@ -213,7 +213,7 @@ public class CommonServiceImpl extends BaseSchedulerServiceImpl { } private void createChangeManagement(Schedule schedule, OptimizedScheduleMessage scheduleMessage, - Map<String, List<ElementInfo>> groups) throws CmsoException { + Map<String, List<ElementInfo>> groups){ SchedulingData schedulingInfo = scheduleMessage.getSchedulingData(); for (String groupId : groups.keySet()) { @@ -266,7 +266,7 @@ public class CommonServiceImpl extends BaseSchedulerServiceImpl { } private void createChangeManagementImmediate(Schedule schedule, OptimizedScheduleMessage scheduleMessage, - Map<String, List<ElementInfo>> groups) throws CmsoException, JsonProcessingException { + Map<String, List<ElementInfo>> groups){ SchedulingData schedulingInfo = scheduleMessage.getSchedulingData(); for (String groupId : groups.keySet()) { ChangeManagementGroup cmg = new ChangeManagementGroup(); @@ -324,7 +324,7 @@ public class CommonServiceImpl extends BaseSchedulerServiceImpl { // Marshall commonData into DB DomainData // No validation. // - private List<DomainData> marshallDomainData(OptimizedScheduleMessage scheduleMessage) throws CmsoException { + private List<DomainData> marshallDomainData(OptimizedScheduleMessage scheduleMessage) { List<NameValue> domainData = scheduleMessage.getCommonData(); List<DomainData> domainDataList = new ArrayList<DomainData>(); for (NameValue nameValue : domainData) { |