aboutsummaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2018-12-03 14:35:21 +0000
committerliamfallon <liam.fallon@est.tech>2018-12-03 14:41:52 +0000
commit9104eb39d56848952e68d660bdc3cc7500789501 (patch)
tree66ac25de7e95dfbc9ab9b3f0b1a41a57bb18d48f /testsuites
parentfb7c89ebe2e682170b09275a5e531d0a49d70ada (diff)
Fix checkstyle/sonar issues
Remove unused imports Add @FunctionalInterface annotation Reduce the complexity of some methods Change-Id: If519c31b113233361fbb935121fe6494263ac957 Issue-ID: POLICY-1074 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java1
-rw-r--r--testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java1
-rw-r--r--testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/testsuites/performance/context/metrics/ConcurrentContextMetrics.java81
3 files changed, 40 insertions, 43 deletions
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
index 08ad008f4..e860da7c1 100644
--- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
@@ -23,7 +23,6 @@ package org.onap.policy.apex.testsuites.integration.common.model.java;
import java.util.Random;
import org.onap.policy.apex.core.engine.executor.context.TaskExecutionContext;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
/**
* The Class DefaultTask_Logic is default task logic in Java.
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java
index 8ba4b879f..f4c4945aa 100644
--- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java
@@ -21,7 +21,6 @@
package org.onap.policy.apex.testsuites.integration.common.model.java;
import org.onap.policy.apex.core.engine.executor.context.TaskExecutionContext;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
/**
* The Class EvalTask_Logic is default evaluation task logic in Java.
diff --git a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/testsuites/performance/context/metrics/ConcurrentContextMetrics.java b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/testsuites/performance/context/metrics/ConcurrentContextMetrics.java
index c4e4de480..b0bfb1ce7 100644
--- a/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/testsuites/performance/context/metrics/ConcurrentContextMetrics.java
+++ b/testsuites/performance/performance-context-metrics/src/main/java/org/onap/policy/apex/testsuites/performance/context/metrics/ConcurrentContextMetrics.java
@@ -73,39 +73,6 @@ public class ConcurrentContextMetrics {
private final int zookeeperPort;
/**
- * The main method.
- *
- * @param args the args
- * @throws Exception the exception
- */
- public static void main(final String[] args) throws Exception {
- if (args.length != NUM_ARGS) {
- String errorMessage = "Args: " + Arrays.toString(args)
- + "\nusage: testLabel jvmCount threadCount threadLoops longArraySize lockType "
- + "zookeeperAddress zookeeperPort zookeeperDirectory";
- LOGGER.info(errorMessage);
- return;
- }
-
- final ConfigrationProvider configrationProvider = new ConfigrationProviderImpl(args[ARG_LABEL],
- Integer.valueOf(args[ARG_JVM_COUNT]), Integer.valueOf(args[ARG_THREAD_COUNT]),
- Integer.valueOf(args[ARG_ITERATIONS]), Integer.valueOf(args[ARG_ARRAY_SIZE]),
- Integer.valueOf(args[ARG_LOCK_TYPE]));
-
- final ConcurrentContextMetrics concurrentContextMetrics = new ConcurrentContextMetrics(configrationProvider,
- args[ARG_ZOOKEEPER_ADDRESS], Integer.valueOf(args[ARG_ZOOKEEPER_PORT]),
- args[ARG_ZOOKEEPER_DIRECTORY]);
-
- concurrentContextMetrics.concurrentContextMetricsJvmLocal();
- concurrentContextMetrics.concurrentContextMetricsCurator();
- concurrentContextMetrics.concurrentContextMetricsHazelcast();
- concurrentContextMetrics.concurrentContextMetricsHazelcastMultiJvmHazelcastLock();
- concurrentContextMetrics.concurrentContextMetricsInfinispanMultiJvmHazelcastlock();
- concurrentContextMetrics.concurrentContextMetricsInfinispanMultiJvmCuratorLock();
- concurrentContextMetrics.concurrentContextMetricsHazelcastMultiJvmCuratorLock();
- }
-
- /**
* Construct a concurrent context object.
*
* @param configrationProvider Configuration for the context metrics
@@ -128,7 +95,7 @@ public class ConcurrentContextMetrics {
* @throws IOException the IO exception
* @throws ApexException the apex exception
*/
- private void concurrentContextMetricsJvmLocal() throws IOException, ApexException {
+ private void concurrentContextMetricsJvmLocal() throws ApexException {
if (configrationProvider.getJvmCount() != 1) {
return;
}
@@ -149,7 +116,7 @@ public class ConcurrentContextMetrics {
* @throws IOException the IO exception
* @throws ApexException the apex exception
*/
- private void concurrentContextMetricsHazelcast() throws IOException, ApexException {
+ private void concurrentContextMetricsHazelcast() throws ApexException {
if (configrationProvider.getJvmCount() != 1) {
return;
}
@@ -170,7 +137,7 @@ public class ConcurrentContextMetrics {
* @throws IOException the IO exception
* @throws ApexException the apex exception
*/
- private void concurrentContextMetricsCurator() throws IOException, ApexException {
+ private void concurrentContextMetricsCurator() throws ApexException {
if (configrationProvider.getJvmCount() != 1) {
return;
}
@@ -196,7 +163,7 @@ public class ConcurrentContextMetrics {
* @throws IOException the IO exception
* @throws ApexException the apex exception
*/
- private void concurrentContextMetricsHazelcastMultiJvmHazelcastLock() throws IOException, ApexException {
+ private void concurrentContextMetricsHazelcastMultiJvmHazelcastLock() throws ApexException {
LOGGER.debug("Running concurrentContextMetricsHazelcastMultiJVMHazelcastLock metrics . . .");
final ContextParameters contextParameters = new ContextParameters();
@@ -214,7 +181,7 @@ public class ConcurrentContextMetrics {
* @throws IOException the IO exception
* @throws ApexException the apex exception
*/
- private void concurrentContextMetricsInfinispanMultiJvmHazelcastlock() throws IOException, ApexException {
+ private void concurrentContextMetricsInfinispanMultiJvmHazelcastlock() throws ApexException {
LOGGER.debug("Running concurrentContextMetricsInfinispanMultiJVMHazelcastlock metrics . . .");
final ContextParameters contextParameters = new ContextParameters();
@@ -238,7 +205,7 @@ public class ConcurrentContextMetrics {
* @throws InterruptedException on interrupts
*/
private void concurrentContextMetricsInfinispanMultiJvmCuratorLock()
- throws IOException, ApexException, InterruptedException {
+ throws ApexException {
LOGGER.debug("Running concurrentContextMetricsInfinispanMultiJVMCuratorLock metrics . . .");
@@ -273,7 +240,7 @@ public class ConcurrentContextMetrics {
* @throws InterruptedException on interrupts
*/
private void concurrentContextMetricsHazelcastMultiJvmCuratorLock()
- throws IOException, ApexException, InterruptedException {
+ throws ApexException {
LOGGER.debug("Running concurrentContextMetricsHazelcastMultiJVMCuratorLock metrics . . .");
final ZooKeeperServerServiceProvider zooKeeperServerServiceProvider = new ZooKeeperServerServiceProvider(
@@ -304,7 +271,7 @@ public class ConcurrentContextMetrics {
* @throws IOException the IO exception
* @throws ApexException the apex exception
*/
- private void runConcurrentContextMetrics(final String testName) throws IOException, ApexException {
+ private void runConcurrentContextMetrics(final String testName) throws ApexException {
final ConcurrentContext concurrentContext = new ConcurrentContext(configrationProvider);
LOGGER.info("Running {} ...", testName);
@@ -320,4 +287,36 @@ public class ConcurrentContextMetrics {
LOGGER.info("Completed {} ...", testName);
}
+ /**
+ * The main method.
+ *
+ * @param args the args
+ * @throws Exception the exception
+ */
+ public static void main(final String[] args) throws Exception {
+ if (args.length != NUM_ARGS) {
+ String errorMessage = "Args: " + Arrays.toString(args)
+ + "\nusage: testLabel jvmCount threadCount threadLoops longArraySize lockType "
+ + "zookeeperAddress zookeeperPort zookeeperDirectory";
+ LOGGER.info(errorMessage);
+ return;
+ }
+
+ final ConfigrationProvider configrationProvider = new ConfigrationProviderImpl(args[ARG_LABEL],
+ Integer.valueOf(args[ARG_JVM_COUNT]), Integer.valueOf(args[ARG_THREAD_COUNT]),
+ Integer.valueOf(args[ARG_ITERATIONS]), Integer.valueOf(args[ARG_ARRAY_SIZE]),
+ Integer.valueOf(args[ARG_LOCK_TYPE]));
+
+ final ConcurrentContextMetrics concurrentContextMetrics = new ConcurrentContextMetrics(configrationProvider,
+ args[ARG_ZOOKEEPER_ADDRESS], Integer.valueOf(args[ARG_ZOOKEEPER_PORT]),
+ args[ARG_ZOOKEEPER_DIRECTORY]);
+
+ concurrentContextMetrics.concurrentContextMetricsJvmLocal();
+ concurrentContextMetrics.concurrentContextMetricsCurator();
+ concurrentContextMetrics.concurrentContextMetricsHazelcast();
+ concurrentContextMetrics.concurrentContextMetricsHazelcastMultiJvmHazelcastLock();
+ concurrentContextMetrics.concurrentContextMetricsInfinispanMultiJvmHazelcastlock();
+ concurrentContextMetrics.concurrentContextMetricsInfinispanMultiJvmCuratorLock();
+ concurrentContextMetrics.concurrentContextMetricsHazelcastMultiJvmCuratorLock();
+ }
}