From: Robert Varga Date: Mon, 23 Apr 2018 13:49:28 +0000 (+0200) Subject: Fix deprecation warnings and checkstyle in benchmarks X-Git-Tag: release/fluorine~5 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4eafc030622cc6dc155c452b6c6547eac7b5b616 Fix deprecation warnings and checkstyle in benchmarks This fixes up warnings/checkstyle and flips the enforcement switch. Change-Id: I22754c767ef643d703286a30252cf57006062ade Signed-off-by: Robert Varga --- diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml index bd10dabbef..6d1c7bc0cc 100644 --- a/benchmark/dsbenchmark/pom.xml +++ b/benchmark/dsbenchmark/pom.xml @@ -54,37 +54,43 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jacoco - - jacoco-maven-plugin - - - [0.7.2.201409121644,) - - - prepare-agent - - - - - - - - - - + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jacoco + jacoco-maven-plugin + [0.7.2.201409121644,) + + prepare-agent + + + + + + + + + + diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/BaListBuilder.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/BaListBuilder.java index 28ff58f618..8378e8b3c8 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/BaListBuilder.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/BaListBuilder.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.dsbenchmark; import java.util.ArrayList; @@ -18,27 +17,31 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchm import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.outer.list.InnerListKey; public final class BaListBuilder { + private BaListBuilder() { + + } + public static List buildOuterList(final int outerElements, final int innerElements) { List outerList = new ArrayList<>(outerElements); for (int j = 0; j < outerElements; j++) { outerList.add(new OuterListBuilder() - .setId( j ) + .setId(j) .setInnerList(buildInnerList(j, innerElements)) - .withKey(new OuterListKey( j )) + .withKey(new OuterListKey(j)) .build()); } return outerList; } - private static List buildInnerList( final int index, final int elements ) { - List innerList = new ArrayList<>( elements ); + private static List buildInnerList(final int index, final int elements) { + List innerList = new ArrayList<>(elements); final String itemStr = "Item-" + String.valueOf(index) + "-"; for (int i = 0; i < elements; i++) { innerList.add(new InnerListBuilder() - .withKey( new InnerListKey( i ) ) + .withKey(new InnerListKey(i)) .setName(i) - .setValue( itemStr + String.valueOf( i ) ) + .setValue(itemStr + String.valueOf(i)) .build()); } return innerList; diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java index 84bb61f9ad..50eb0d4e8b 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java @@ -24,13 +24,11 @@ public abstract class DatastoreAbstractWriter { protected final StartTestInput.DataStore dataStore; protected final Random rn = new Random(); - protected int txOk = 0; protected int txError = 0; - public DatastoreAbstractWriter(final StartTestInput.Operation oper, - final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { + final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { this.outerListElem = outerListElem; this.innerListElem = innerListElem; this.writesPerTx = writesPerTx; diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java index cc4fc045ce..2641fead35 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java @@ -10,7 +10,6 @@ package org.opendaylight.dsbenchmark; import java.util.ArrayList; import java.util.List; - import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.outer.list.InnerList; import org.opendaylight.yangtools.yang.common.QName; @@ -28,6 +27,10 @@ public final class DomListBuilder { // Outer List Qname identifier for yang model's 'id' private static final org.opendaylight.yangtools.yang.common.QName OL_ID = QName.create(OuterList.QNAME, "id"); + private DomListBuilder() { + + } + public static List buildOuterList(final int outerElements, final int innerElements) { List outerList = new ArrayList<>(outerElements); for (int j = 0; j < outerElements; j++) { @@ -40,7 +43,7 @@ public final class DomListBuilder { return outerList; } - private static MapNode buildInnerList(final int index, final int elements ) { + private static MapNode buildInnerList(final int index, final int elements) { CollectionNodeBuilder innerList = ImmutableNodes.mapNodeBuilder(InnerList.QNAME); final String itemStr = "Item-" + String.valueOf(index) + "-"; diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java index 91c53ccf91..0cf0195ca4 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java @@ -73,6 +73,7 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { this.simpleTxDataBroker = simpleTxDataBroker; } + @SuppressWarnings("checkstyle:illegalCatch") public void init() { listenerProvider.setDataBroker(simpleTxDataBroker); @@ -100,6 +101,7 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { } @Override + @SuppressWarnings("checkstyle:illegalCatch") public ListenableFuture> startTest(final StartTestInput input) { LOG.info("Starting the data store benchmark test, input: {}", input); @@ -120,14 +122,14 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { // Create listeners on OPERATIONAL and CONFIG test data subtrees listenerProvider.createAndRegisterListeners(input.getListeners().intValue()); - long startTime, endTime, listCreateTime, execTime; - startTime = System.nanoTime(); + long startTime = System.nanoTime(); dsWriter.createList(); - endTime = System.nanoTime(); - listCreateTime = (endTime - startTime) / 1000; + long endTime = System.nanoTime(); + final long listCreateTime = (endTime - startTime) / 1000; // Run the test and measure the execution time + long execTime; try { startTime = System.nanoTime(); dsWriter.executeList(); diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java index d0385252ef..181ff23f0b 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java @@ -31,7 +31,7 @@ public class SimpletxDomWrite extends DatastoreAbstractWriter { private List list; public SimpletxDomWrite(final DOMDataBroker domDataBroker, final StartTestInput.Operation oper, - final int outerListElem, final int innerListElem, final long putsPerTx, final DataStore dataStore ) { + final int outerListElem, final int innerListElem, final long putsPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, putsPerTx, dataStore); this.domDataBroker = domDataBroker; LOG.debug("Created SimpletxDomWrite"); diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java index fb4d028871..5455162e2f 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java @@ -80,8 +80,8 @@ public class TxchainBaDelete extends DatastoreAbstractWriter implements Transact } @Override - public void onFailure(final Throwable t) { - LOG.error("Transaction failed, {}", t); + public void onFailure(final Throwable cause) { + LOG.error("Transaction failed", cause); txError++; } }, MoreExecutors.directExecutor()); diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java index 0a7ec6d220..efedbfc1db 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java @@ -36,7 +36,7 @@ public class TxchainBaWrite extends DatastoreAbstractWriter implements Transacti private List list; public TxchainBaWrite(final DataBroker bindingDataBroker, final Operation oper, - final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { + final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, writesPerTx, dataStore); this.bindingDataBroker = bindingDataBroker; LOG.debug("Created TxchainBaWrite"); @@ -77,8 +77,8 @@ public class TxchainBaWrite extends DatastoreAbstractWriter implements Transacti } @Override - public void onFailure(final Throwable t) { - LOG.error("Transaction failed, {}", t); + public void onFailure(final Throwable cause) { + LOG.error("Transaction failed", cause); txError++; } }, MoreExecutors.directExecutor()); @@ -118,4 +118,4 @@ public class TxchainBaWrite extends DatastoreAbstractWriter implements Transacti LOG.debug("DatastoreBaAbstractWrite closed successfully, chain {}", chain); } -} \ No newline at end of file +} diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java index 81017f42bd..5135a92602 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java @@ -83,8 +83,8 @@ public class TxchainDomDelete extends DatastoreAbstractWriter implements Transac } @Override - public void onFailure(final Throwable t) { - LOG.error("Transaction failed, {}", t); + public void onFailure(final Throwable cause) { + LOG.error("Transaction failed", cause); txError++; } }, MoreExecutors.directExecutor()); diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java index 2d0bf63f56..65393febd0 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java @@ -36,8 +36,8 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact private final DOMDataBroker domDataBroker; private List list; - public TxchainDomWrite(final DOMDataBroker domDataBroker, final StartTestInput.Operation oper, final int outerListElem, - final int innerListElem, final long writesPerTx, final DataStore dataStore) { + public TxchainDomWrite(final DOMDataBroker domDataBroker, final StartTestInput.Operation oper, + final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, writesPerTx, dataStore); this.domDataBroker = domDataBroker; LOG.debug("Created TxchainDomWrite"); @@ -81,8 +81,8 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact } @Override - public void onFailure(final Throwable t) { - LOG.error("Transaction failed, {}", t); + public void onFailure(final Throwable cause) { + LOG.error("Transaction failed", cause); txError++; } }, MoreExecutors.directExecutor()); diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml index ffc0eeeade..edb1fe6fd5 100644 --- a/benchmark/ntfbenchmark/pom.xml +++ b/benchmark/ntfbenchmark/pom.xml @@ -53,4 +53,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationseverity=error + + + + diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/AbstractNtfbenchProducer.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/AbstractNtfbenchProducer.java index 5dc6618e9c..e658580c5f 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/AbstractNtfbenchProducer.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/AbstractNtfbenchProducer.java @@ -21,7 +21,12 @@ public abstract class AbstractNtfbenchProducer implements Runnable { protected final int iterations; protected final Ntfbench ntf; + protected int ntfOk = 0; + protected int ntfError = 0; + /** + * Return number of successful notifications. + * * @return the ntfOk */ public int getNtfOk() { @@ -29,15 +34,14 @@ public abstract class AbstractNtfbenchProducer implements Runnable { } /** + * Return number of unsuccessful notifications. + * * @return the ntfError */ public int getNtfError() { return ntfError; } - protected int ntfOk = 0; - protected int ntfError = 0; - public AbstractNtfbenchProducer(final NotificationPublishService publishService, final int iterations, final int payloadSize) { this.publishService = publishService; diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchBlockingProducer.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchBlockingProducer.java index b086910f1c..b1bc070196 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchBlockingProducer.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchBlockingProducer.java @@ -18,6 +18,7 @@ public class NtfbenchBlockingProducer extends AbstractNtfbenchProducer { } @Override + @SuppressWarnings("checkstyle:illegalCatch") public void run() { int ntfOk = 0; int ntfError = 0; diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java index e92c1f7891..485eb15807 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchNonblockingProducer.java @@ -25,6 +25,7 @@ public class NtfbenchNonblockingProducer extends AbstractNtfbenchProducer { @Override + @SuppressWarnings("checkstyle:illegalCatch") public void run() { int ntfOk = 0; int ntfError = 0; diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java index cad1d359ea..d126b2774a 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchTestListener.java @@ -5,16 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package ntfbenchmark.impl; +import com.google.common.util.concurrent.Futures; import java.util.concurrent.Future; - import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbench.payload.rev150709.Ntfbench; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbench.payload.rev150709.NtfbenchPayloadListener; -import com.google.common.util.concurrent.Futures; - public class NtfbenchTestListener implements NtfbenchPayloadListener { private final int expectedSize; @@ -38,5 +35,4 @@ public class NtfbenchTestListener implements NtfbenchPayloadListener { public Future getAllDone() { return Futures.immediateFuture(null); } - } diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchWTCListener.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchWTCListener.java index 1e63c4b75d..1b16329d52 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchWTCListener.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchWTCListener.java @@ -5,12 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package ntfbenchmark.impl; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbench.payload.rev150709.Ntfbench; - import com.google.common.util.concurrent.SettableFuture; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ntfbench.payload.rev150709.Ntfbench; public class NtfbenchWTCListener extends NtfbenchTestListener { private final int expectedCount; @@ -30,6 +28,7 @@ public class NtfbenchWTCListener extends NtfbenchTestListener { } } + @Override public SettableFuture getAllDone() { return allDone; } diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java index cb5925f68a..c11f676daf 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java @@ -30,11 +30,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class NtfbenchmarkProvider implements AutoCloseable, NtfbenchmarkService { - private static final Logger LOG = LoggerFactory.getLogger(NtfbenchmarkProvider.class); + private static final int TEST_TIMEOUT = 5; + private final NotificationService listenService; private final NotificationPublishService publishService; - private static final int testTimeout = 5; public NtfbenchmarkProvider(final NotificationService listenServiceDependency, final NotificationPublishService publishServiceDependency) { @@ -87,12 +87,12 @@ public class NtfbenchmarkProvider implements AutoCloseable, NtfbenchmarkService } executor.shutdown(); try { - executor.awaitTermination(testTimeout, TimeUnit.MINUTES); + executor.awaitTermination(TEST_TIMEOUT, TimeUnit.MINUTES); for (ListenerRegistration listenerRegistration : listeners) { listenerRegistration.getInstance().getAllDone().get(); } } catch (final InterruptedException | ExecutionException e) { - LOG.error("Out of time: test did not finish within the {} min deadline ", testTimeout); + LOG.error("Out of time: test did not finish within the {} min deadline ", TEST_TIMEOUT); } final long producerEndTime = System.nanoTime(); diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml index 808c2c0970..86661321a1 100644 --- a/benchmark/rpcbenchmark/pom.xml +++ b/benchmark/rpcbenchmark/pom.xml @@ -53,4 +53,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationseverity=error + + + +