diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java index 9967a50c..bc97e1a5 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/RelationshipRequest.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights * reserved. + * Modifications Copyright (C) 2018 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +24,6 @@ package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.List; @@ -31,12 +31,9 @@ import java.util.List; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URIBuilder; import org.apache.http.message.BasicNameValuePair; -import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; + import org.onap.aai.inventory.v14.Relationship; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Joiner; public class RelationshipRequest extends GenericRequest { diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelperImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelperImpl.java index 1611b537..0efd8977 100644 --- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelperImpl.java +++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelperImpl.java @@ -73,6 +73,7 @@ public class LockHelperImpl implements LockHelper { try { Thread.sleep(lockWait * 1000); } catch (InterruptedException ex) { + log.error("Interrupted Exception", ex); } } } @@ -80,7 +81,7 @@ public class LockHelperImpl implements LockHelper { @Override public void unlock(Collection<String> lockNames, boolean force) { - if (lockNames == null || lockNames.size() == 0) { + if (lockNames == null || lockNames.isEmpty()) { return; } @@ -105,7 +106,7 @@ public class LockHelperImpl implements LockHelper { } public void tryLock(Collection<String> resourceNameList, String lockRequester, int lockTimeout /* Seconds */) { - if (resourceNameList == null || resourceNameList.size() == 0) { + if (resourceNameList == null || resourceNameList.isEmpty()) { return; } diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/ResourceLockedException.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/ResourceLockedException.java index 4b90b265..f503332c 100644 --- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/ResourceLockedException.java +++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/ResourceLockedException.java @@ -25,7 +25,9 @@ public class ResourceLockedException extends RuntimeException { private static final long serialVersionUID = 1L; - private String lockName, lockHolder, lockRequester; + private final String lockName; + private final String lockHolder; + private final String lockRequester; public ResourceLockedException(String lockName, String lockHolder, String lockRequester) { this.lockName = lockName; |