diff options
author | 2019-06-27 10:52:06 -0400 | |
---|---|---|
committer | 2019-06-27 18:00:21 -0400 | |
commit | d0932a1a2339a02dab04eedefa0480535e68d31c (patch) | |
tree | dc6bcde6b279e5dd7a4a332b0494ab108096f173 /controlloop/common/guard/src/main/java/org | |
parent | d8118c6638bb2440f89eae9d3f979bdfb0e013c3 (diff) |
Fix some sonar issues in drools-applications
Added coverage to:
- feature-controlloop-management
Fixed sonar issues, but didn't add coverage to:
- feature-controlloop-trans
- eventmanager
- guard
Change-Id: I12f09c4a533e838c6fb9762ba56194e51ce864eb
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/guard/src/main/java/org')
4 files changed, 110 insertions, 146 deletions
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PnfTargetLock.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PnfTargetLock.java index c1ad34a22..8ddb5ffcf 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PnfTargetLock.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PnfTargetLock.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,70 +20,28 @@ package org.onap.policy.guard.impl; -import java.io.Serializable; import java.util.UUID; - import org.onap.policy.controlloop.policy.TargetType; import org.onap.policy.guard.LockCallback; -import org.onap.policy.guard.TargetLock; -public class PnfTargetLock implements TargetLock, Serializable { +public class PnfTargetLock extends TargetLockImpl { private static final long serialVersionUID = 2335897394577202732L; - private final UUID lockId; - private final TargetType targetType; - private final String target; - private final UUID requestId; - private final transient LockCallback callback; - /** * Construct an instance. - * + * * @param type the target type * @param target the target * @param requestId the request Id * @param callback the callback */ public PnfTargetLock(TargetType type, String target, UUID requestId, LockCallback callback) { - this.lockId = UUID.randomUUID(); - this.targetType = type; - this.target = target; - this.requestId = requestId; - this.callback = callback; - } - - @Override - public UUID getLockId() { - return this.lockId; - } - - - @Override - public TargetType getTargetType() { - return targetType; - } - - @Override - public String getTargetInstance() { - return target; - } - - @Override - public UUID getRequestId() { - return this.requestId; - } - - public LockCallback getCallback() { - return this.callback; + super(type, target, requestId, callback); } @Override public String toString() { - return "PnfTargetLock [lockId=" + lockId + ", targetType=" + targetType + ", target=" + target + ", requestId=" - + requestId + "]"; + return "PnfTargetLock [" + super.toString() + "]"; } - - - } diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/TargetLockImpl.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/TargetLockImpl.java new file mode 100644 index 000000000..d406999f4 --- /dev/null +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/TargetLockImpl.java @@ -0,0 +1,86 @@ +/*- + * ============LICENSE_START======================================================= + * guard + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.guard.impl; + +import java.io.Serializable; +import java.util.UUID; + +import org.onap.policy.controlloop.policy.TargetType; +import org.onap.policy.guard.LockCallback; +import org.onap.policy.guard.TargetLock; + +public class TargetLockImpl implements TargetLock, Serializable { + + private static final long serialVersionUID = 2335897394577202732L; + + private final UUID lockId; + private final TargetType targetType; + private final String target; + private final UUID requestId; + private final transient LockCallback callback; + + /** + * Construct an instance. + * + * @param type the target type + * @param target the target + * @param requestId the request Id + * @param callback the callback + */ + public TargetLockImpl(TargetType type, String target, UUID requestId, LockCallback callback) { + this.lockId = UUID.randomUUID(); + this.targetType = type; + this.target = target; + this.requestId = requestId; + this.callback = callback; + } + + @Override + public UUID getLockId() { + return this.lockId; + } + + + @Override + public TargetType getTargetType() { + return targetType; + } + + @Override + public String getTargetInstance() { + return target; + } + + @Override + public UUID getRequestId() { + return this.requestId; + } + + public LockCallback getCallback() { + return this.callback; + } + + @Override + public String toString() { + return "lockId=" + lockId + ", targetType=" + targetType + ", target=" + target + ", requestId=" + + requestId; + } +} diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VmTargetLock.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VmTargetLock.java index 301c6ec7c..2e612a03a 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VmTargetLock.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VmTargetLock.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,66 +20,28 @@ package org.onap.policy.guard.impl; -import java.io.Serializable; import java.util.UUID; - import org.onap.policy.controlloop.policy.TargetType; import org.onap.policy.guard.LockCallback; -import org.onap.policy.guard.TargetLock; -public class VmTargetLock implements TargetLock, Serializable { +public class VmTargetLock extends TargetLockImpl { - private static final long serialVersionUID = -8795145054334409724L; - private final UUID lockId; - private final TargetType targetType; - private final String target; - private final UUID requestId; - private final transient LockCallback callback; + private static final long serialVersionUID = 2335897394577202732L; /** - * Create an instance. - * - * @param targetType the target type + * Construct an instance. + * + * @param type the target type * @param target the target * @param requestId the request Id * @param callback the callback */ - public VmTargetLock(TargetType targetType, String target, UUID requestId, LockCallback callback) { - this.lockId = UUID.randomUUID(); - this.targetType = targetType; - this.target = target; - this.requestId = requestId; - this.callback = callback; - } - - @Override - public UUID getLockId() { - return this.lockId; - } - - @Override - public TargetType getTargetType() { - return targetType; - } - - @Override - public String getTargetInstance() { - return target; - } - - @Override - public UUID getRequestId() { - return this.requestId; - } - - public LockCallback getCallback() { - return this.callback; + public VmTargetLock(TargetType type, String target, UUID requestId, LockCallback callback) { + super(type, target, requestId, callback); } @Override public String toString() { - return "VmTargetLock [lockId=" + lockId + ", targetType=" + targetType + ", target=" + target + ", requestId=" - + requestId + "]"; + return "VmTargetLock [" + super.toString() + "]"; } - } diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VnfTargetLock.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VnfTargetLock.java index 2e3fc28b1..2912c7ad4 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VnfTargetLock.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/VnfTargetLock.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,70 +20,28 @@ package org.onap.policy.guard.impl; -import java.io.Serializable; import java.util.UUID; - import org.onap.policy.controlloop.policy.TargetType; import org.onap.policy.guard.LockCallback; -import org.onap.policy.guard.TargetLock; -public class VnfTargetLock implements TargetLock, Serializable { +public class VnfTargetLock extends TargetLockImpl { private static final long serialVersionUID = 2335897394577202732L; - private final UUID lockId; - private final TargetType targetType; - private final String target; - private final UUID requestId; - private final transient LockCallback callback; - /** - * Create an instance. - * - * @param type the type + * Construct an instance. + * + * @param type the target type * @param target the target * @param requestId the request Id * @param callback the callback */ public VnfTargetLock(TargetType type, String target, UUID requestId, LockCallback callback) { - this.lockId = UUID.randomUUID(); - this.targetType = type; - this.target = target; - this.requestId = requestId; - this.callback = callback; - } - - @Override - public UUID getLockId() { - return this.lockId; - } - - - @Override - public TargetType getTargetType() { - return targetType; - } - - @Override - public String getTargetInstance() { - return target; - } - - @Override - public UUID getRequestId() { - return this.requestId; - } - - public LockCallback getCallback() { - return this.callback; + super(type, target, requestId, callback); } @Override public String toString() { - return "VnfTargetLock [lockId=" + lockId + ", targetType=" + targetType + ", target=" + target + ", requestId=" - + requestId + "]"; + return "VnfTargetLock [" + super.toString() + "]"; } - - - } |