From fabd8bd3d510fd8f0af13d51c2fa97a778a3375a Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 18 Dec 2018 11:40:39 +0000 Subject: Remove unused @throws warnings Previous checkstyle fixes rationalised the exceptions thrown by methods, however the javadoc comments were not updated. This review updates them. Issue-ID: POLICY-1263 Change-Id: I2746f30e76018ec4d0f1e74a6a415979b7874329 Signed-off-by: liamfallon --- .../apex/context/test/distribution/ContextAlbumUpdate.java | 2 -- .../policy/apex/context/test/distribution/ContextUpdate.java | 2 -- .../policy/apex/context/test/locking/ConcurrentContext.java | 2 -- .../org/onap/policy/apex/core/engine/executor/Executor.java | 10 +++------- .../policy/apex/model/utilities/typeutils/ClassBuilder.java | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java b/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java index d3f4d4704..eb6904a04 100644 --- a/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java +++ b/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdate.java @@ -31,7 +31,6 @@ import org.onap.policy.apex.context.impl.distribution.DistributorFactory; import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.policy.apex.model.basicmodel.handling.ApexModelException; import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum; import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel; import org.onap.policy.apex.model.utilities.comparison.KeyedMapComparer; @@ -48,7 +47,6 @@ public class ContextAlbumUpdate { /** * Test context album update. * - * @throws ApexModelException the apex model exception * @throws ApexException the apex exception */ public void testContextAlbumUpdate() throws ApexException { diff --git a/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java b/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java index e92d6a9c1..f8370ec6c 100644 --- a/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java +++ b/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/distribution/ContextUpdate.java @@ -50,7 +50,6 @@ import org.onap.policy.apex.context.test.concepts.TestContextTreeMapItem; import org.onap.policy.apex.context.test.factory.TestContextAlbumFactory; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey; -import org.onap.policy.apex.model.basicmodel.handling.ApexModelException; import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -72,7 +71,6 @@ public class ContextUpdate { /** * Test context update. * - * @throws ApexModelException the apex model exception * @throws ApexException the apex exception */ public void testContextUpdate() throws ApexException { diff --git a/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java b/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java index a673824ea..f0dac722e 100644 --- a/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java +++ b/context/context-test-utils/src/main/java/org/onap/policy/apex/context/test/locking/ConcurrentContext.java @@ -36,7 +36,6 @@ import org.onap.policy.apex.context.Distributor; import org.onap.policy.apex.context.test.concepts.TestContextLongItem; import org.onap.policy.apex.context.test.utils.ConfigrationProvider; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; -import org.onap.policy.apex.model.basicmodel.handling.ApexModelException; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; @@ -63,7 +62,6 @@ public class ConcurrentContext { * The method tests concurrent use of context. * * @return the verified context - * @throws ApexModelException the exception occurs in model handling * @throws ApexException the Apex exception occurs in handling Apex */ public Map testConcurrentContext() throws ApexException { diff --git a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/Executor.java b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/Executor.java index 22a23d062..7a026edf7 100644 --- a/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/Executor.java +++ b/core/core-engine/src/main/java/org/onap/policy/apex/core/engine/executor/Executor.java @@ -20,7 +20,6 @@ package org.onap.policy.apex.core.engine.executor; -import org.onap.policy.apex.context.ContextException; import org.onap.policy.apex.core.engine.ExecutorParameters; import org.onap.policy.apex.core.engine.executor.exception.StateMachineException; import org.onap.policy.apex.model.basicmodel.concepts.ApexException; @@ -68,8 +67,7 @@ public interface Executor { * @param executionId the execution ID of the current APEX execution policy thread * @param incomingEntity the incoming entity that triggers execution * @return The outgoing entity that is the result of execution - * @throws StateMachineException on an execution error - * @throws ContextException on context errors + * @throws ApexException on an execution error */ O execute(long executionId, I incomingEntity) throws ApexException; @@ -78,8 +76,7 @@ public interface Executor { * * @param executionId the execution ID of the current APEX execution policy thread * @param incomingEntity the incoming entity that triggers execution - * @throws StateMachineException on an execution error - * @throws ContextException on context errors + * @throws ApexException on an execution error */ void executePre(long executionId, I incomingEntity) throws ApexException; @@ -89,8 +86,7 @@ public interface Executor { * * @param returnValue the return value indicates whether the execution was successful and, if it * failed, how it failed - * @throws StateMachineException on an execution error - * @throws ContextException On context errors + * @throws ApexException on an execution error */ void executePost(boolean returnValue) throws ApexException; diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java index 1bdf39317..7070daad3 100644 --- a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java +++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java @@ -39,7 +39,6 @@ import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; * * https://github.com/KetothXupack/stackoverflow-answers/tree/master/q39401083
*/ -@SuppressWarnings("restriction") public class ClassBuilder { // Logger for this class private static final XLogger LOGGER = XLoggerFactory.getXLogger(ClassBuilder.class); -- cgit 1.2.3-korg