From d151bb0f9c43d28b5aa2acf60ef046733613e16a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 3 Dec 2022 01:32:37 +0100 Subject: [PATCH] Fixup Sonar issues Perform automatic conversions and also fixup Sonar issues reported, which tend to be very minor. Change-Id: Ia0d980105f4635218bacb9161a39ecb87838a9ff Signed-off-by: Robert Varga --- .../dsbenchmark/BaListBuilder.java | 18 ++-- .../dsbenchmark/DatastoreAbstractWriter.java | 11 +-- .../dsbenchmark/DomListBuilder.java | 18 ++-- .../dsbenchmark/DsbenchmarkProvider.java | 84 +++++++++---------- .../dsbenchmark/simpletx/SimpletxBaRead.java | 2 +- .../dsbenchmark/txchain/TxchainBaRead.java | 8 +- .../impl/NtfbenchmarkProvider.java | 2 +- .../blueprint/ext/BindingContext.java | 12 +-- .../DataStoreAppConfigDefaultXMLReader.java | 7 +- .../ext/DataStoreAppConfigMetadata.java | 6 +- .../access/client/ProgressTracker.java | 16 ++-- .../cluster/access/client/TransmitQueue.java | 7 +- .../cluster/raft/behaviors/Follower.java | 8 +- .../datastore/AbstractFrontendHistory.java | 2 +- .../DelayedTransactionContextWrapper.java | 2 +- .../identifiers/ShardIdentifier.java | 21 ++--- .../identifiers/ShardManagerIdentifier.java | 20 ++--- .../messages/ForwardedReadyTransaction.java | 8 +- 18 files changed, 103 insertions(+), 149 deletions(-) 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 e6c9548d5f..444ec2fc75 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/BaListBuilder.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/BaListBuilder.java @@ -28,10 +28,10 @@ public final class BaListBuilder { List outerList = new ArrayList<>(outerElements); for (int j = 0; j < outerElements; j++) { outerList.add(new OuterListBuilder() - .setId(j) - .setInnerList(buildInnerList(j, innerElements)) - .withKey(new OuterListKey(j)) - .build()); + .setId(j) + .setInnerList(buildInnerList(j, innerElements)) + .withKey(new OuterListKey(j)) + .build()); } return outerList; } @@ -39,14 +39,14 @@ public final class BaListBuilder { private static Map buildInnerList(final int index, final int elements) { Builder innerList = ImmutableMap.builderWithExpectedSize(elements); - final String itemStr = "Item-" + String.valueOf(index) + "-"; + final String itemStr = "Item-" + index + "-"; for (int i = 0; i < elements; i++) { final InnerListKey key = new InnerListKey(i); innerList.put(key, new InnerListBuilder() - .withKey(key) - .setName(i) - .setValue(itemStr + String.valueOf(i)) - .build()); + .withKey(key) + .setName(i) + .setValue(itemStr + i) + .build()); } return innerList.build(); } 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 2db5aa1ff8..bddf80e880 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java @@ -52,14 +52,7 @@ public abstract class DatastoreAbstractWriter { } protected LogicalDatastoreType getDataStoreType() { - final LogicalDatastoreType dsType; - if (dataStore == DataStore.CONFIG) { - dsType = LogicalDatastoreType.CONFIGURATION; - } else if ((dataStore == DataStore.OPERATIONAL) || (rn.nextBoolean() == true)) { - dsType = LogicalDatastoreType.OPERATIONAL; - } else { - dsType = LogicalDatastoreType.CONFIGURATION; - } - return dsType; + return dataStore == DataStore.CONFIG || dataStore != DataStore.OPERATIONAL && !rn.nextBoolean() + ? LogicalDatastoreType.CONFIGURATION : LogicalDatastoreType.OPERATIONAL; } } 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 6886864378..9cfd260a1f 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DomListBuilder.java @@ -36,10 +36,10 @@ public final class DomListBuilder { List outerList = new ArrayList<>(outerElements); for (int j = 0; j < outerElements; j++) { outerList.add(ImmutableNodes.mapEntryBuilder() - .withNodeIdentifier(NodeIdentifierWithPredicates.of(OuterList.QNAME, OL_ID, j)) - .withChild(ImmutableNodes.leafNode(OL_ID, j)) - .withChild(buildInnerList(j, innerElements)) - .build()); + .withNodeIdentifier(NodeIdentifierWithPredicates.of(OuterList.QNAME, OL_ID, j)) + .withChild(ImmutableNodes.leafNode(OL_ID, j)) + .withChild(buildInnerList(j, innerElements)) + .build()); } return outerList; } @@ -47,13 +47,13 @@ public final class DomListBuilder { private static MapNode buildInnerList(final int index, final int elements) { CollectionNodeBuilder innerList = ImmutableNodes.mapNodeBuilder(InnerList.QNAME); - final String itemStr = "Item-" + String.valueOf(index) + "-"; + final String itemStr = "Item-" + index + "-"; for (int i = 0; i < elements; i++) { innerList.addChild(ImmutableNodes.mapEntryBuilder() - .withNodeIdentifier(NodeIdentifierWithPredicates.of(InnerList.QNAME, IL_NAME, i)) - .withChild(ImmutableNodes.leafNode(IL_NAME, i)) - .withChild(ImmutableNodes.leafNode(IL_VALUE, itemStr + String.valueOf(i))) - .build()); + .withNodeIdentifier(NodeIdentifierWithPredicates.of(InnerList.QNAME, IL_NAME, i)) + .withChild(ImmutableNodes.leafNode(IL_NAME, i)) + .withChild(ImmutableNodes.leafNode(IL_VALUE, itemStr + String.valueOf(i))) + .build()); } return innerList.build(); } 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 0bcc581184..436838c3e5 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java @@ -65,15 +65,15 @@ import org.slf4j.LoggerFactory; @RequireServiceComponentRuntime public final class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(DsbenchmarkProvider.class); - private static final InstanceIdentifier TEST_EXEC_IID = - InstanceIdentifier.builder(TestExec.class).build(); - private static final InstanceIdentifier TEST_STATUS_IID = - InstanceIdentifier.builder(TestStatus.class).build(); + private static final InstanceIdentifier TEST_EXEC_IID = InstanceIdentifier.create(TestExec.class); + private static final InstanceIdentifier TEST_STATUS_IID = InstanceIdentifier.create(TestStatus.class); private final AtomicReference execStatus = new AtomicReference<>(ExecStatus.Idle); private final DsbenchmarkListenerProvider listenerProvider; - private final DOMDataBroker domDataBroker; // Async DOM Broker for use with all DOM operations - private final DataBroker dataBroker; // Async Binding-Aware Broker for use in tx chains + // Async DOM Broker for use with all DOM operations + private final DOMDataBroker domDataBroker; + // Async Binding-Aware Broker for use in tx chains; + private final DataBroker dataBroker; private final Registration rpcReg; private long testsCompleted = 0; @@ -120,11 +120,11 @@ public final class DsbenchmarkProvider implements DsbenchmarkService, AutoClosea LOG.info("Starting the data store benchmark test, input: {}", input); // Check if there is a test in progress - if (execStatus.compareAndSet(ExecStatus.Idle, ExecStatus.Executing) == false) { + if (!execStatus.compareAndSet(ExecStatus.Idle, ExecStatus.Executing)) { LOG.info("Test in progress"); return RpcResultBuilder.success(new StartTestOutputBuilder() - .setStatus(StartTestOutput.Status.TESTINPROGRESS) - .build()).buildFuture(); + .setStatus(StartTestOutput.Status.TESTINPROGRESS) + .build()).buildFuture(); } // Cleanup data that may be left over from a previous test run @@ -153,11 +153,11 @@ public final class DsbenchmarkProvider implements DsbenchmarkService, AutoClosea testsCompleted++; } catch (final Exception e) { - LOG.error("Test error: {}", e.toString()); + LOG.error("Test error", e); execStatus.set(ExecStatus.Idle); return RpcResultBuilder.success(new StartTestOutputBuilder() - .setStatus(StartTestOutput.Status.FAILED) - .build()).buildFuture(); + .setStatus(StartTestOutput.Status.FAILED) + .build()).buildFuture(); } LOG.info("Test finished"); @@ -249,43 +249,37 @@ public final class DsbenchmarkProvider implements DsbenchmarkService, AutoClosea retVal = new SimpletxBaWrite(dataBroker, oper, outerListElem, innerListElem, writesPerTx, dataStore); } + } else if (StartTestInput.Operation.DELETE == oper) { + retVal = new SimpletxDomDelete(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + } else if (StartTestInput.Operation.READ == oper) { + retVal = new SimpletxDomRead(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); } else { - if (StartTestInput.Operation.DELETE == oper) { - retVal = new SimpletxDomDelete(domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else if (StartTestInput.Operation.READ == oper) { - retVal = new SimpletxDomRead(domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else { - retVal = new SimpletxDomWrite(domDataBroker, oper, outerListElem, - innerListElem, writesPerTx, dataStore); - } + retVal = new SimpletxDomWrite(domDataBroker, oper, outerListElem, + innerListElem, writesPerTx, dataStore); } - } else { - if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) { - if (StartTestInput.Operation.DELETE == oper) { - retVal = new TxchainBaDelete(dataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else if (StartTestInput.Operation.READ == oper) { - retVal = new TxchainBaRead(dataBroker, outerListElem, - innerListElem,writesPerTx, dataStore); - } else { - retVal = new TxchainBaWrite(dataBroker, oper, outerListElem, - innerListElem, writesPerTx, dataStore); - } + } else if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) { + if (StartTestInput.Operation.DELETE == oper) { + retVal = new TxchainBaDelete(dataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + } else if (StartTestInput.Operation.READ == oper) { + retVal = new TxchainBaRead(dataBroker, outerListElem, + innerListElem,writesPerTx, dataStore); } else { - if (StartTestInput.Operation.DELETE == oper) { - retVal = new TxchainDomDelete(domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else if (StartTestInput.Operation.READ == oper) { - retVal = new TxchainDomRead(domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - - } else { - retVal = new TxchainDomWrite(domDataBroker, oper, outerListElem, - innerListElem,writesPerTx, dataStore); - } + retVal = new TxchainBaWrite(dataBroker, oper, outerListElem, + innerListElem, writesPerTx, dataStore); } + } else if (StartTestInput.Operation.DELETE == oper) { + retVal = new TxchainDomDelete(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + } else if (StartTestInput.Operation.READ == oper) { + retVal = new TxchainDomRead(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + + } else { + retVal = new TxchainDomWrite(domDataBroker, oper, outerListElem, + innerListElem,writesPerTx, dataStore); } } finally { execStatus.set(ExecStatus.Idle); diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java index aae96750a9..a879e8e2ee 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java @@ -77,7 +77,7 @@ public class SimpletxBaRead extends DatastoreAbstractWriter { } for (int i = 0; i < outerList.getInnerList().size(); i++) { String itemStr = objectsArray[i]; - if (!itemStr.contentEquals("Item-" + String.valueOf(l) + "-" + String.valueOf(i))) { + if (!itemStr.contentEquals("Item-" + l + "-" + i)) { LOG.error("innerList: name: {}, value: {}", i, itemStr); break; } diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java index 414ad159af..9ee8a9f898 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java @@ -66,17 +66,17 @@ public class TxchainBaRead extends DatastoreAbstractWriter implements Transactio if (optionalDataObject != null && optionalDataObject.isPresent()) { OuterList outerList = optionalDataObject.get(); - String[] objectsArray = new String[outerList.getInnerList().size()]; - for (InnerList innerList : outerList.getInnerList().values()) { + String[] objectsArray = new String[outerList.nonnullInnerList().size()]; + for (InnerList innerList : outerList.nonnullInnerList().values()) { if (objectsArray[innerList.getName()] != null) { LOG.error("innerList: DUPLICATE name: {}, value: {}", innerList.getName(), innerList.getValue()); } objectsArray[innerList.getName()] = innerList.getValue(); } - for (int i = 0; i < outerList.getInnerList().size(); i++) { + for (int i = 0; i < outerList.nonnullInnerList().size(); i++) { String itemStr = objectsArray[i]; - if (!itemStr.contentEquals("Item-" + String.valueOf(l) + "-" + String.valueOf(i))) { + if (!itemStr.contentEquals("Item-" + l + "-" + i)) { LOG.error("innerList: name: {}, value: {}", i, itemStr); break; } diff --git a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java index acd5af6143..5509eb047d 100644 --- a/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java +++ b/benchmark/ntfbenchmark/src/main/java/ntfbenchmark/impl/NtfbenchmarkProvider.java @@ -114,7 +114,7 @@ public final class NtfbenchmarkProvider implements AutoCloseable, NtfbenchmarkSe listenerRegistration.getInstance().getAllDone().get(); } } catch (final InterruptedException | ExecutionException e) { - LOG.error("Out of time: test did not finish within the {} min deadline ", TEST_TIMEOUT); + LOG.error("Out of time: test did not finish within the {} min deadline ", TEST_TIMEOUT, e); } final long producerEndTime = System.nanoTime(); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java index 14b7966606..2a6b3d56f8 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java @@ -15,7 +15,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; import java.util.Set; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; @@ -25,7 +24,6 @@ import org.opendaylight.yangtools.yang.binding.Identifiable; import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; @@ -88,20 +86,14 @@ public abstract class BindingContext { } public NormalizedNode parseDataElement(final Element element, final SchemaTreeInference dataSchema) - throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { + throws XMLStreamException, IOException, SAXException, URISyntaxException { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); final XmlParserStream xmlParser = XmlParserStream.create(writer, dataSchema); xmlParser.traverse(new DOMSource(element)); final NormalizedNode result = resultHolder.getResult(); - if (result instanceof MapNode) { - final MapNode mapNode = (MapNode) result; - final MapEntryNode mapEntryNode = mapNode.body().iterator().next(); - return mapEntryNode; - } - - return result; + return result instanceof MapNode mapNode ? mapNode.body().iterator().next() : result; } public abstract NormalizedNode newDefaultNode(SchemaTreeInference dataSchema); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java index c147492955..0960fa83c3 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java @@ -54,7 +54,7 @@ public class DataStoreAppConfigDefaultXMLReader { @FunctionalInterface public interface FallbackConfigProvider { NormalizedNode get(SchemaTreeInference dataSchema) - throws IOException, XMLStreamException, ParserConfigurationException, SAXException, URISyntaxException; + throws IOException, XMLStreamException, SAXException, URISyntaxException; } @FunctionalInterface @@ -103,7 +103,7 @@ public class DataStoreAppConfigDefaultXMLReader { @SuppressWarnings("unchecked") public T createDefaultInstance(final FallbackConfigProvider fallback) throws ConfigXMLReaderException, - URISyntaxException, ParserConfigurationException, XMLStreamException, SAXException, IOException { + URISyntaxException, XMLStreamException, SAXException, IOException { YangInstanceIdentifier yangPath = bindingSerializer.toYangInstanceIdentifier(bindingContext.appConfigPath); LOG.debug("{}: Creating app config instance from path {}, Qname: {}", logName, yangPath, @@ -185,8 +185,7 @@ public class DataStoreAppConfigDefaultXMLReader { LOG.debug("{}: Parsed data node: {}", logName, dataNode); return dataNode; - } catch (final IOException | SAXException | XMLStreamException | ParserConfigurationException - | URISyntaxException e) { + } catch (final IOException | SAXException | XMLStreamException | URISyntaxException e) { String msg = String.format("%s: Could not read/parse app config %s", logName, url); LOG.error(msg, e); throw new ConfigXMLReaderException(msg, e); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java index 4fb49414fd..906b11c0b2 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java @@ -17,7 +17,6 @@ import java.util.Collection; import java.util.Objects; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.eclipse.jdt.annotation.NonNull; @@ -268,8 +267,7 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor } }); - } catch (final ConfigXMLReaderException | IOException | SAXException | XMLStreamException - | ParserConfigurationException | URISyntaxException e) { + } catch (ConfigXMLReaderException | IOException | SAXException | XMLStreamException | URISyntaxException e) { if (e.getCause() == null) { setFailureMessage(e.getMessage()); } else { @@ -280,7 +278,7 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor } private @Nullable NormalizedNode parsePossibleDefaultAppConfigElement(final SchemaTreeInference dataSchema) - throws URISyntaxException, IOException, ParserConfigurationException, SAXException, XMLStreamException { + throws URISyntaxException, IOException, SAXException, XMLStreamException { if (defaultAppConfigElement == null) { return null; } diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ProgressTracker.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ProgressTracker.java index fed9d4c5d3..677a57e770 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ProgressTracker.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ProgressTracker.java @@ -118,12 +118,13 @@ abstract class ProgressTracker { * @param now tick number corresponding to caller's present */ ProgressTracker(final ProgressTracker oldTracker, final long now) { - this.defaultTicksPerTask = oldTracker.defaultTicksPerTask; - this.tasksEncountered = this.tasksClosed = oldTracker.tasksClosed; - this.lastClosed = oldTracker.lastClosed; - this.nearestAllowed = oldTracker.nearestAllowed; // Call cancelDebt explicitly if needed. - this.lastIdle = oldTracker.lastIdle; - this.elapsedBeforeIdle = oldTracker.elapsedBeforeIdle; + defaultTicksPerTask = oldTracker.defaultTicksPerTask; + tasksEncountered = tasksClosed = oldTracker.tasksClosed; + lastClosed = oldTracker.lastClosed; + // Call cancelDebt explicitly if needed. + nearestAllowed = oldTracker.nearestAllowed; + lastIdle = oldTracker.lastIdle; + elapsedBeforeIdle = oldTracker.elapsedBeforeIdle; if (!oldTracker.isIdle()) { transitToIdle(now); } @@ -154,7 +155,8 @@ abstract class ProgressTracker { * * @return number of tasks started but not finished yet */ - final long tasksOpen() { // TODO: Should we return int? + // TODO: Should we return int? + final long tasksOpen() { // TODO: Should we check the return value is non-negative? return tasksEncountered - tasksClosed; } diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java index 71de580bd3..7ef0d22495 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java @@ -148,7 +148,8 @@ abstract class TransmitQueue { private final Deque inflight = new ArrayDeque<>(); private final Deque pending = new ArrayDeque<>(); - private final AveragingProgressTracker tracker; // Cannot be just ProgressTracker as we are inheriting limits. + // Cannot be just ProgressTracker as we are inheriting limits. + private final AveragingProgressTracker tracker; private ReconnectForwarder successor; /** @@ -425,12 +426,10 @@ abstract class TransmitQueue { } // Check if the entry has (ever) been transmitted - if (!(e instanceof TransmittedConnectionEntry)) { + if (!(e instanceof TransmittedConnectionEntry te)) { return Optional.empty(); } - final TransmittedConnectionEntry te = (TransmittedConnectionEntry) e; - // Now check session match if (envelope.getSessionId() != te.getSessionId()) { LOG.debug("Expecting session {}, ignoring response {}", te.getSessionId(), envelope); diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java index fa28cbf718..f4a01cfd32 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java @@ -600,7 +600,7 @@ public class Follower extends AbstractRaftActorBehavior { + "all members {} self member: {}", logName(), unreachable, members, selfMember); // no unreachable peers means we cannot be isolated - if (unreachable.size() == 0) { + if (unreachable.isEmpty()) { return false; } @@ -610,11 +610,7 @@ public class Follower extends AbstractRaftActorBehavior { membersToCheck.removeAll(unreachable); // check if the only member not unreachable is us - if (membersToCheck.size() == 1 && membersToCheck.iterator().next().equals(selfMember)) { - return true; - } - - return false; + return membersToCheck.size() == 1 && membersToCheck.iterator().next().equals(selfMember); } private void handleInstallSnapshot(final ActorRef sender, final InstallSnapshot installSnapshot) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java index 31bf000ac2..5c879b8c7d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java @@ -170,7 +170,7 @@ abstract class AbstractFrontendHistory implements Identifiable(others.size() + 1); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedTransactionContextWrapper.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedTransactionContextWrapper.java index 17df235363..95379ded2e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedTransactionContextWrapper.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedTransactionContextWrapper.java @@ -116,7 +116,7 @@ final class DelayedTransactionContextWrapper extends AbstractTransactionContextW synchronized (queuedTxOperations) { contextOnEntry = transactionContext; if (contextOnEntry == null) { - checkState(pendingEnqueue == false, "Concurrent access to transaction %s detected", getIdentifier()); + checkState(!pendingEnqueue, "Concurrent access to transaction %s detected", getIdentifier()); pendingEnqueue = true; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java index 7c206adc58..74d100540a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java @@ -52,19 +52,8 @@ public class ShardIdentifier { return false; } - ShardIdentifier that = (ShardIdentifier) obj; - - if (!memberName.equals(that.memberName)) { - return false; - } - if (!shardName.equals(that.shardName)) { - return false; - } - if (!type.equals(that.type)) { - return false; - } - - return true; + final var that = (ShardIdentifier) obj; + return memberName.equals(that.memberName) && shardName.equals(that.shardName) && type.equals(that.type); } @Override @@ -103,17 +92,17 @@ public class ShardIdentifier { } public Builder shardName(final String newShardName) { - this.shardName = newShardName; + shardName = newShardName; return this; } public Builder memberName(final MemberName newMemberName) { - this.memberName = newMemberName; + memberName = newMemberName; return this; } public Builder type(final String newType) { - this.type = newType; + type = newType; return this; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardManagerIdentifier.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardManagerIdentifier.java index 880ba99dbd..bb47e7c838 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardManagerIdentifier.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardManagerIdentifier.java @@ -11,26 +11,19 @@ package org.opendaylight.controller.cluster.datastore.identifiers; public class ShardManagerIdentifier { private final String type; - public ShardManagerIdentifier(String type) { + public ShardManagerIdentifier(final String type) { this.type = type; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } if (obj == null || getClass() != obj.getClass()) { return false; } - - ShardManagerIdentifier that = (ShardManagerIdentifier) obj; - - if (!type.equals(that.type)) { - return false; - } - - return true; + return type.equals(((ShardManagerIdentifier) obj).type); } @Override @@ -49,14 +42,13 @@ public class ShardManagerIdentifier { public static class Builder { private String type; - public Builder type(String newType) { - this.type = newType; + public Builder type(final String newType) { + type = newType; return this; } public ShardManagerIdentifier build() { - return new ShardManagerIdentifier(this.type); + return new ShardManagerIdentifier(type); } - } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java index 2042e49d65..eeca6682bd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java @@ -25,11 +25,11 @@ public class ForwardedReadyTransaction { private final ReadWriteShardDataTreeTransaction transaction; private final boolean doImmediateCommit; private final short txnClientVersion; - private @Nullable final SortedSet participatingShardNames; + private final @Nullable SortedSet participatingShardNames; - public ForwardedReadyTransaction(TransactionIdentifier transactionId, short txnClientVersion, - ReadWriteShardDataTreeTransaction transaction, boolean doImmediateCommit, - Optional> participatingShardNames) { + public ForwardedReadyTransaction(final TransactionIdentifier transactionId, final short txnClientVersion, + final ReadWriteShardDataTreeTransaction transaction, final boolean doImmediateCommit, + final Optional> participatingShardNames) { this.transactionId = requireNonNull(transactionId); this.transaction = requireNonNull(transaction); this.txnClientVersion = txnClientVersion; -- 2.36.6