From 741e94d72133150cac203bb5ecedf787203ef795 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 11 Mar 2017 19:44:41 +0100 Subject: [PATCH] Mass conversion to static methods This is mechanic fixup of methods which Eclipse points out as being potentially-static. Secondary effect is use of lambdas where the conversion can be made automatic. Change-Id: I33d3b81bd4737f2c2b55c5d973ed081ae58a3a0a Signed-off-by: Robert Varga --- .../netconf/NetconfConnectorModule.java | 2 +- .../listener/NetconfDeviceCommunicator.java | 56 ++++++++----------- .../sal/NetconfDeviceTopologyAdapter.java | 27 ++++----- .../sal/SchemalessNetconfDeviceRpc.java | 17 +++--- .../mapping/NetconfMessageTransformer.java | 16 +----- .../connect/netconf/util/NetconfBaseOps.java | 21 ++++--- .../SchemalessRpcStructureTransformer.java | 10 ++-- .../netconf/NetconfConnectorModuleTest.java | 4 +- .../netconf/LibraryModulesSchemasTest.java | 2 +- .../connect/netconf/NetconfDeviceTest.java | 50 ++++++----------- .../netconf/SchemalessNetconfDeviceTest.java | 6 +- .../NetconfSessionPreferencesTest.java | 3 +- .../sal/NetconfDeviceSalFacadeTest.java | 2 +- .../NetconfMessageTransformerTest.java | 10 ++-- .../schema/SchemaRetrievalServiceImpl.java | 7 +-- .../sal/rest/impl/JsonToPATCHBodyReader.java | 18 ++---- .../impl/NormalizedNodeJsonBodyWriter.java | 16 +++--- .../impl/NormalizedNodeXmlBodyWriter.java | 6 +- .../sal/rest/impl/PATCHJsonBodyWriter.java | 2 +- .../sal/rest/impl/XmlToPATCHBodyReader.java | 13 ++--- .../sal/restconf/impl/BrokerFacade.java | 39 ++++++------- .../impl/JSONRestconfServiceImpl.java | 6 +- .../netconf/sal/restconf/impl/RestCodec.java | 6 +- .../sal/restconf/impl/RestconfImpl.java | 10 ++-- .../providers/JsonToPATCHBodyReader.java | 30 ++++------ .../NormalizedNodeJsonBodyWriter.java | 23 +++----- .../NormalizedNodeXmlBodyWriter.java | 22 +++----- .../providers/XmlToPATCHBodyReader.java | 13 ++--- .../impl/RestconfDataServiceImpl.java | 2 +- .../restful/utils/ResponseFactory.java | 2 +- .../test/providers/TestJsonBodyReader.java | 8 +-- .../test/providers/TestXmlBodyReader.java | 7 +-- .../test/CnSnToJsonBasicDataTypesTest.java | 6 +- .../to/cnsn/test/RestPutListDataTest.java | 5 +- .../impl/json/to/nn/test/JsonToNnTest.java | 6 +- .../nn/to/json/test/NnToJsonLeafrefType.java | 2 +- .../test/NnInstanceIdentifierToXmlTest.java | 12 ++-- .../impl/nn/to/xml/test/NnToXmlTest.java | 18 +++--- .../nn/to/xml/test/NnToXmlWithChoiceTest.java | 5 +- ...NnToXmlWithDataFromSeveralModulesTest.java | 6 +- .../restconf/impl/test/BrokerFacadeTest.java | 7 ++- ...nSnToXmlAndJsonInstanceIdentifierTest.java | 8 +-- .../impl/test/CutDataToCorrectDepthTest.java | 14 ++--- .../impl/test/InvokeRpcMethodTest.java | 2 +- .../impl/test/RestGetOperationTest.java | 44 +++++++-------- .../impl/test/RestPostOperationTest.java | 2 +- .../impl/test/RestPutOperationTest.java | 2 +- ...RestconfDocumentedExceptionMapperTest.java | 2 +- .../restconf/impl/test/RestconfErrorTest.java | 18 +++--- .../impl/websockets/test/RestStream.java | 2 +- .../listeners/NotificationListenerTest.java | 10 ++-- .../jersey/providers/JsonBodyReaderTest.java | 2 +- .../jersey/providers/XmlBodyReaderTest.java | 2 +- .../mapping/RestconfMappingNodeUtilTest.java | 11 ++-- .../context/RestconfSchemaUtilTest.java | 8 +-- 55 files changed, 287 insertions(+), 363 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java index f2f748b3cf..755959b64f 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java @@ -92,7 +92,7 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co } } - private boolean isHostAddressPresent(final Host address) { + private static boolean isHostAddressPresent(final Host address) { return address.getDomainName() != null || address.getIpAddress() != null && (address.getIpAddress().getIpv4Address() != null || address.getIpAddress().getIpv6Address() != null); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java index 260beaf59a..00dd66f260 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java @@ -14,8 +14,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.FutureListener; -import io.netty.util.concurrent.GenericFutureListener; import java.util.ArrayDeque; import java.util.Iterator; import java.util.List; @@ -147,16 +145,12 @@ public class NetconfDeviceCommunicator implements NetconfClientSessionListener, } - initFuture.addListener(new GenericFutureListener>(){ - - @Override - public void operationComplete(final Future future) throws Exception { - if (!future.isSuccess() && !future.isCancelled()) { - LOG.debug("{}: Connection failed", id, future.cause()); - NetconfDeviceCommunicator.this.remoteDevice.onRemoteSessionFailed(future.cause()); - if (firstConnectionFuture.isDone()) { - firstConnectionFuture.setException(future.cause()); - } + initFuture.addListener(future -> { + if (!future.isSuccess() && !future.isCancelled()) { + LOG.debug("{}: Connection failed", id, future.cause()); + NetconfDeviceCommunicator.this.remoteDevice.onRemoteSessionFailed(future.cause()); + if (firstConnectionFuture.isDone()) { + firstConnectionFuture.setException(future.cause()); } } }); @@ -222,7 +216,8 @@ public class NetconfDeviceCommunicator implements NetconfClientSessionListener, String.format( "The netconf session to %1$s is disconnected", id.getName() ) ); } - private RpcResult createErrorRpcResult(final RpcError.ErrorType errorType, final String message) { + private static RpcResult createErrorRpcResult(final RpcError.ErrorType errorType, + final String message) { return RpcResultBuilder.failed() .withError(errorType, NetconfDocumentedException.ErrorTag.OPERATION_FAILED.getTagValue(), message).build(); } @@ -368,26 +363,23 @@ public class NetconfDeviceCommunicator implements NetconfClientSessionListener, final Request req = new Request(new UncancellableFuture<>(true), message); requests.add(req); - session.sendMessage(req.request).addListener(new FutureListener() { - @Override - public void operationComplete(final Future future) throws Exception { - if( !future.isSuccess() ) { - // We expect that a session down will occur at this point - LOG.debug("{}: Failed to send request {}", id, - XmlUtil.toString(req.request.getDocument()), - future.cause()); - - if( future.cause() != null ) { - req.future.set( createErrorRpcResult( RpcError.ErrorType.TRANSPORT, - future.cause().getLocalizedMessage() ) ); - } else { - req.future.set( createSessionDownRpcResult() ); // assume session is down - } - req.future.setException( future.cause() ); - } - else { - LOG.trace("Finished sending request {}", req.request); + session.sendMessage(req.request).addListener(future -> { + if( !future.isSuccess() ) { + // We expect that a session down will occur at this point + LOG.debug("{}: Failed to send request {}", id, + XmlUtil.toString(req.request.getDocument()), + future.cause()); + + if( future.cause() != null ) { + req.future.set( createErrorRpcResult( RpcError.ErrorType.TRANSPORT, + future.cause().getLocalizedMessage() ) ); + } else { + req.future.set( createSessionDownRpcResult() ); // assume session is down } + req.future.setException( future.cause() ); + } + else { + LOG.trace("Finished sending request {}", req.request); } }); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapter.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapter.java index b0617cfca9..4d67bdd662 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapter.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapter.java @@ -57,14 +57,9 @@ import org.slf4j.LoggerFactory; public final class NetconfDeviceTopologyAdapter implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceTopologyAdapter.class); - public static final Function, UnavailableCapability> UNAVAILABLE_CAPABILITY_TRANSFORMER = new Function, UnavailableCapability>() { - @Override - public UnavailableCapability apply(final Entry input) { - return new UnavailableCapabilityBuilder() - .setCapability(input.getKey().toString()) - .setFailureReason(input.getValue()).build(); - } - }; + public static final Function, UnavailableCapability> UNAVAILABLE_CAPABILITY_TRANSFORMER = input -> new UnavailableCapabilityBuilder() + .setCapability(input.getKey().toString()) + .setFailureReason(input.getValue()).build(); private final RemoteDeviceId id; private BindingTransactionChain txChain; @@ -115,7 +110,7 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { commitTransaction(writeTx, "init"); } - public void updateDeviceData(boolean up, NetconfDeviceCapabilities capabilities) { + public void updateDeviceData(final boolean up, final NetconfDeviceCapabilities capabilities) { final NetconfNode data = buildDataForNetconfNode(up, capabilities); final WriteTransaction writeTx = txChain.newWriteOnlyTransaction(); @@ -130,7 +125,7 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { commitTransaction(writeTx, "update"); } - public void updateClusteredDeviceData(boolean up, String masterAddress, NetconfDeviceCapabilities capabilities) { + public void updateClusteredDeviceData(final boolean up, final String masterAddress, final NetconfDeviceCapabilities capabilities) { final NetconfNode data = buildDataForNetconfClusteredNode(up, masterAddress, capabilities); final WriteTransaction writeTx = txChain.newWriteOnlyTransaction(); @@ -145,7 +140,7 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { commitTransaction(writeTx, "update"); } - public void setDeviceAsFailed(Throwable throwable) { + public void setDeviceAsFailed(final Throwable throwable) { String reason = (throwable != null && throwable.getMessage() != null) ? throwable.getMessage() : UNKNOWN_REASON; final NetconfNode data = new NetconfNodeBuilder().setConnectionStatus(ConnectionStatus.UnableToConnect).setConnectedMessage(reason).build(); @@ -162,7 +157,7 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { commitTransaction(writeTx, "update-failed-device"); } - private NetconfNode buildDataForNetconfNode(boolean up, NetconfDeviceCapabilities capabilities) { + private NetconfNode buildDataForNetconfNode(final boolean up, final NetconfDeviceCapabilities capabilities) { List capabilityList = new ArrayList<>(); capabilityList.addAll(capabilities.getNonModuleBasedCapabilities()); capabilityList.addAll(capabilities.getResolvedCapabilities()); @@ -184,7 +179,7 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { return netconfNodeBuilder.build(); } - private NetconfNode buildDataForNetconfClusteredNode(boolean up, String masterNodeAddress, NetconfDeviceCapabilities capabilities) { + private NetconfNode buildDataForNetconfClusteredNode(final boolean up, final String masterNodeAddress, final NetconfDeviceCapabilities capabilities) { List capabilityList = new ArrayList<>(); capabilityList.addAll(capabilities.getNonModuleBasedCapabilities()); capabilityList.addAll(capabilities.getResolvedCapabilities()); @@ -231,12 +226,12 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { final NetworkTopology networkTopology = new NetworkTopologyBuilder().build(); LOG.trace("{}: Merging {} container to ensure its presence", id, - networkTopology.QNAME, writeTx.getIdentifier()); + NetworkTopology.QNAME, writeTx.getIdentifier()); writeTx.merge(LogicalDatastoreType.OPERATIONAL, networkTopologyPath, networkTopology); final Topology topology = new TopologyBuilder().setTopologyId(new TopologyId(TopologyNetconf.QNAME.getLocalName())).build(); LOG.trace("{}: Merging {} container to ensure its presence", id, - topology.QNAME, writeTx.getIdentifier()); + Topology.QNAME, writeTx.getIdentifier()); writeTx.merge(LogicalDatastoreType.OPERATIONAL, topologyListPath, topology); } @@ -278,7 +273,7 @@ public final class NetconfDeviceTopologyAdapter implements AutoCloseable { removeDeviceConfiguration(); } - public void setTxChain(BindingTransactionChain txChain) { + public void setTxChain(final BindingTransactionChain txChain) { this.txChain = Preconditions.checkNotNull(txChain); } } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java index f1ec789342..7448367e0c 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java @@ -42,7 +42,7 @@ public final class SchemalessNetconfDeviceRpc implements DOMRpcService { private final SchemalessMessageTransformer schemalessTransformer; private final RemoteDeviceId deviceId; - public SchemalessNetconfDeviceRpc(RemoteDeviceId deviceId, final RemoteDeviceCommunicator listener, + public SchemalessNetconfDeviceRpc(final RemoteDeviceId deviceId, final RemoteDeviceCommunicator listener, final BaseRpcSchemalessTransformer baseRpcTransformer, final SchemalessMessageTransformer messageTransformer) { this.deviceId = deviceId; @@ -72,14 +72,11 @@ public final class SchemalessNetconfDeviceRpc implements DOMRpcService { final NetconfMessage netconfMessage = transformer.toRpcRequest(type, input); final ListenableFuture> rpcResultListenableFuture = listener.sendRequest(netconfMessage, type.getLastComponent()); - final ListenableFuture transformed = Futures.transform(rpcResultListenableFuture, new Function, DOMRpcResult>() { - @Override - public DOMRpcResult apply(final RpcResult input) { - if (input.isSuccessful()) { - return transformer.toRpcResult(input.getResult(), type); - } else { - return new DefaultDOMRpcResult(input.getErrors()); - } + final ListenableFuture transformed = Futures.transform(rpcResultListenableFuture, (Function, DOMRpcResult>) input1 -> { + if (input1.isSuccessful()) { + return transformer.toRpcResult(input1.getResult(), type); + } else { + return new DefaultDOMRpcResult(input1.getErrors()); } }); @@ -93,7 +90,7 @@ public final class SchemalessNetconfDeviceRpc implements DOMRpcService { } - private boolean isBaseRpc(final SchemaPath type) { + private static boolean isBaseRpc(final SchemaPath type) { return NetconfMessageTransformUtil.NETCONF_URI.equals(type.getLastComponent().getNamespace()); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java index f9cbef9f2d..52f7076453 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java @@ -57,19 +57,9 @@ public class NetconfMessageTransformer implements MessageTransformer QNAME_FUNCTION = new Function() { - @Override - public QName apply(final SchemaNode rpcDefinition) { - return rpcDefinition.getQName(); - } - }; + private static final Function QNAME_FUNCTION = rpcDefinition -> rpcDefinition.getQName(); - private static final Function QNAME_NOREV_FUNCTION = new Function() { - @Override - public QName apply(final SchemaNode notification) { - return QNAME_FUNCTION.apply(notification).withoutRevision(); - } - }; + private static final Function QNAME_NOREV_FUNCTION = notification -> QNAME_FUNCTION.apply(notification).withoutRevision(); private final SchemaContext schemaContext; private final BaseSchema baseSchema; @@ -165,7 +155,7 @@ public class NetconfMessageTransformer implements MessageTransformer>> extractData(final Optional path, final ListenableFuture configRunning) { - return Futures.transform(configRunning, new Function>>() { - @Override - public Optional> apply(final DOMRpcResult result) { - Preconditions.checkArgument(result.getErrors().isEmpty(), "Unable to read data: %s, errors: %s", path, result.getErrors()); - final DataContainerChild dataNode = - ((ContainerNode) result.getResult()).getChild(NetconfMessageTransformUtil.toId(NetconfMessageTransformUtil.NETCONF_DATA_QNAME)).get(); - return transformer.selectFromDataStructure(dataNode, path.get()); - } + return Futures.transform(configRunning, (Function>>) result -> { + Preconditions.checkArgument(result.getErrors().isEmpty(), "Unable to read data: %s, errors: %s", path, result.getErrors()); + final DataContainerChild dataNode = + ((ContainerNode) result.getResult()).getChild(NetconfMessageTransformUtil.toId(NetconfMessageTransformUtil.NETCONF_DATA_QNAME)).get(); + return transformer.selectFromDataStructure(dataNode, path.get()); }); } @@ -225,7 +222,7 @@ public final class NetconfBaseOps { return future; } - private boolean isFilterPresent(final Optional filterPath) { + private static boolean isFilterPresent(final Optional filterPath) { return filterPath.isPresent() && !filterPath.get().isEmpty(); } @@ -261,8 +258,10 @@ public final class NetconfBaseOps { return Builders.choiceBuilder().withNodeIdentifier(toId(EditContent.QNAME)).withChild(configContent).build(); } - private ContainerNode getEditConfigContent(final QName datastore, final DataContainerChild editStructure, final Optional defaultOperation, final boolean rollback) { - final DataContainerNodeAttrBuilder editBuilder = Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_EDIT_CONFIG_QNAME)); + private static ContainerNode getEditConfigContent(final QName datastore, + final DataContainerChild editStructure, final Optional defaultOperation, final boolean rollback) { + final DataContainerNodeAttrBuilder editBuilder = + Builders.containerBuilder().withNodeIdentifier(toId(NETCONF_EDIT_CONFIG_QNAME)); // Target editBuilder.withChild(getTargetNode(datastore)); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java index eed36dbf26..3342bf5873 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java @@ -71,7 +71,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { */ @Override public AnyXmlNode createEditConfigStructure(final Optional> data, - final YangInstanceIdentifier dataPath, Optional operation) { + final YangInstanceIdentifier dataPath, final Optional operation) { Preconditions.checkArgument(data.isPresent()); Preconditions.checkArgument(data.get() instanceof AnyXmlNode); @@ -127,7 +127,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { .build(); } - private void checkDataValidForPath(final YangInstanceIdentifier dataPath, final Element dataNode) { + private static void checkDataValidForPath(final YangInstanceIdentifier dataPath, final Element dataNode) { //if datapath is empty, consider dataNode to be a root node if (dataPath.equals(YangInstanceIdentifier.EMPTY)) { return; @@ -146,7 +146,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { } - private void checkKeyValuesValidForPath(final XmlElement dataElement, + private static void checkKeyValuesValidForPath(final XmlElement dataElement, final YangInstanceIdentifier.PathArgument lastPathArgument) { final YangInstanceIdentifier.NodeIdentifierWithPredicates keyedId = (YangInstanceIdentifier.NodeIdentifierWithPredicates) lastPathArgument; @@ -172,7 +172,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { } } - private void setOperationAttribute(final Optional operation, final Document document, + private static void setOperationAttribute(final Optional operation, final Document document, final Element dataNode) { final QName operationQname = NetconfMessageTransformUtil.NETCONF_OPERATION_QNAME; final Attr operationAttribute = @@ -203,7 +203,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { return parent; } - private List selectMatchingNodes(final Element domElement, final YangInstanceIdentifier path) { + private static List selectMatchingNodes(final Element domElement, final YangInstanceIdentifier path) { XmlElement element = XmlElement.fromDomElement(domElement); for (YangInstanceIdentifier.PathArgument pathArgument : path.getPathArguments()) { List childElements = element.getChildElements(pathArgument.getNodeType().getLocalName()); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModuleTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModuleTest.java index 8bf239602e..9e918b6d57 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModuleTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModuleTest.java @@ -100,7 +100,7 @@ public class NetconfConnectorModuleTest { verify(transaction, times(2)).submit(); } - private void verifyNode(final NodeId nodeId, final Node node) { + private static void verifyNode(final NodeId nodeId, final Node node) { Assert.assertEquals(nodeId, node.getNodeId()); final NetconfNode netconfNode = node.getAugmentation(NetconfNode.class); Assert.assertEquals(HOST, netconfNode.getHost()); @@ -109,7 +109,7 @@ public class NetconfConnectorModuleTest { Assert.assertEquals(TCP_ONLY, netconfNode.isTcpOnly()); } - private void setViaReflection(final Object object, final String fieldName, final Object value) { + private static void setViaReflection(final Object object, final String fieldName, final Object value) { try { final Field field = AbstractNetconfConnectorModule.class.getDeclaredField(fieldName); field.setAccessible(true); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java index 32aa12870a..bf2b929a48 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java @@ -36,7 +36,7 @@ public class LibraryModulesSchemasTest { } - private void verifySchemas(final LibraryModulesSchemas libraryModulesSchemas) throws MalformedURLException { + private static void verifySchemas(final LibraryModulesSchemas libraryModulesSchemas) throws MalformedURLException { final Map resolvedModulesSchema = libraryModulesSchemas.getAvailableModels(); Assert.assertThat(resolvedModulesSchema.size(), is(3)); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java index 0e4c77b86a..2f58669f7e 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java @@ -39,8 +39,6 @@ import java.util.concurrent.Executors; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.md.sal.dom.api.DOMNotification; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; @@ -49,7 +47,6 @@ import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.sal.connect.api.MessageTransformer; -import org.opendaylight.netconf.sal.connect.api.NetconfDeviceSchemas; import org.opendaylight.netconf.sal.connect.api.NetconfDeviceSchemasResolver; import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler; import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCapabilities; @@ -111,13 +108,7 @@ public class NetconfDeviceTest { RevisionSourceIdentifier.create(TEST_MODULE + "2", Optional.of(TEST_REVISION)); public static final String TEST_CAPABILITY2 = TEST_NAMESPACE + "?module=" + TEST_MODULE + "2" + "&revision=" + TEST_REVISION; - private static final NetconfDeviceSchemasResolver stateSchemasResolver = new NetconfDeviceSchemasResolver() { - - @Override - public NetconfDeviceSchemas resolve(final NetconfDeviceRpc deviceRpc, final NetconfSessionPreferences remoteSessionCapabilities, final RemoteDeviceId id) { - return NetconfStateSchemas.EMPTY; - } - }; + private static final NetconfDeviceSchemasResolver stateSchemasResolver = (deviceRpc, remoteSessionCapabilities, id) -> NetconfStateSchemas.EMPTY; @Test public void testNetconfDeviceFlawedModelFailedResolution() throws Exception { @@ -213,26 +204,20 @@ public class NetconfDeviceTest { // Make fallback attempt to fail due to empty resolved sources final MissingSchemaSourceException schemaResolutionException = new MissingSchemaSourceException("fail first", TEST_SID); doReturn(Futures.immediateFailedCheckedFuture(schemaResolutionException)).when(schemaRepository).getSchemaSource(eq(TEST_SID), eq(ASTSchemaSource.class)); - doAnswer(new Answer() { - @Override - public Object answer(final InvocationOnMock invocation) throws Throwable { - if (((Collection) invocation.getArguments()[0]).size() == 2) { - return Futures.immediateFailedCheckedFuture(schemaResolutionException); - } else { - return Futures.immediateCheckedFuture(schema); - } + doAnswer(invocation -> { + if (((Collection) invocation.getArguments()[0]).size() == 2) { + return Futures.immediateFailedCheckedFuture(schemaResolutionException); + } else { + return Futures.immediateCheckedFuture(schema); } }).when(schemaFactory).createSchemaContext(anyCollectionOf(SourceIdentifier.class)); - final NetconfDeviceSchemasResolver stateSchemasResolver = new NetconfDeviceSchemasResolver() { - @Override - public NetconfDeviceSchemas resolve(final NetconfDeviceRpc deviceRpc, final NetconfSessionPreferences remoteSessionCapabilities, final RemoteDeviceId id) { - final Module first = Iterables.getFirst(schema.getModules(), null); - final QName qName = QName.create(first.getQNameModule(), first.getName()); - final NetconfStateSchemas.RemoteYangSchema source1 = new NetconfStateSchemas.RemoteYangSchema(qName); - final NetconfStateSchemas.RemoteYangSchema source2 = new NetconfStateSchemas.RemoteYangSchema(QName.create(first.getQNameModule(), "test-module2")); - return new NetconfStateSchemas(Sets.newHashSet(source1, source2)); - } + final NetconfDeviceSchemasResolver stateSchemasResolver = (deviceRpc, remoteSessionCapabilities, id) -> { + final Module first = Iterables.getFirst(schema.getModules(), null); + final QName qName = QName.create(first.getQNameModule(), first.getName()); + final NetconfStateSchemas.RemoteYangSchema source1 = new NetconfStateSchemas.RemoteYangSchema(qName); + final NetconfStateSchemas.RemoteYangSchema source2 = new NetconfStateSchemas.RemoteYangSchema(QName.create(first.getQNameModule(), "test-module2")); + return new NetconfStateSchemas(Sets.newHashSet(source1, source2)); }; final NetconfDevice.SchemaResourcesDTO schemaResourcesDTO @@ -253,7 +238,7 @@ public class NetconfDeviceTest { Mockito.verify(schemaFactory, times(1)).createSchemaContext(anyCollectionOf(SourceIdentifier.class)); } - private SchemaSourceRegistry getSchemaRegistry() { + private static SchemaSourceRegistry getSchemaRegistry() { final SchemaSourceRegistry mock = mock(SchemaSourceRegistry.class); final SchemaSourceRegistration mockReg = mock(SchemaSourceRegistration.class); doNothing().when(mockReg).close(); @@ -261,7 +246,7 @@ public class NetconfDeviceTest { return mock; } - private SchemaRepository getSchemaRepository() { + private static SchemaRepository getSchemaRepository() { final SchemaRepository mock = mock(SchemaRepository.class); final SchemaSourceRepresentation mockRep = mock(SchemaSourceRepresentation.class); doReturn(Futures.immediateCheckedFuture(mockRep)).when(mock).getSchemaSource(any(SourceIdentifier.class), eq(ASTSchemaSource.class)); @@ -367,7 +352,7 @@ public class NetconfDeviceTest { moduleBasedCaps.get(QName.create(entry.getCapability())).getName(), entry.getCapabilityOrigin().getName())); } - private SchemaContextFactory getSchemaFactory() throws Exception { + private static SchemaContextFactory getSchemaFactory() throws Exception { final SchemaContextFactory schemaFactory = mockClass(SchemaContextFactory.class); doReturn(Futures.immediateCheckedFuture(getSchema())).when(schemaFactory).createSchemaContext(any(Collection.class)); return schemaFactory; @@ -380,7 +365,7 @@ public class NetconfDeviceTest { return YangParserTestUtils.parseYangStreams(modelsToParse); } - private RemoteDeviceHandler getFacade() throws Exception { + private static RemoteDeviceHandler getFacade() throws Exception { final RemoteDeviceHandler remoteDeviceHandler = mockCloseableClass(RemoteDeviceHandler.class); doNothing().when(remoteDeviceHandler).onDeviceConnected(any(SchemaContext.class), any(NetconfSessionPreferences.class), any(NetconfDeviceRpc.class)); doNothing().when(remoteDeviceHandler).onDeviceDisconnected(); @@ -388,7 +373,8 @@ public class NetconfDeviceTest { return remoteDeviceHandler; } - private T mockCloseableClass(final Class remoteDeviceHandlerClass) throws Exception { + private static T mockCloseableClass(final Class remoteDeviceHandlerClass) + throws Exception { final T mock = mockClass(remoteDeviceHandlerClass); doNothing().when(mock).close(); return mock; diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java index fbe7126623..c336033190 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java @@ -68,7 +68,7 @@ public class SchemalessNetconfDeviceTest { } @SuppressWarnings("unchecked") - private RemoteDeviceHandler getFacade() throws Exception { + private static RemoteDeviceHandler getFacade() throws Exception { final RemoteDeviceHandler remoteDeviceHandler = mockCloseableClass(RemoteDeviceHandler.class); doNothing().when(remoteDeviceHandler).onDeviceConnected(any(SchemaContext.class), any(NetconfSessionPreferences.class), any(NetconfDeviceRpc.class)); doNothing().when(remoteDeviceHandler).onDeviceDisconnected(); @@ -76,7 +76,7 @@ public class SchemalessNetconfDeviceTest { return remoteDeviceHandler; } - private T mockCloseableClass(final Class remoteDeviceHandlerClass) throws Exception { + private static T mockCloseableClass(final Class remoteDeviceHandlerClass) throws Exception { final T mock = mockClass(remoteDeviceHandlerClass); doNothing().when(mock).close(); return mock; @@ -88,7 +88,7 @@ public class SchemalessNetconfDeviceTest { return mock; } - private NetconfSessionPreferences getSessionCaps(final boolean addMonitor, final Collection additionalCapabilities) { + private static NetconfSessionPreferences getSessionCaps(final boolean addMonitor, final Collection additionalCapabilities) { final ArrayList capabilities = Lists.newArrayList( XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_0, XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java index bd98fd191e..db07df1e86 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java @@ -163,7 +163,8 @@ public class NetconfSessionPreferencesTest { assertCaps(sessionCaps1, 0, 4); } - private void assertCaps(final NetconfSessionPreferences sessionCaps1, final int nonModuleCaps, final int moduleCaps) { + private static void assertCaps(final NetconfSessionPreferences sessionCaps1, final int nonModuleCaps, + final int moduleCaps) { assertEquals(nonModuleCaps, sessionCaps1.getNonModuleCaps().size()); assertEquals(moduleCaps, sessionCaps1.getModuleBasedCaps().size()); } diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java index 07577ca178..8df394c773 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java @@ -114,7 +114,7 @@ public class NetconfDeviceSalFacadeTest { verify(mountInstance).publish(domNotification); } - private List getCapabilities(){ + private static List getCapabilities() { return Arrays.asList(NetconfMessageTransformUtil.NETCONF_CANDIDATE_URI.toString()); } } diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java index bdcf0274cf..f0e3966718 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java @@ -273,7 +273,8 @@ public class NetconfMessageTransformerTest { ""); } - private void assertSimilarXml(final NetconfMessage netconfMessage, final String xmlContent) throws SAXException, IOException { + private static void assertSimilarXml(final NetconfMessage netconfMessage, final String xmlContent) + throws SAXException, IOException { final Diff diff = XMLUnit.compareXML(netconfMessage.getDocument(), XmlUtil.readXmlToDocument(xmlContent)); diff.overrideElementQualifier(new ElementNameAndAttributeQualifier()); assertTrue(diff.toString(), diff.similar()); @@ -284,7 +285,8 @@ public class NetconfMessageTransformerTest { final QName capability = QName.create(Capabilities.QNAME, "capability"); final DataContainerChild filter = toFilterStructure( - YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Capabilities.QNAME), toId(capability), new YangInstanceIdentifier.NodeWithValue(capability, "a:b:c")), schema); + YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Capabilities.QNAME), toId(capability), + new YangInstanceIdentifier.NodeWithValue<>(capability, "a:b:c")), schema); final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(toPath(NETCONF_GET_QNAME), NetconfMessageTransformUtil.wrap(NETCONF_GET_QNAME, filter)); @@ -302,7 +304,7 @@ public class NetconfMessageTransformerTest { ""); } - private NetconfMessageTransformer getTransformer(final SchemaContext schema) { + private static NetconfMessageTransformer getTransformer(final SchemaContext schema) { return new NetconfMessageTransformer(schema, true); } @@ -316,7 +318,7 @@ public class NetconfMessageTransformerTest { assertNull(compositeNodeRpcResult.getResult()); } - public SchemaContext getSchema(boolean addBase) { + public SchemaContext getSchema(final boolean addBase) { final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create(); if(addBase) { moduleInfoBackedContext.addModuleInfos(Collections.singleton($YangModuleInfoImpl.getInstance())); diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java index f68febd1b0..9bada58bec 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java @@ -69,8 +69,8 @@ public class SchemaRetrievalServiceImpl implements SchemaRetrievalService { return getExportUsingNameAndRevision(schemaContext, moduleName, revisionString); } - private SchemaExportContext getExportUsingNameAndRevision(final SchemaContext schemaContext, final String moduleName, - final String revisionStr) { + private static SchemaExportContext getExportUsingNameAndRevision(final SchemaContext schemaContext, + final String moduleName, final String revisionStr) { try { final Date revision = SimpleDateFormatUtil.getRevisionFormat().parse(revisionStr); final Module module = schemaContext.findModuleByName(moduleName, revision); @@ -84,8 +84,5 @@ public class SchemaRetrievalServiceImpl implements SchemaRetrievalService { final InstanceIdentifierContext mountContext = salContext.toMountPointIdentifier(identifier); return mountContext.getSchemaContext(); } - - - } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java index ffb47bd352..014818c2d9 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java @@ -338,7 +338,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider * @param in reader JsonReader reader * @return NormalizedNode representing data */ - private NormalizedNode readEditData(@Nonnull final JsonReader in, @Nonnull final SchemaNode targetSchemaNode, + private static NormalizedNode readEditData(@Nonnull final JsonReader in, @Nonnull final SchemaNode targetSchemaNode, @Nonnull final InstanceIdentifierContext path) { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); @@ -352,7 +352,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider * @param edit Instance of PatchEdit * @return PATCHEntity */ - private PATCHEntity prepareEditOperation(@Nonnull final PatchEdit edit) { + private static PATCHEntity prepareEditOperation(@Nonnull final PatchEdit edit) { if ((edit.getOperation() != null) && (edit.getTargetSchemaNode() != null) && checkDataPresence(edit.getOperation(), (edit.getData() != null))) { if (isPatchOperationWithValue(edit.getOperation())) { @@ -380,19 +380,11 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider * @return true if data is present when operation requires it or if there are no data when operation does not * allow it, false otherwise */ - private boolean checkDataPresence(@Nonnull final String operation, final boolean hasData) { + private static boolean checkDataPresence(@Nonnull final String operation, final boolean hasData) { if (isPatchOperationWithValue(operation)) { - if (hasData) { - return true; - } else { - return false; - } + return hasData; } else { - if (!hasData) { - return true; - } else { - return false; - } + return !hasData; } } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java index 462c1001cd..a41ec02afc 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java @@ -92,7 +92,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context, NormalizedNode data, final Optional depth) throws IOException { final RestconfNormalizedNodeWriter nnWriter; @@ -126,14 +126,16 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter child : data.getValue()) { + private static void writeChildren(final RestconfNormalizedNodeWriter nnWriter, final ContainerNode data) + throws IOException { + for (final DataContainerChild child : data.getValue()) { nnWriter.write(child); } } - private RestconfNormalizedNodeWriter createNormalizedNodeWriter(final InstanceIdentifierContext context, - final SchemaPath path, final JsonWriter jsonWriter, final Optional depth) { + private static RestconfNormalizedNodeWriter createNormalizedNodeWriter( + final InstanceIdentifierContext context, final SchemaPath path, final JsonWriter jsonWriter, + final Optional depth) { final SchemaNode schema = context.getSchemaNode(); final JSONCodecFactory codecs = getCodecFactory(context); @@ -157,7 +159,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context) { + private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) { // TODO: Performance: Cache JSON Codec factory and schema context return JSONCodecFactory.create(context.getSchemaContext()); } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java index 633cd73c3d..6a5d4d1c8d 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java @@ -102,7 +102,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter pathContext, NormalizedNode data, final Optional depth) throws IOException { final RestconfNormalizedNodeWriter nnWriter; @@ -126,7 +126,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter depth) { final NormalizedNodeStreamWriter xmlStreamWriter = XMLStreamNormalizedNodeStreamWriter.create(xmlWriter, schemaContext, schemaPath); @@ -137,7 +137,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter pathContext, final Document doc) { + private static PATCHContext parse(final InstanceIdentifierContext pathContext, final Document doc) { final List resultCollection = new ArrayList<>(); final String patchId = doc.getElementsByTagName("patch-id").item(0).getFirstChild().getNodeValue(); final NodeList editNodes = doc.getElementsByTagName("edit"); @@ -182,7 +182,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param operation Name of current operation * @return List of value elements */ - private List readValueNodes(@Nonnull final Element element, @Nonnull final String operation) { + private static List readValueNodes(@Nonnull final Element element, @Nonnull final String operation) { final Node valueNode = element.getElementsByTagName("value").item(0); if (PATCHEditOperation.isPatchOperationWithValue(operation) && (valueNode == null)) { @@ -220,9 +220,8 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param revision Module revision * @return Non-conditional XPath */ - private String prepareNonCondXpath(@Nonnull final DataSchemaNode schemaNode, @Nonnull final String target, - @Nonnull final Element value, @Nonnull final String namespace, - @Nonnull final String revision) { + private static String prepareNonCondXpath(@Nonnull final DataSchemaNode schemaNode, @Nonnull final String target, + @Nonnull final Element value, @Nonnull final String namespace, @Nonnull final String revision) { final Iterator args = Splitter.on("/").split(target.substring(target.indexOf(':') + 1)).iterator(); final StringBuilder nonCondXpath = new StringBuilder(); @@ -254,7 +253,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param keys Iterator of list keys names * @return Iterator of list keys values */ - private Iterator readKeyValues(@Nonnull final Element value, @Nonnull final Iterator keys) { + private static Iterator readKeyValues(@Nonnull final Element value, @Nonnull final Iterator keys) { final List result = new ArrayList<>(); while (keys.hasNext()) { @@ -270,7 +269,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param keyNames Iterator of list keys names * @param keyValues Iterator of list keys values */ - private void appendKeys(@Nonnull final StringBuilder nonCondXpath, @Nonnull final Iterator keyNames, + private static void appendKeys(@Nonnull final StringBuilder nonCondXpath, @Nonnull final Iterator keyNames, @Nonnull final Iterator keyValues) { while (keyNames.hasNext()) { nonCondXpath.append("["); diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java index ffe1f5e42f..f8f4acfe47 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java @@ -841,8 +841,7 @@ public class BrokerFacade { } } - private DataSchemaNode checkListAndOrderedType(final SchemaContext ctx, - final YangInstanceIdentifier path) { + private static DataSchemaNode checkListAndOrderedType(final SchemaContext ctx, final YangInstanceIdentifier path) { final YangInstanceIdentifier parent = path.getParent(); final DataSchemaContextNode node = DataSchemaContextTree.from(ctx).getChild(parent); final DataSchemaNode dataSchemaNode = node.getDataSchemaNode(); @@ -887,14 +886,15 @@ public class BrokerFacade { } } - private void simplePostPut(final DOMDataReadWriteTransaction rWTransaction, final LogicalDatastoreType datastore, - final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext) { + private static void simplePostPut(final DOMDataReadWriteTransaction rWTransaction, + final LogicalDatastoreType datastore, final YangInstanceIdentifier path, final NormalizedNode payload, + final SchemaContext schemaContext) { checkItemDoesNotExists(rWTransaction, datastore, path); ensureParentsByMerge(datastore, path, rWTransaction, schemaContext); rWTransaction.put(datastore, path, payload); } - private boolean doesItemExist(final DOMDataReadWriteTransaction rWTransaction, + private static boolean doesItemExist(final DOMDataReadWriteTransaction rWTransaction, final LogicalDatastoreType store, final YangInstanceIdentifier path) { try { return rWTransaction.exists(store, path).checkedGet(); @@ -911,8 +911,8 @@ public class BrokerFacade { * @param store Used datastore * @param path Path to item to verify its existence */ - private void checkItemExists(final DOMDataReadWriteTransaction rWTransaction, - final LogicalDatastoreType store, final YangInstanceIdentifier path) { + private static void checkItemExists(final DOMDataReadWriteTransaction rWTransaction, + final LogicalDatastoreType store, final YangInstanceIdentifier path) { if (!doesItemExist(rWTransaction, store, path)) { final String errMsg = "Operation via Restconf was not executed because data does not exist"; LOG.trace("{}:{}", errMsg, path); @@ -928,8 +928,8 @@ public class BrokerFacade { * @param store Used datastore * @param path Path to item to verify its existence */ - private void checkItemDoesNotExists(final DOMDataReadWriteTransaction rWTransaction, - final LogicalDatastoreType store, final YangInstanceIdentifier path) { + private static void checkItemDoesNotExists(final DOMDataReadWriteTransaction rWTransaction, + final LogicalDatastoreType store, final YangInstanceIdentifier path) { if (doesItemExist(rWTransaction, store, path)) { final String errMsg = "Operation via Restconf was not executed because data already exists"; LOG.trace("{}:{}", errMsg, path); @@ -1116,8 +1116,9 @@ public class BrokerFacade { } } - private void makePut(final DOMDataReadWriteTransaction writeTransaction, final LogicalDatastoreType datastore, - final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext) { + private static void makePut(final DOMDataReadWriteTransaction writeTransaction, + final LogicalDatastoreType datastore, final YangInstanceIdentifier path, final NormalizedNode payload, + final SchemaContext schemaContext) { if (payload instanceof MapNode) { final NormalizedNode emptySubtree = ImmutableNodes.fromInstanceId(schemaContext, path); writeTransaction.merge(datastore, YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree); @@ -1131,14 +1132,14 @@ public class BrokerFacade { } } - private void simplePut(final LogicalDatastoreType datastore, final YangInstanceIdentifier path, + private static void simplePut(final LogicalDatastoreType datastore, final YangInstanceIdentifier path, final DOMDataReadWriteTransaction writeTransaction, final SchemaContext schemaContext, final NormalizedNode payload) { ensureParentsByMerge(datastore, path, writeTransaction, schemaContext); writeTransaction.put(datastore, path, payload); } - private CheckedFuture deleteDataViaTransaction( + private static CheckedFuture deleteDataViaTransaction( final DOMDataReadWriteTransaction readWriteTransaction, final LogicalDatastoreType datastore, final YangInstanceIdentifier path) { LOG.trace("Delete {} via Restconf: {}", datastore.name(), path); @@ -1147,14 +1148,13 @@ public class BrokerFacade { return readWriteTransaction.submit(); } - private void deleteDataWithinTransaction( - final DOMDataWriteTransaction writeTransaction, final LogicalDatastoreType datastore, - final YangInstanceIdentifier path) { + private static void deleteDataWithinTransaction(final DOMDataWriteTransaction writeTransaction, + final LogicalDatastoreType datastore, final YangInstanceIdentifier path) { LOG.trace("Delete {} within Restconf PATCH: {}", datastore.name(), path); writeTransaction.delete(datastore, path); } - private void mergeDataWithinTransaction( + private static void mergeDataWithinTransaction( final DOMDataReadWriteTransaction writeTransaction, final LogicalDatastoreType datastore, final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext) { LOG.trace("Merge {} within Restconf PATCH: {} with payload {}", datastore.name(), path, payload); @@ -1198,8 +1198,9 @@ public class BrokerFacade { } } - private void ensureParentsByMerge(final LogicalDatastoreType store, final YangInstanceIdentifier normalizedPath, - final DOMDataReadWriteTransaction rwTx, final SchemaContext schemaContext) { + private static void ensureParentsByMerge(final LogicalDatastoreType store, + final YangInstanceIdentifier normalizedPath, final DOMDataReadWriteTransaction rwTx, + final SchemaContext schemaContext) { final List normalizedPathWithoutChildArgs = new ArrayList<>(); YangInstanceIdentifier rootNormalizedPath = null; diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java index 9c9084fc2f..5b24d2e60d 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java @@ -157,7 +157,7 @@ public class JSONRestconfServiceImpl implements JSONRestconfService, AutoCloseab public void close() { } - private String toJson(final NormalizedNodeContext readData) throws IOException { + private static String toJson(final NormalizedNodeContext readData) throws IOException { final NormalizedNodeJsonBodyWriter writer = new NormalizedNodeJsonBodyWriter(); final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); writer.writeTo(readData, NormalizedNodeContext.class, null, EMPTY_ANNOTATIONS, @@ -165,9 +165,9 @@ public class JSONRestconfServiceImpl implements JSONRestconfService, AutoCloseab return outputStream.toString(StandardCharsets.UTF_8.name()); } - private boolean isDataMissing(final Exception e) { + private static boolean isDataMissing(final Exception e) { boolean dataMissing = false; - if(e instanceof RestconfDocumentedException) { + if (e instanceof RestconfDocumentedException) { final RestconfDocumentedException rde = (RestconfDocumentedException)e; if(!rde.getErrors().isEmpty()) { if(rde.getErrors().get(0).getErrorTag() == ErrorTag.DATA_MISSING) { diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java index c6224663ef..42b97538f5 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java @@ -228,7 +228,7 @@ public class RestCodec { @Override public YangInstanceIdentifier deserialize(final IdentityValuesDTO data) { - final List result = new ArrayList(); + final List result = new ArrayList<>(); final IdentityValue valueWithNamespace = data.getValuesWithNamespaces().get(0); final Module module = getModuleByNamespace(valueWithNamespace.getNamespace(), this.mountPoint); if (module == null) { @@ -301,7 +301,7 @@ public class RestCodec { return result.isEmpty() ? null : YangInstanceIdentifier.create(result); } - private List keyValuesToPredicateList(final Map keyValues) { + private static List keyValuesToPredicateList(final Map keyValues) { final List result = new ArrayList<>(); for (final QName qName : keyValues.keySet()) { final Object value = keyValues.get(qName); @@ -310,7 +310,7 @@ public class RestCodec { return result; } - private IdentityValue qNameToIdentityValue(final QName qName) { + private static IdentityValue qNameToIdentityValue(final QName qName) { if (qName != null) { return new IdentityValue(qName.getNamespace().toString(), qName.getLocalName()); } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java index ea24dbf062..2c025d8e5c 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java @@ -350,7 +350,7 @@ public class RestconfImpl implements RestconfService { * - mount point, if in use otherwise null * @return {@link NormalizedNodeContext} */ - private NormalizedNodeContext operationsFromModulesToNormalizedContext(final Set modules, + private static NormalizedNodeContext operationsFromModulesToNormalizedContext(final Set modules, final DOMMountPoint mountPoint) { final Collection neededModules = new ArrayList<>(modules.size()); @@ -1149,7 +1149,7 @@ public class RestconfImpl implements RestconfService { throw new RestconfDocumentedException(msg); } - private Date parseDateFromQueryParam(final Entry> entry) { + private static Date parseDateFromQueryParam(final Entry> entry) { final DateAndTime event = new DateAndTime(entry.getValue().iterator().next()); String numOf_ms = ""; final String value = event.getValue(); @@ -1179,7 +1179,7 @@ public class RestconfImpl implements RestconfService { * @return {@link InstanceIdentifierContext} of location leaf for * notification */ - private InstanceIdentifierContext prepareIIDSubsStreamOutput() { + private static InstanceIdentifierContext prepareIIDSubsStreamOutput() { final QName qnameBase = QName.create("subscribe:to:notification", "2016-10-28", "notifi"); final SchemaContext schemaCtx = ControllerContext.getInstance().getGlobalSchema(); final DataSchemaNode location = ((ContainerSchemaNode) schemaCtx @@ -1502,8 +1502,8 @@ public class RestconfImpl implements RestconfService { * - contains list of qnames of notifications * @return - checked future object */ - private CheckedFuture - invokeSalRemoteRpcNotifiStrRPC(final NormalizedNodeContext payload) { + private static CheckedFuture invokeSalRemoteRpcNotifiStrRPC( + final NormalizedNodeContext payload) { final ContainerNode data = (ContainerNode) payload.getData(); LeafSetNode leafSet = null; String outputType = "XML"; diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java index b9b38ec143..0e5f5c74ec 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java @@ -333,8 +333,8 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider * @param in reader JsonReader reader * @return NormalizedNode representing data */ - private NormalizedNode readEditData(@Nonnull final JsonReader in, @Nonnull SchemaNode targetSchemaNode, - @Nonnull InstanceIdentifierContext path) { + private static NormalizedNode readEditData(@Nonnull final JsonReader in, @Nonnull final SchemaNode targetSchemaNode, + @Nonnull final InstanceIdentifierContext path) { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); JsonParserStream.create(writer, path.getSchemaContext(), targetSchemaNode).parse(in); @@ -347,7 +347,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider * @param edit Instance of PatchEdit * @return PATCHEntity */ - private PATCHEntity prepareEditOperation(@Nonnull final PatchEdit edit) { + private static PATCHEntity prepareEditOperation(@Nonnull final PatchEdit edit) { if (edit.getOperation() != null && edit.getTargetSchemaNode() != null && checkDataPresence(edit.getOperation(), (edit.getData() != null))) { if (isPatchOperationWithValue(edit.getOperation())) { @@ -375,19 +375,11 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider * @return true if data is present when operation requires it or if there are no data when operation does not * allow it, false otherwise */ - private boolean checkDataPresence(@Nonnull final String operation, final boolean hasData) { + private static boolean checkDataPresence(@Nonnull final String operation, final boolean hasData) { if (isPatchOperationWithValue(operation)) { - if (hasData) { - return true; - } else { - return false; - } + return hasData; } else { - if (!hasData) { - return true; - } else { - return false; - } + return !hasData; } } @@ -405,7 +397,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider return id; } - public void setId(String id) { + public void setId(final String id) { this.id = id; } @@ -413,7 +405,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider return operation; } - public void setOperation(String operation) { + public void setOperation(final String operation) { this.operation = operation; } @@ -421,7 +413,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider return target; } - public void setTarget(YangInstanceIdentifier target) { + public void setTarget(final YangInstanceIdentifier target) { this.target = target; } @@ -429,7 +421,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider return targetSchemaNode; } - public void setTargetSchemaNode(SchemaNode targetSchemaNode) { + public void setTargetSchemaNode(final SchemaNode targetSchemaNode) { this.targetSchemaNode = targetSchemaNode; } @@ -437,7 +429,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider return data; } - public void setData(NormalizedNode data) { + public void setData(final NormalizedNode data) { this.data = data; } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java index b089efe0b1..6b10cb4d42 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeJsonBodyWriter.java @@ -96,12 +96,9 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context, - final NormalizedNode data, - final Integer depth, - final List> fields) throws IOException { + private static void writeNormalizedNode(final JsonWriter jsonWriter, + final SchemaPath path, final InstanceIdentifierContext context, final NormalizedNode data, + final Integer depth, final List> fields) throws IOException { final RestconfNormalizedNodeWriter nnWriter; if (context.getSchemaNode() instanceof RpcDefinition) { @@ -139,18 +136,16 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter child : data.getValue()) { nnWriter.write(child); } } - private RestconfNormalizedNodeWriter createNormalizedNodeWriter(final InstanceIdentifierContext context, - final SchemaPath path, - final JsonWriter jsonWriter, - final Integer depth, - final List> fields) { + private static RestconfNormalizedNodeWriter createNormalizedNodeWriter( + final InstanceIdentifierContext context, final SchemaPath path, final JsonWriter jsonWriter, + final Integer depth, final List> fields) { final SchemaNode schema = context.getSchemaNode(); final JSONCodecFactory codecs = getCodecFactory(context); @@ -170,7 +165,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context) { + private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) { // TODO: Performance: Cache JSON Codec factory and schema context return JSONCodecFactory.create(context.getSchemaContext()); } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java index 373955a248..86b189a033 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/NormalizedNodeXmlBodyWriter.java @@ -101,12 +101,9 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter pathContext, - final NormalizedNode data, - final Integer depth, - final List> fields) throws IOException { + private static void writeNormalizedNode(final XMLStreamWriter xmlWriter, + final SchemaPath path, final InstanceIdentifierContext pathContext, final NormalizedNode data, + final Integer depth, final List> fields) throws IOException { final RestconfNormalizedNodeWriter nnWriter; final SchemaContext schemaCtx = pathContext.getSchemaContext(); @@ -141,19 +138,16 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter> fields) { + private static RestconfNormalizedNodeWriter createNormalizedNodeWriter(final XMLStreamWriter xmlWriter, + final SchemaContext schemaContext, final SchemaPath schemaPath, final Integer depth, + final List> fields) { final NormalizedNodeStreamWriter xmlStreamWriter = XMLStreamNormalizedNodeStreamWriter .create(xmlWriter, schemaContext, schemaPath); return ParameterAwareNormalizedNodeWriter.forStreamWriter(xmlStreamWriter, depth, fields); } - private void writeElements(final XMLStreamWriter xmlWriter, - final RestconfNormalizedNodeWriter nnWriter, - final ContainerNode data) throws IOException { + private static void writeElements(final XMLStreamWriter xmlWriter, final RestconfNormalizedNodeWriter nnWriter, + final ContainerNode data) throws IOException { try { final QName name = data.getNodeType(); xmlWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPATCHBodyReader.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPATCHBodyReader.java index a9ded6bb1a..40bcd23639 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPATCHBodyReader.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlToPATCHBodyReader.java @@ -93,7 +93,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i } } - private PATCHContext parse(final InstanceIdentifierContext pathContext, final Document doc) { + private static PATCHContext parse(final InstanceIdentifierContext pathContext, final Document doc) { final List resultCollection = new ArrayList<>(); final String patchId = doc.getElementsByTagName("patch-id").item(0).getFirstChild().getNodeValue(); final NodeList editNodes = doc.getElementsByTagName("edit"); @@ -176,7 +176,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param operation Name of current operation * @return List of value elements */ - private List readValueNodes(@Nonnull final Element element, @Nonnull final String operation) { + private static List readValueNodes(@Nonnull final Element element, @Nonnull final String operation) { final Node valueNode = element.getElementsByTagName("value").item(0); if (PATCHEditOperation.isPatchOperationWithValue(operation) && valueNode == null) { @@ -214,9 +214,8 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param revision Module revision * @return Non-conditional XPath */ - private String prepareNonCondXpath(@Nonnull final DataSchemaNode schemaNode, @Nonnull final String target, - @Nonnull final Element value, @Nonnull final String namespace, - @Nonnull final String revision) { + private static String prepareNonCondXpath(@Nonnull final DataSchemaNode schemaNode, @Nonnull final String target, + @Nonnull final Element value, @Nonnull final String namespace, @Nonnull final String revision) { final Iterator args = Splitter.on("/").split(target.substring(target.indexOf(':') + 1)).iterator(); final StringBuilder nonCondXpath = new StringBuilder(); @@ -248,7 +247,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param keys Iterator of list keys names * @return Iterator of list keys values */ - private Iterator readKeyValues(@Nonnull final Element value, @Nonnull final Iterator keys) { + private static Iterator readKeyValues(@Nonnull final Element value, @Nonnull final Iterator keys) { final List result = new ArrayList<>(); while (keys.hasNext()) { @@ -264,7 +263,7 @@ public class XmlToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider i * @param keyNames Iterator of list keys names * @param keyValues Iterator of list keys values */ - private void appendKeys(@Nonnull final StringBuilder nonCondXpath, @Nonnull final Iterator keyNames, + private static void appendKeys(@Nonnull final StringBuilder nonCondXpath, @Nonnull final Iterator keyNames, @Nonnull final Iterator keyValues) { while (keyNames.hasNext()) { nonCondXpath.append("["); diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java index 33fc7baf1b..4a25fcb35e 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/services/impl/RestconfDataServiceImpl.java @@ -222,7 +222,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { return PutDataTransactionUtil.putData(payload, ref, transactionNode, insert, point); } - private void checkQueryParams(final boolean insert_used, final boolean point_used, final String insert) { + private static void checkQueryParams(final boolean insert_used, final boolean point_used, final String insert) { if (point_used && !insert_used) { throw new RestconfDocumentedException("Point parameter can't be used without Insert parameter."); } diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java index b4137ac989..851226629c 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/restful/utils/ResponseFactory.java @@ -40,7 +40,7 @@ final class ResponseFactory extends FutureDataFactory implements Builder readData) { + private static Status prepareStatus(final NormalizedNode readData) { return readData != null ? Status.OK : Status.CREATED; } } diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java index a15cf3e09f..8c81385780 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestJsonBodyReader.java @@ -206,15 +206,13 @@ public class TestJsonBodyReader extends AbstractBodyReaderTest { .toString())); } - private void checkExpectValueNormalizeNodeContext( - final DataSchemaNode dataSchemaNode, + private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, final NormalizedNodeContext nnContext) { checkExpectValueNormalizeNodeContext(dataSchemaNode, nnContext, null); } - private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, - final NormalizedNodeContext nnContext, - final YangInstanceIdentifier dataNodeIdent) { + private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, + final NormalizedNodeContext nnContext, final YangInstanceIdentifier dataNodeIdent) { assertEquals(dataSchemaNode, nnContext.getInstanceIdentifierContext().getSchemaNode()); assertEquals(dataNodeIdent, nnContext.getInstanceIdentifierContext().getInstanceIdentifier()); assertNotNull(NormalizedNodes.findNode(nnContext.getData(), dataNodeIdent)); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java index 01cd84bbd2..6e32f8d276 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java @@ -197,14 +197,13 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest { assertTrue("lf-test".equalsIgnoreCase(leafDataNode.get().getValue().toString())); } - private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, + private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, final NormalizedNodeContext nnContext) { checkExpectValueNormalizeNodeContext(dataSchemaNode, nnContext, null); } - private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, - final NormalizedNodeContext nnContext, - final YangInstanceIdentifier dataNodeIdent) { + private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, + final NormalizedNodeContext nnContext, final YangInstanceIdentifier dataNodeIdent) { assertEquals(dataSchemaNode, nnContext.getInstanceIdentifierContext().getSchemaNode()); assertEquals(dataNodeIdent, nnContext.getInstanceIdentifierContext().getInstanceIdentifier()); assertNotNull(NormalizedNodes.findNode(nnContext.getData(), dataNodeIdent)); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java index 1727f4334e..3abe9f91ca 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonBasicDataTypesTest.java @@ -181,7 +181,7 @@ public class CnSnToJsonBasicDataTypesTest extends YangAndXmlAndDataSchemaLoader dataLoad("/cnsn-to-json/simple-data-types"); } - private void verifyJsonOutput(final String jsonOutput) { + private static void verifyJsonOutput(final String jsonOutput) { final StringReader strReader = new StringReader(jsonOutput); final JsonReader jReader = new JsonReader(strReader); @@ -195,7 +195,7 @@ public class CnSnToJsonBasicDataTypesTest extends YangAndXmlAndDataSchemaLoader assertNull("Error during reading Json output: " + exception, exception); } - private void jsonReadCont(final JsonReader jReader) throws IOException { + private static void jsonReadCont(final JsonReader jReader) throws IOException { jReader.beginObject(); assertNotNull("cont1 is missing.", jReader.hasNext()); @@ -208,7 +208,7 @@ public class CnSnToJsonBasicDataTypesTest extends YangAndXmlAndDataSchemaLoader // return dataFromJson; } - private void jsonReadContElements(final JsonReader jReader) throws IOException { + private static void jsonReadContElements(final JsonReader jReader) throws IOException { jReader.beginObject(); final Map expectedMap = Maps.newHashMap(); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java index 110d78cab9..c77ce658d6 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java @@ -157,7 +157,8 @@ public class RestPutListDataTest { } } - private void verifyException(final RestconfDocumentedException e, final ErrorType errorType, final ErrorTag errorTag) { + private static void verifyException(final RestconfDocumentedException e, final ErrorType errorType, + final ErrorTag errorTag) { final List errors = e.getErrors(); assertEquals("getErrors() size", 1, errors.size()); assertEquals("RestconfError getErrorType()", errorType, errors.get(0).getErrorType()); @@ -212,7 +213,7 @@ public class RestPutListDataTest { putListDataTest(uriKey1, uriKey2, payloadKey1, payloadKey2); } - private String toUri(final String uriKey1, final String uriKey2) { + private static String toUri(final String uriKey1, final String uriKey2) { final StringBuilder uriBuilder = new StringBuilder("/test-module:lst-with-composite-key/"); uriBuilder.append(uriKey1); if (uriKey2 != null) { diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java index e68c7abaa3..be83cc3176 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java @@ -295,8 +295,7 @@ public class JsonToNnTest extends AbstractBodyReaderTest { return normalizedNodeContext; } - private void verifyNormaluizedNodeContext( - final NormalizedNodeContext normalizedNodeContext, + private static void verifyNormaluizedNodeContext(final NormalizedNodeContext normalizedNodeContext, final String topLevelElementName) { assertEquals(topLevelElementName, normalizedNodeContext.getData() .getNodeType().getLocalName()); @@ -311,8 +310,7 @@ public class JsonToNnTest extends AbstractBodyReaderTest { assertTrue(dataTree.contains("lf1")); } - private void verityMultipleItemsInList( - final NormalizedNodeContext normalizedNodeContext) { + private static void verityMultipleItemsInList(final NormalizedNodeContext normalizedNodeContext) { final String dataTree = NormalizedNodes.toStringTree(normalizedNodeContext .getData()); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java index a2c40fee9b..8df3cb8ee7 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/json/test/NnToJsonLeafrefType.java @@ -84,7 +84,7 @@ public class NnToJsonLeafrefType extends AbstractBodyReaderTest { json); } - private void validateJson(final String regex, final String value) { + private static void validateJson(final String regex, final String value) { assertNotNull(value); final Pattern ptrn = Pattern.compile(regex, Pattern.DOTALL); final Matcher mtch = ptrn.matcher(value); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java index 113b50ec19..8abd413e58 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java @@ -99,8 +99,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { assertTrue(outputJson.contains("")); } - private NormalizedNodeContext prepareNNCLeafList() - throws URISyntaxException { + private static NormalizedNodeContext prepareNNCLeafList() throws URISyntaxException { final QName cont = QName.create("instance:identifier:module", "2014-01-17", "cont"); final QName cont1 = QName.create("instance:identifier:module", "2014-01-17", @@ -145,7 +144,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { dataCont.withChild(dataCont1.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, schemaCont, + new InstanceIdentifierContext<>(null, schemaCont, null, schemaContext), dataCont.build()); return testNormalizedNodeContext; @@ -194,7 +193,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { assertTrue(outputJson.contains("")); } - private NormalizedNodeContext preparNNC() { + private static NormalizedNodeContext preparNNC() { final QName cont = QName.create("instance:identifier:module", "2014-01-17", "cont"); final QName cont1 = QName.create("instance:identifier:module", "2014-01-17", @@ -249,14 +248,13 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { dataCont.withChild(dataCont1.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, schemaCont, + new InstanceIdentifierContext<>(null, schemaCont, null, schemaContext), dataCont.build()); return testNormalizedNodeContext; } - private DataContainerChild buildLeaf(final DataSchemaNode lst11Schema, - final QName qname, + private static DataContainerChild buildLeaf(final DataSchemaNode lst11Schema, final QName qname, final CollectionNodeBuilder dataLst11, final Object value) { final List instanceLf = ControllerContext diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java index 1c77de09b8..7664de37a8 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java @@ -278,7 +278,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { nnToXml(normalizedNodeContext, "<" + elName + ">true"); } - private NormalizedNodeContext prepareNNC(final Object object, final String name) { + private static NormalizedNodeContext prepareNNC(final Object object, final String name) { final QName cont = QName.create("basic:module", "2013-12-2", "cont"); final QName lf = QName.create("basic:module", "2013-12-2", name); @@ -294,7 +294,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(Builders.leafBuilder((LeafSchemaNode) schemaLf).withValue(object).build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); return testNormalizedNodeContext; } @@ -304,12 +304,12 @@ public class NnToXmlTest extends AbstractBodyReaderTest { final OutputStream output = new ByteArrayOutputStream(); this.xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null, this.mediaType, null, output); - for (int i = 0; i < xmlRepresentation.length; i++) { - assertTrue(output.toString().contains(xmlRepresentation[i])); + for (String element : xmlRepresentation) { + assertTrue(output.toString().contains(element)); } } - private NormalizedNodeContext prepareLeafrefData() { + private static NormalizedNodeContext prepareLeafrefData() { final QName cont = QName.create("basic:module", "2013-12-2", "cont"); final QName lfBoolean = QName.create("basic:module", "2013-12-2", "lfBoolean"); final QName lfLfref = QName.create("basic:module", "2013-12-2", "lfLfref"); @@ -332,12 +332,12 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(Builders.leafBuilder((LeafSchemaNode) schemaLf).withValue("true").build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); return testNormalizedNodeContext; } - private NormalizedNodeContext prepareLeafrefNegativeData() { + private static NormalizedNodeContext prepareLeafrefNegativeData() { final QName cont = QName.create("basic:module", "2013-12-2", "cont"); final QName lfLfref = QName.create("basic:module", "2013-12-2", "lfLfrefNegative"); @@ -355,7 +355,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); } - private NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) { + private static NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) { final QName cont = QName.create("basic:module", "2013-12-2", "cont"); final QName cont1 = QName.create("basic:module", "2013-12-2", "cont1"); final QName lf11 = QName.create("basic:module", "2013-12-2", "lf11"); @@ -386,7 +386,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(cont1Data.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); return testNormalizedNodeContext; } diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java index d0f0ee0782..dc77462eed 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java @@ -69,8 +69,7 @@ public class NnToXmlWithChoiceTest extends AbstractBodyReaderTest { assertTrue(output.toString().contains("String data2")); } - private NormalizedNodeContext prepareNNC(final String name, - final Object value) { + private static NormalizedNodeContext prepareNNC(final String name, final Object value) { final QName contQname = QName.create("module:with:choice", "2013-12-18", "cont"); @@ -100,7 +99,7 @@ public class NnToXmlWithChoiceTest extends AbstractBodyReaderTest { dataContainerNodeAttrBuilder.withChild(dataChoice.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, + new InstanceIdentifierContext<>(null, contSchemaNode, null, schemaContext), dataContainerNodeAttrBuilder.build()); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java index cc3d3d1997..dacd492af8 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java @@ -94,7 +94,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends return null; } - private NormalizedNodeContext prepareNormalizedNodeContext() { + private static NormalizedNodeContext prepareNormalizedNodeContext() { final String rev = "2014-01-17"; final DataSchemaNode schemaContNode = schemaContext; @@ -115,14 +115,14 @@ public class NnToXmlWithDataFromSeveralModulesTest extends dataContSchemaContNode.withChild(modul2.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext(null, + new InstanceIdentifierContext<>(null, schemaContNode, null, schemaContext), dataContSchemaContNode.build()); return testNormalizedNodeContext; } - private DataContainerNodeAttrBuilder buildContBuilderMod1( + private static DataContainerNodeAttrBuilder buildContBuilderMod1( final String uri, final String rev, final String cont, final String contB, final String lf1, final String lf1_value) { final QName contQname = QName.create(uri, rev, cont); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java index a8442af3b4..41afee3ace 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java @@ -124,19 +124,20 @@ public class BrokerFacadeTest { ControllerContext.getInstance().setSchemas(TestUtils.loadSchemaContext("/full-versions/test-module")); } - private CheckedFuture>, ReadFailedException> wrapDummyNode( + private static CheckedFuture>, ReadFailedException> wrapDummyNode( final NormalizedNode dummyNode) { return Futures.immediateCheckedFuture(Optional.> of(dummyNode)); } - private CheckedFuture wrapExistence(final Boolean exists) { + private static CheckedFuture wrapExistence(final Boolean exists) { return Futures.immediateCheckedFuture(exists); } /** * Value of this node shouldn't be important for testing purposes */ - private NormalizedNode createDummyNode(final String namespace, final String date, final String localName) { + private static NormalizedNode createDummyNode(final String namespace, final String date, + final String localName) { return Builders.containerBuilder() .withNodeIdentifier(new NodeIdentifier(QName.create(namespace, date, localName))).build(); } diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java index 8f26109ad6..6fd84fb687 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java @@ -41,7 +41,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch } - private void validateXmlOutput(final String xml) throws XMLStreamException { + private static void validateXmlOutput(final String xml) throws XMLStreamException { final XMLInputFactory xmlInFactory = XMLInputFactory.newInstance(); XMLEventReader eventReader; @@ -82,7 +82,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch } - private void validateXmlOutputWithLeafList(final String xml) throws XMLStreamException { + private static void validateXmlOutputWithLeafList(final String xml) throws XMLStreamException { final XMLInputFactory xmlInFactory = XMLInputFactory.newInstance(); XMLEventReader eventReader; @@ -118,7 +118,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch } - private YangInstanceIdentifier createInstanceIdentifier() throws URISyntaxException { + private static YangInstanceIdentifier createInstanceIdentifier() throws URISyntaxException { final List pathArguments = new ArrayList<>(); pathArguments.add(new NodeIdentifier(new QName(new URI("instance:identifier:module"), "cont"))); pathArguments.add(new NodeIdentifier(new QName(new URI("instance:identifier:module"), "cont1"))); @@ -135,7 +135,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch return YangInstanceIdentifier.create(pathArguments); } - private YangInstanceIdentifier createInstanceIdentifierWithLeafList() throws URISyntaxException { + private static YangInstanceIdentifier createInstanceIdentifierWithLeafList() throws URISyntaxException { final List pathArguments = new ArrayList<>(); pathArguments.add(new NodeIdentifier(new QName(new URI("instance:identifier:module"), "cont"))); pathArguments.add(new NodeIdentifier(new QName(new URI("instance:identifier:module"), "cont1"))); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java index 026403c26e..ecec06cd6b 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java @@ -306,15 +306,13 @@ public class CutDataToCorrectDepthTest extends JerseyTest { return new NodeWithValue(QName.create("urn:nested:module", "2014-06-3", localName), value); } - - - private UnkeyedListEntryNode nodeDataDepth3Operational() { + private static UnkeyedListEntryNode nodeDataDepth3Operational() { return unkeyedEntry("depth2-cont1", container("depth3-cont1", container("depth4-cont1"), leaf("depth4-leaf1", "depth4-leaf1-value")), leaf("depth3-leaf1", "depth3-leaf1-value")); } - private ContainerNode nodeDataDepth5() { + private static ContainerNode nodeDataDepth5() { return container( "depth1-cont", unkeyedList( @@ -336,7 +334,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { leaf("depth2-leaf1", "depth2-leaf1-value")); } - private ContainerNode nodeDataDepth4() { + private static ContainerNode nodeDataDepth4() { return container( "depth1-cont", unkeyedList("depth2-cont1", nodeDataDepth3Operational()), @@ -350,7 +348,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { leaf("depth3-leaf2", "depth3-leaf2-value")), leaf("depth2-leaf1", "depth2-leaf1-value")); } - private ContainerNode nodeDataDepth3() { + private static ContainerNode nodeDataDepth3() { return container( "depth1-cont", unkeyedList("depth2-cont1", @@ -363,7 +361,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { leaf("depth2-leaf1", "depth2-leaf1-value")); } - private ContainerNode nodeDataDepth2() { + private static ContainerNode nodeDataDepth2() { return container( "depth1-cont", unkeyedList("depth2-cont1", unkeyedEntry("depth2-cont1")), @@ -374,7 +372,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { leaf("depth2-leaf1", "depth2-leaf1-value")); } - private ContainerNode nodeDataDepth1() { + private static ContainerNode nodeDataDepth1() { return container("depth1-cont"); } } diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java index fea433254a..c88c0aca53 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java @@ -126,7 +126,7 @@ public class InvokeRpcMethodTest { } - private NormalizedNodeContext prepareDomPayload() { + private static NormalizedNodeContext prepareDomPayload() { final SchemaContext schema = controllerContext.getGlobalSchema(); final Module rpcModule = schema.findModuleByName("invoke-rpc-module", null); assertNotNull(rpcModule); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java index a7b315199e..ec1642e55f 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java @@ -48,8 +48,6 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; import org.opendaylight.netconf.sal.rest.impl.JsonNormalizedNodeBodyReader; @@ -134,7 +132,7 @@ public class RestGetOperationTest extends JerseyTest { return resourceConfig; } - private void setControllerContext(final SchemaContext schemaContext) { + private static void setControllerContext(final SchemaContext schemaContext) { final ControllerContext controllerContext = ControllerContext.getInstance(); controllerContext.setSchemas(schemaContext); restconfImpl.setControllerContext(controllerContext); @@ -218,7 +216,7 @@ public class RestGetOperationTest extends JerseyTest { assertEquals(200, get(uri, MediaType.APPLICATION_XML)); } - private YangInstanceIdentifier prepareInstanceIdentifierForList() throws Exception { + private static YangInstanceIdentifier prepareInstanceIdentifierForList() throws Exception { final List parameters = new ArrayList<>(); final QName qNameCont = newTestModuleQName("cont"); @@ -232,7 +230,7 @@ public class RestGetOperationTest extends JerseyTest { return YangInstanceIdentifier.create(parameters); } - private QName newTestModuleQName(final String localPart) throws Exception { + private static QName newTestModuleQName(final String localPart) throws Exception { final Date revision = new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-09"); final URI uri = new URI("test:module"); return QName.create(uri, revision, localPart); @@ -375,7 +373,7 @@ public class RestGetOperationTest extends JerseyTest { } - private void validateOperationsResponseXml(final Document responseDoc, final SchemaContext schemaContext) { + private static void validateOperationsResponseXml(final Document responseDoc, final SchemaContext schemaContext) { final Element operationsElem = responseDoc.getDocumentElement(); assertEquals(RESTCONF_NS, operationsElem.getNamespaceURI()); @@ -425,7 +423,8 @@ public class RestGetOperationTest extends JerseyTest { } - private Matcher validateOperationsResponseJson(final String searchIn, final String rpcName, final String moduleName) { + private static Matcher validateOperationsResponseJson(final String searchIn, final String rpcName, + final String moduleName) { final StringBuilder regex = new StringBuilder(); regex.append(".*\"" + rpcName + "\""); final Pattern ptrn = Pattern.compile(regex.toString(), Pattern.DOTALL); @@ -433,7 +432,8 @@ public class RestGetOperationTest extends JerseyTest { } - private Matcher validateOperationsResponseXml(final String searchIn, final String rpcName, final String namespace) { + private static Matcher validateOperationsResponseXml(final String searchIn, final String rpcName, + final String namespace) { final StringBuilder regex = new StringBuilder(); regex.append("^"); @@ -528,7 +528,7 @@ public class RestGetOperationTest extends JerseyTest { } - private void validateModulesResponseXml(final Response response, final SchemaContext schemaContext) { + private static void validateModulesResponseXml(final Response response, final SchemaContext schemaContext) { assertEquals(200, response.getStatus()); final Document responseBody = response.readEntity(Document.class); final NodeList moduleNodes = responseBody.getDocumentElement().getElementsByTagNameNS(RESTCONF_NS, "module"); @@ -547,7 +547,7 @@ public class RestGetOperationTest extends JerseyTest { assertAllModules(foundModules,schemaContext); } - private void assertAllModules(final Set foundModules, final SchemaContext schemaContext) { + private static void assertAllModules(final Set foundModules, final SchemaContext schemaContext) { for(final Module module : schemaContext.getModules()) { final QName current = QName.create(module.getQNameModule(),module.getName()); assertTrue("Module not found in response.",foundModules.contains(current)); @@ -555,7 +555,7 @@ public class RestGetOperationTest extends JerseyTest { } - private QName assertedModuleXmlToModuleQName(final org.w3c.dom.Node module) { + private static QName assertedModuleXmlToModuleQName(final org.w3c.dom.Node module) { assertEquals("module", module.getLocalName()); assertEquals(RESTCONF_NS, module.getNamespaceURI()); String revision = null; @@ -596,7 +596,7 @@ public class RestGetOperationTest extends JerseyTest { return QName.create(namespace,revision,name); } - private void validateModulesResponseJson(final Response response) { + private static void validateModulesResponseJson(final Response response) { assertEquals(200, response.getStatus()); final String responseBody = response.readEntity(String.class); @@ -608,7 +608,7 @@ public class RestGetOperationTest extends JerseyTest { .find()); } - private Matcher prepareJsonRegex(final String module, final String revision, final String namespace, + private static Matcher prepareJsonRegex(final String module, final String revision, final String namespace, final String searchIn) { final StringBuilder regex = new StringBuilder(); regex.append("^"); @@ -648,7 +648,8 @@ public class RestGetOperationTest extends JerseyTest { } */ @SuppressWarnings("rawtypes") - private NormalizedNode prepareCnDataForMountPointTest(final boolean wrapToCont) throws URISyntaxException, ParseException { + private static NormalizedNode prepareCnDataForMountPointTest(final boolean wrapToCont) + throws URISyntaxException, ParseException { final String testModuleDate = "2014-01-09"; final ContainerNode contChild = Builders .containerBuilder() @@ -668,18 +669,18 @@ public class RestGetOperationTest extends JerseyTest { } @SuppressWarnings("unchecked") - private void mockReadOperationalDataMethod() { + private static void mockReadOperationalDataMethod() { when(brokerFacade.readOperationalData(any(YangInstanceIdentifier.class))).thenReturn(answerFromGet); } @SuppressWarnings("unchecked") - private void mockReadConfigurationDataMethod() { + private static void mockReadConfigurationDataMethod() { when(brokerFacade.readConfigurationData(any(YangInstanceIdentifier.class), Mockito.anyString())) .thenReturn(answerFromGet); } @SuppressWarnings("rawtypes") - private NormalizedNode prepareCnDataForSlashesBehindMountPointTest() throws ParseException { + private static NormalizedNode prepareCnDataForSlashesBehindMountPointTest() throws ParseException { return ImmutableMapEntryNodeBuilder .create() .withNodeIdentifier( @@ -736,12 +737,7 @@ public class RestGetOperationTest extends JerseyTest { final MultivaluedMap paramMap = new MultivaluedHashMap<>(); paramMap.putSingle("depth", "1o"); final UriInfo mockInfo = mock(UriInfo.class); - when(mockInfo.getQueryParameters(false)).thenAnswer(new Answer>() { - @Override - public MultivaluedMap answer(final InvocationOnMock invocation) { - return paramMap; - } - }); + when(mockInfo.getQueryParameters(false)).thenAnswer(invocation -> paramMap); getDataWithInvalidDepthParameterTest(mockInfo); @@ -753,7 +749,7 @@ public class RestGetOperationTest extends JerseyTest { } @SuppressWarnings({"rawtypes", "unchecked"}) - private void getDataWithInvalidDepthParameterTest(final UriInfo uriInfo) { + private static void getDataWithInvalidDepthParameterTest(final UriInfo uriInfo) { try { final QName qNameDepth1Cont = QName.create("urn:nested:module", "2014-06-3", "depth1-cont"); final YangInstanceIdentifier ii = YangInstanceIdentifier.builder().node(qNameDepth1Cont).build(); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java index cccf61e955..5832d680e6 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java @@ -101,7 +101,7 @@ public class RestPostOperationTest extends JerseyTest { return resourceConfig; } - private void setSchemaControllerContext(final SchemaContext schema) { + private static void setSchemaControllerContext(final SchemaContext schema) { final ControllerContext context = ControllerContext.getInstance(); context.setSchemas(schema); restconfImpl.setControllerContext(context); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java index eefdc9ced0..2d6c8e16a8 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutOperationTest.java @@ -205,7 +205,7 @@ public class RestPutOperationTest extends JerseyTest { return target(uri).request(mediaType).put(Entity.entity(data, mediaType)).getStatus(); } - private void mockCommitConfigurationDataPutMethod(final boolean noErrors) { + private static void mockCommitConfigurationDataPutMethod(final boolean noErrors) { final PutResult putResMock = mock(PutResult.class); if (noErrors) { doReturn(putResMock).when(brokerFacade).commitConfigurationDataPut( diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java index a443ad6e37..b3e556fb88 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfDocumentedExceptionMapperTest.java @@ -669,7 +669,7 @@ public class RestconfDocumentedExceptionMapperTest extends JerseyTest { errorInfoVerifier); } - private JsonArray parseJsonErrorArrayElement(final InputStream stream) throws IOException { + private static JsonArray parseJsonErrorArrayElement(final InputStream stream) throws IOException { final ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteStreams.copy(stream, bos); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java index 17049890b5..5a56aaaef5 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfErrorTest.java @@ -37,17 +37,17 @@ public class RestconfErrorTest { private final String text; - public Contains(String text) { + public Contains(final String text) { this.text = text; } @Override - public void describeTo(Description desc) { + public void describeTo(final Description desc) { desc.appendText("contains ").appendValue(text); } @Override - public boolean matches(Object arg) { + public boolean matches(final Object arg) { return arg != null && arg.toString().contains(text); } } @@ -74,7 +74,7 @@ public class RestconfErrorTest { @Test public void testErrorTagStatusCodes() { - Map lookUpMap = new HashMap(); + Map lookUpMap = new HashMap<>(); lookUpMap.put("in-use", 409); lookUpMap.put("invalid-value", 400); @@ -183,15 +183,17 @@ public class RestconfErrorTest { null, "error", new RestconfError( rpcError ) ); } - private void validateRestConfError(String expectedMessage, ErrorType expectedErrorType, ErrorTag expectedErrorTag, - String expectedErrorAppTag, String errorInfo, RestconfError e) { + private static void validateRestConfError(final String expectedMessage, final ErrorType expectedErrorType, + final ErrorTag expectedErrorTag, final String expectedErrorAppTag, final String errorInfo, + final RestconfError e) { validateRestConfError(expectedMessage, expectedErrorType, expectedErrorTag, expectedErrorAppTag, equalTo(errorInfo), e); } - private void validateRestConfError(String expectedMessage, ErrorType expectedErrorType, ErrorTag expectedErrorTag, - String expectedErrorAppTag, Matcher errorInfoMatcher, RestconfError e) { + private static void validateRestConfError(final String expectedMessage, final ErrorType expectedErrorType, + final ErrorTag expectedErrorTag, final String expectedErrorAppTag, final Matcher errorInfoMatcher, + final RestconfError e) { assertEquals("getErrorMessage", expectedMessage, e.getErrorMessage()); assertEquals("getErrorType", expectedErrorType, e.getErrorType()); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java index 4bb99597f9..8f6082b4d3 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/websockets/test/RestStream.java @@ -99,7 +99,7 @@ public class RestStream extends JerseyTest { return target(uri).request(mediaType).get(); } - private String getRpcInput() { + private static String getRpcInput() { final StringBuilder sb = new StringBuilder(); sb.append(""); sb.append("/int:interfaces/int:interface[int:name='eth0']"); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/streams/listeners/NotificationListenerTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/streams/listeners/NotificationListenerTest.java index a2d794aa14..16d8778e9e 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/streams/listeners/NotificationListenerTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/streams/listeners/NotificationListenerTest.java @@ -180,7 +180,7 @@ public class NotificationListenerTest { assertTrue(result.contains("lf-augm" + '"' + ":" + '"' + "value")); } - private AugmentationNode mockAugm(final LeafNode leaf) { + private static AugmentationNode mockAugm(final LeafNode leaf) { final AugmentationNode augm = mock(AugmentationNode.class); final AugmentationIdentifier augmId = new AugmentationIdentifier(SingletonSet.of(leaf.getNodeType())); when(augm.getIdentifier()).thenReturn(augmId); @@ -192,7 +192,7 @@ public class NotificationListenerTest { return augm; } - private MapEntryNode mockMapEntry(final QName entryQName, final LeafNode leaf) { + private static MapEntryNode mockMapEntry(final QName entryQName, final LeafNode leaf) { final MapEntryNode entry = mock(MapEntryNode.class); final Map keyValues = new HashMap<>(); keyValues.put(leaf.getNodeType(), "value"); @@ -207,7 +207,7 @@ public class NotificationListenerTest { return entry; } - private MapNode mockList(final QName listQName, final MapEntryNode... entries) { + private static MapNode mockList(final QName listQName, final MapEntryNode... entries) { final MapNode list = mock(MapNode.class); when(list.getIdentifier()).thenReturn(NodeIdentifier.create(listQName)); when(list.getNodeType()).thenReturn(listQName); @@ -215,7 +215,7 @@ public class NotificationListenerTest { return list; } - private ContainerNode mockCont(final QName contQName, final DataContainerChild child) { + private static ContainerNode mockCont(final QName contQName, final DataContainerChild child) { final ContainerNode cont = mock(ContainerNode.class); when(cont.getIdentifier()).thenReturn(NodeIdentifier.create(contQName)); when(cont.getNodeType()).thenReturn(contQName); @@ -226,7 +226,7 @@ public class NotificationListenerTest { return cont; } - private LeafNode mockLeaf(final QName leafQName) { + private static LeafNode mockLeaf(final QName leafQName) { final LeafNode child = mock(LeafNode.class); when(child.getNodeType()).thenReturn(leafQName); when(child.getIdentifier()).thenReturn(NodeIdentifier.create(leafQName)); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/JsonBodyReaderTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/JsonBodyReaderTest.java index 2b691e5301..43c4d1ac8e 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/JsonBodyReaderTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/JsonBodyReaderTest.java @@ -168,7 +168,7 @@ public class JsonBodyReaderTest extends AbstractBodyReaderTest { checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII); } - private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, + private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, final NormalizedNodeContext nnContext, final YangInstanceIdentifier dataNodeIdent) { assertEquals(dataSchemaNode, nnContext.getInstanceIdentifierContext().getSchemaNode()); assertEquals(dataNodeIdent, nnContext.getInstanceIdentifierContext().getInstanceIdentifier()); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/XmlBodyReaderTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/XmlBodyReaderTest.java index 375886c2cc..ffd3036361 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/XmlBodyReaderTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/XmlBodyReaderTest.java @@ -162,7 +162,7 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest { checkExpectValueNormalizeNodeContext(dataSchemaNode, returnValue, dataII); } - private void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, + private static void checkExpectValueNormalizeNodeContext(final DataSchemaNode dataSchemaNode, final NormalizedNodeContext nnContext, final YangInstanceIdentifier dataNodeIdent) { assertEquals(dataSchemaNode, nnContext.getInstanceIdentifierContext().getSchemaNode()); assertEquals(dataNodeIdent, nnContext.getInstanceIdentifierContext().getInstanceIdentifier()); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java index 01076f26d6..599184bdcd 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/mapping/RestconfMappingNodeUtilTest.java @@ -178,7 +178,8 @@ public class RestconfMappingNodeUtilTest { testData(map, mappedData); } - private Map prepareMap(final String name, final URI uri, final Date start, final String outputType) { + private static Map prepareMap(final String name, final URI uri, final Date start, + final String outputType) { final Map map = new HashMap<>(); map.put(MonitoringModule.LEAF_NAME_STREAM_QNAME, name); map.put(MonitoringModule.LEAF_LOCATION_ACCESS_QNAME, uri.toString()); @@ -189,7 +190,7 @@ public class RestconfMappingNodeUtilTest { return map; } - private void testData(final Map map, final NormalizedNode mappedData) { + private static void testData(final Map map, final NormalizedNode mappedData) { for (final DataContainerChild child : ((MapEntryNode) mappedData).getValue()) { if (child instanceof LeafNode) { final LeafNode leaf = ((LeafNode) child); @@ -205,7 +206,7 @@ public class RestconfMappingNodeUtilTest { * @param containerNode * - modules */ - private void verifyLoadedModules(final ContainerNode containerNode) { + private static void verifyLoadedModules(final ContainerNode containerNode) { final Map loadedModules = new HashMap<>(); @@ -243,8 +244,8 @@ public class RestconfMappingNodeUtilTest { * @param expectedModules Modules from SchemaContext * @param loadedModules Loaded modules into Restconf module */ - private final void verifyLoadedModules(final Set expectedModules, - final Map loadedModules) { + private static void verifyLoadedModules(final Set expectedModules, + final Map loadedModules) { assertEquals("Number of loaded modules is not as expected", expectedModules.size(), loadedModules.size()); for (final Module m : expectedModules) { final String name = m.getName(); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java index c572bb67ce..d19c0ab565 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/utils/schema/context/RestconfSchemaUtilTest.java @@ -37,15 +37,15 @@ public class RestconfSchemaUtilTest { findSchemaNodeInCollection("bad_key", origSchNode); } - private SchemaNode findSchemaNodeInCollection(final String key, final SchemaNode... origSchNode) { + private static SchemaNode findSchemaNodeInCollection(final String key, final SchemaNode... origSchNode) { final List collection = new ArrayList<>(); - for (int i = 0; i < origSchNode.length; i++) { - collection.add(origSchNode[i]); + for (SchemaNode element : origSchNode) { + collection.add(element); } return RestconfSchemaUtil.findSchemaNodeInCollection(collection, key); } - private SchemaNode mockSchemaNode(final String origKey) { + private static SchemaNode mockSchemaNode(final String origKey) { final SchemaNode mockSchNode = Mockito.mock(SchemaNode.class); Mockito.when(mockSchNode.getQName()) .thenReturn(QName.create("ns", new SimpleDateFormat("yyyy-MM-dd").format(new Date()), origKey)); -- 2.36.6