From: Robert Varga Date: Mon, 4 Jan 2021 12:59:26 +0000 (+0100) Subject: Cleanup warnings X-Git-Tag: v1.13.0~32 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3b5e41839346a83c1d8d54b3d869e19d9e417063;p=netconf.git Cleanup warnings Migrate isFoo() callers to use getFoo() and add @NonNull annotations to constants so as to reduce Eclipse warnings. Change-Id: I4f9ee7181d90f7573ca0c5056512b38b15da8eeb Signed-off-by: Robert Varga --- diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeAuthProviderImpl.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeAuthProviderImpl.java index 6a88aeb270..c923020193 100644 --- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeAuthProviderImpl.java +++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeAuthProviderImpl.java @@ -271,7 +271,7 @@ public class CallHomeAuthProviderImpl implements CallHomeAuthorizationProvider, boolean allowedUnknownKeys() { final Global local = current; // Deal with null values. - return local != null && Boolean.TRUE.equals(local.isAcceptAllSshKeys()); + return local != null && Boolean.TRUE.equals(local.getAcceptAllSshKeys()); } Credentials getCredentials() { diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/TlsAllowedDevicesMonitorImpl.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/TlsAllowedDevicesMonitorImpl.java index fe66123fc6..8ae403354f 100644 --- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/TlsAllowedDevicesMonitorImpl.java +++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/TlsAllowedDevicesMonitorImpl.java @@ -69,7 +69,7 @@ public class TlsAllowedDevicesMonitorImpl implements TlsAllowedDevicesMonitor, A } @Override - public Optional findDeviceIdByPublicKey(@NonNull final PublicKey key) { + public Optional findDeviceIdByPublicKey(final PublicKey key) { // Find certificate names by the public key final Set certificates = CERTIFICATE_TO_PUBLIC_KEY.entrySet().stream() .filter(v -> key.equals(v.getValue())) diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java index 33f49ebb64..28871bca6a 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java @@ -99,7 +99,7 @@ class NetconfEventSourceMount { final Optional lastEventTime) { final CreateSubscriptionInputBuilder inputBuilder = new CreateSubscriptionInputBuilder() .setStream(stream.getName()); - if (lastEventTime.isPresent() && stream.isReplaySupport()) { + if (lastEventTime.isPresent() && stream.getReplaySupport()) { final ZonedDateTime dateTime = lastEventTime.get().atZone(ZoneId.systemDefault()); final String formattedDate = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(dateTime); inputBuilder.setStartTime(new DateAndTime(formattedDate)); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java index a82ce65058..f2edf047af 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java @@ -50,7 +50,7 @@ class StreamNotificationTopicRegistration extends NotificationTopicRegistration this.mountPoint = netconfEventSource.getMount(); this.nodeId = mountPoint.getNode().getNodeId().getValue(); this.stream = stream; - setReplaySupported(stream.isReplaySupport()); + setReplaySupported(stream.getReplaySupport()); setActive(false); LOG.info("StreamNotificationTopicRegistration initialized for {}", getStreamName()); } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java index 244f39fe09..aedc22dc42 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java @@ -155,8 +155,8 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { ? NetconfTopologyUtils.DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis().toJava(); final long keepaliveDelay = node.getKeepaliveDelay() == null ? NetconfTopologyUtils.DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay().toJava(); - final boolean reconnectOnChangedSchema = node.isReconnectOnChangedSchema() == null - ? NetconfTopologyUtils.DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.isReconnectOnChangedSchema(); + final boolean reconnectOnChangedSchema = node.getReconnectOnChangedSchema() == null + ? NetconfTopologyUtils.DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.getReconnectOnChangedSchema(); RemoteDeviceHandler salFacade = requireNonNull(deviceHandler); if (keepaliveDelay > 0) { @@ -199,7 +199,7 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { } final RemoteDevice device; - if (node.isSchemaless()) { + if (node.getSchemaless()) { device = new SchemalessNetconfDevice(netconfTopologyDeviceSetup.getBaseSchemas(), remoteDeviceId, salFacade); } else { @@ -225,8 +225,8 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { NetconfDeviceCommunicator netconfDeviceCommunicator = userCapabilities.isPresent() ? new NetconfDeviceCommunicator(remoteDeviceId, device, new UserPreferences(userCapabilities.get(), - node.getYangModuleCapabilities() == null ? false : node.getYangModuleCapabilities().isOverride(), - node.getNonModuleCapabilities() == null ? false : node.getNonModuleCapabilities().isOverride()), + node.getYangModuleCapabilities() == null ? false : node.getYangModuleCapabilities().getOverride(), + node.getNonModuleCapabilities() == null ? false : node.getNonModuleCapabilities().getOverride()), rpcMessageLimit) : new NetconfDeviceCommunicator(remoteDeviceId, device, rpcMessageLimit); @@ -283,8 +283,8 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { final int betweenAttemptsTimeoutMillis = node.getBetweenAttemptsTimeoutMillis() == null ? NetconfTopologyUtils.DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis().toJava(); - final boolean isTcpOnly = node.isTcpOnly() == null - ? NetconfTopologyUtils.DEFAULT_IS_TCP_ONLY : node.isTcpOnly(); + final boolean isTcpOnly = node.getTcpOnly() == null + ? NetconfTopologyUtils.DEFAULT_IS_TCP_ONLY : node.getTcpOnly(); final BigDecimal sleepFactor = node.getSleepFactor() == null ? NetconfTopologyUtils.DEFAULT_SLEEP_FACTOR : node.getSleepFactor(); diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java index a66c671981..4a5c074eb1 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java @@ -242,12 +242,12 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { final RemoteDevice device; final List> yanglibRegistrations; - if (node.isSchemaless()) { + if (node.getSchemaless()) { device = new SchemalessNetconfDevice(baseSchemas, remoteDeviceId, salFacade); yanglibRegistrations = List.of(); } else { - final boolean reconnectOnChangedSchema = node.isReconnectOnChangedSchema() == null - ? DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.isReconnectOnChangedSchema(); + final boolean reconnectOnChangedSchema = node.getReconnectOnChangedSchema() == null + ? DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.getReconnectOnChangedSchema(); final SchemaResourcesDTO resources = schemaManager.getSchemaResources(node, nodeId.getValue()); device = new NetconfDeviceBuilder() @@ -342,7 +342,7 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { ? DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts().toJava(); final int betweenAttemptsTimeoutMillis = node.getBetweenAttemptsTimeoutMillis() == null ? DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis().toJava(); - final boolean useTcp = node.isTcpOnly() == null ? DEFAULT_IS_TCP_ONLY : node.isTcpOnly(); + final boolean useTcp = node.getTcpOnly() == null ? DEFAULT_IS_TCP_ONLY : node.getTcpOnly(); final BigDecimal sleepFactor = node.getSleepFactor() == null ? DEFAULT_SLEEP_FACTOR : node.getSleepFactor(); final InetSocketAddress socketAddress = getSocketAddress(node.getHost(), node.getPort().getValue().toJava()); @@ -434,7 +434,7 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { boolean overrideYangModuleCaps = false; if (node.getYangModuleCapabilities() != null) { capabilities.addAll(node.getYangModuleCapabilities().getCapability()); - overrideYangModuleCaps = node.getYangModuleCapabilities().isOverride(); + overrideYangModuleCaps = node.getYangModuleCapabilities().getOverride(); } //non-module capabilities should not exist in yang module capabilities @@ -446,7 +446,7 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { boolean overrideNonModuleCaps = false; if (node.getNonModuleCapabilities() != null) { capabilities.addAll(node.getNonModuleCapabilities().getCapability()); - overrideNonModuleCaps = node.getNonModuleCapabilities().isOverride(); + overrideNonModuleCaps = node.getNonModuleCapabilities().getOverride(); } return Optional.of(new UserPreferences(NetconfSessionPreferences diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java index 2f67860664..a82b39b7ce 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java @@ -41,6 +41,7 @@ import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilder; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMRpcResult; @@ -108,7 +109,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { private static final YangInstanceIdentifier MODULES_STATE_MODULE_LIST = YangInstanceIdentifier.create(MODULES_STATE_NID, MODULE_NID); - private static final ContainerNode GET_MODULES_STATE_MODULE_LIST_RPC = Builders.containerBuilder() + private static final @NonNull ContainerNode GET_MODULES_STATE_MODULE_LIST_RPC = Builders.containerBuilder() .withNodeIdentifier(NETCONF_GET_NODEID) .withChild(NetconfMessageTransformUtil.toFilterStructure(MODULES_STATE_MODULE_LIST, LIBRARY_CONTEXT)) .build(); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java index 53169d03ed..42ce7987f2 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java @@ -191,7 +191,7 @@ public class NetconfDevice // No more sources, fail or try to reconnect if (cause instanceof EmptySchemaContextException) { - if (nodeOptional != null && nodeOptional.getIgnoreMissingSchemaSources().isAllowed()) { + if (nodeOptional != null && nodeOptional.getIgnoreMissingSchemaSources().getAllowed()) { eventExecutor.schedule(() -> { LOG.warn("Reconnection is allowed! This can lead to unexpected errors at runtime."); LOG.warn("{} : No more sources for schema context.", id); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java index 9147d9a389..92705dcced 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.netconf.api.xml.XmlUtil; @@ -70,7 +71,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { private static final Logger LOG = LoggerFactory.getLogger(NetconfStateSchemas.class); private static final YangInstanceIdentifier STATE_SCHEMAS_IDENTIFIER = YangInstanceIdentifier.builder().node(NetconfState.QNAME).node(Schemas.QNAME).build(); - private static final ContainerNode GET_SCHEMAS_RPC; + private static final @NonNull ContainerNode GET_SCHEMAS_RPC; static { final Document document = XmlUtil.newDocument(); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java index 616f0bc526..3d94482d8e 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java @@ -155,7 +155,8 @@ public final class KeepaliveSalFacade implements RemoteDeviceHandler switch (rootNode.getModificationType()) { case SUBTREE_MODIFIED: case WRITE: - if (!rootNode.getDataAfter().isDatastoreLockAllowed()) { + if (!rootNode.getDataAfter().getDatastoreLockAllowed()) { LOG.warn("With blocking the lock/unlock operations, the user is coming to " + "operate in a manner which is not supported. Concurrent access to " + "the data store may interfere with data consistency."); } - netconfDeviceDataBroker.setLockAllowed(rootNode.getDataAfter().isDatastoreLockAllowed()); - netconfDataTreeService.setLockAllowed(rootNode.getDataAfter().isDatastoreLockAllowed()); + netconfDeviceDataBroker.setLockAllowed(rootNode.getDataAfter().getDatastoreLockAllowed()); + netconfDataTreeService.setLockAllowed(rootNode.getDataAfter().getDatastoreLockAllowed()); break; case DELETE: netconfDeviceDataBroker.setLockAllowed(true); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java index 3539685596..cfa40c7c08 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java @@ -21,6 +21,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Optional; import javax.xml.transform.dom.DOMSource; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; @@ -34,6 +35,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -66,17 +68,15 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource this.rpc = requireNonNull(rpc); } - public static ContainerNode createGetSchemaRequest(final String moduleName, final Optional revision) { - final LeafNode identifier = - Builders.leafBuilder().withNodeIdentifier(IDENTIFIER_PATHARG).withValue(moduleName).build(); + public static @NonNull ContainerNode createGetSchemaRequest(final String moduleName, + final Optional revision) { final DataContainerNodeBuilder builder = Builders.containerBuilder() - .withNodeIdentifier(GET_SCHEMA_PATHARG).withChild(identifier).withChild(FORMAT_LEAF); - + .withNodeIdentifier(GET_SCHEMA_PATHARG) + .withChild(ImmutableNodes.leafNode(IDENTIFIER_PATHARG, moduleName)) + .withChild(FORMAT_LEAF); if (revision.isPresent()) { - builder.withChild(Builders.leafBuilder() - .withNodeIdentifier(VERSION_PATHARG).withValue(revision.get()).build()); + builder.withChild(ImmutableNodes.leafNode(VERSION_PATHARG, revision.get())); } - return builder.build(); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java index 3b478b4f68..53a725c252 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java @@ -43,6 +43,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import java.util.Locale; import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.netconf.api.ModifyAction; @@ -327,7 +328,7 @@ public final class NetconfBaseOps { return editBuilder.build(); } - public static ContainerNode getSourceNode(final QName datastore) { + public static @NonNull ContainerNode getSourceNode(final QName datastore) { return Builders.containerBuilder() .withNodeIdentifier(NETCONF_SOURCE_NODEID) .withChild(Builders.choiceBuilder() @@ -337,29 +338,29 @@ public final class NetconfBaseOps { .build(); } - public static ContainerNode getLockContent(final QName datastore) { + public static @NonNull ContainerNode getLockContent(final QName datastore) { return Builders.containerBuilder().withNodeIdentifier(NETCONF_LOCK_NODEID) .withChild(getTargetNode(datastore)).build(); } - public static ContainerNode getTargetNode(final QName datastore) { + public static @NonNull ContainerNode getTargetNode(final QName datastore) { return Builders.containerBuilder().withNodeIdentifier(NETCONF_TARGET_NODEID) .withChild(Builders.choiceBuilder().withNodeIdentifier(CONFIG_TARGET_NODEID).withChild( Builders.leafBuilder().withNodeIdentifier(toId(datastore)).withValue(Empty.getInstance()).build()) .build()).build(); } - public static ContainerNode getCopyConfigContent(final QName source, final QName target) { + public static @NonNull ContainerNode getCopyConfigContent(final QName source, final QName target) { return Builders.containerBuilder().withNodeIdentifier(NETCONF_COPY_CONFIG_NODEID) .withChild(getTargetNode(target)).withChild(getSourceNode(source)).build(); } - public static ContainerNode getValidateContent(final QName source) { + public static @NonNull ContainerNode getValidateContent(final QName source) { return Builders.containerBuilder().withNodeIdentifier(NETCONF_VALIDATE_NODEID) .withChild(getSourceNode(source)).build(); } - public static ContainerNode getUnLockContent(final QName datastore) { + public static @NonNull ContainerNode getUnLockContent(final QName datastore) { return Builders.containerBuilder().withNodeIdentifier(NETCONF_UNLOCK_NODEID) .withChild(getTargetNode(datastore)).build(); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java index 7d47c3c056..2f48d5403d 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -31,6 +31,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.FailedNetconfMessage; @@ -91,7 +92,7 @@ public final class NetconfMessageTransformUtil { public static final String MESSAGE_ID_PREFIX = "m"; public static final String MESSAGE_ID_ATTR = "message-id"; - public static final QName CREATE_SUBSCRIPTION_RPC_QNAME = + public static final @NonNull QName CREATE_SUBSCRIPTION_RPC_QNAME = QName.create(CreateSubscriptionInput.QNAME, "create-subscription").intern(); private static final String SUBTREE = "subtree"; @@ -103,72 +104,79 @@ public final class NetconfMessageTransformUtil { } - public static final QName IETF_NETCONF_MONITORING = + public static final @NonNull QName IETF_NETCONF_MONITORING = QName.create(NetconfState.QNAME, "ietf-netconf-monitoring").intern(); - public static final QName GET_DATA_QNAME = QName.create(IETF_NETCONF_MONITORING, "data").intern(); - public static final QName GET_SCHEMA_QNAME = QName.create(IETF_NETCONF_MONITORING, "get-schema").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_FORMAT = + public static final @NonNull QName GET_DATA_QNAME = QName.create(IETF_NETCONF_MONITORING, "data").intern(); + public static final @NonNull QName GET_SCHEMA_QNAME = QName.create(IETF_NETCONF_MONITORING, "get-schema").intern(); + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_FORMAT = QName.create(IETF_NETCONF_MONITORING, "format").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_LOCATION = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_LOCATION = QName.create(IETF_NETCONF_MONITORING, "location").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_IDENTIFIER = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_IDENTIFIER = QName.create(IETF_NETCONF_MONITORING, "identifier").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_VERSION = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_VERSION = QName.create(IETF_NETCONF_MONITORING, "version").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_NAMESPACE = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_NAMESPACE = QName.create(IETF_NETCONF_MONITORING, "namespace").intern(); - public static final QName IETF_NETCONF_NOTIFICATIONS = + public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS = QName.create(NetconfCapabilityChange.QNAME, "ietf-netconf-notifications").intern(); public static final URI NETCONF_URI = NETCONF_QNAME.getNamespace(); - public static final NodeIdentifier NETCONF_DATA_NODEID = NodeIdentifier.create(NETCONF_DATA_QNAME); - - public static final QName NETCONF_RPC_REPLY_QNAME = QName.create(NETCONF_QNAME, "rpc-reply").intern(); - public static final NodeIdentifier NETCONF_RPC_REPLY_NODEID = NodeIdentifier.create(NETCONF_RPC_REPLY_QNAME); - - public static final QName NETCONF_OK_QNAME = QName.create(NETCONF_QNAME, "ok").intern(); - public static final QName NETCONF_ERROR_OPTION_QNAME = QName.create(NETCONF_QNAME, "error-option").intern(); - public static final NodeIdentifier NETCONF_ERROR_OPTION_NODEID = NodeIdentifier.create(NETCONF_ERROR_OPTION_QNAME); - public static final QName NETCONF_RUNNING_QNAME = QName.create(NETCONF_QNAME, "running").intern(); - public static final QName NETCONF_SOURCE_QNAME = QName.create(NETCONF_QNAME, "source").intern(); - public static final NodeIdentifier NETCONF_SOURCE_NODEID = NodeIdentifier.create(NETCONF_SOURCE_QNAME); - public static final QName NETCONF_CANDIDATE_QNAME = QName.create(NETCONF_QNAME, "candidate").intern(); - public static final QName NETCONF_TARGET_QNAME = QName.create(NETCONF_QNAME, "target").intern(); - public static final NodeIdentifier NETCONF_TARGET_NODEID = NodeIdentifier.create(NETCONF_TARGET_QNAME); - public static final QName NETCONF_CONFIG_QNAME = QName.create(NETCONF_QNAME, "config").intern(); - public static final NodeIdentifier NETCONF_CONFIG_NODEID = NodeIdentifier.create(NETCONF_CONFIG_QNAME); - - public static final QName NETCONF_COMMIT_QNAME = QName.create(NETCONF_QNAME, "commit").intern(); - public static final SchemaPath NETCONF_COMMIT_PATH = toPath(NETCONF_COMMIT_QNAME); - public static final QName NETCONF_VALIDATE_QNAME = QName.create(NETCONF_QNAME, "validate").intern(); - public static final NodeIdentifier NETCONF_VALIDATE_NODEID = NodeIdentifier.create(NETCONF_VALIDATE_QNAME); - public static final SchemaPath NETCONF_VALIDATE_PATH = toPath(NETCONF_VALIDATE_QNAME); - public static final QName NETCONF_COPY_CONFIG_QNAME = QName.create(NETCONF_QNAME, "copy-config").intern(); - public static final NodeIdentifier NETCONF_COPY_CONFIG_NODEID = NodeIdentifier.create(NETCONF_COPY_CONFIG_QNAME); - public static final SchemaPath NETCONF_COPY_CONFIG_PATH = toPath(NETCONF_COPY_CONFIG_QNAME); - - public static final QName NETCONF_OPERATION_QNAME = QName.create(NETCONF_QNAME, "operation").intern(); - private static final QName NETCONF_OPERATION_QNAME_LEGACY = NETCONF_OPERATION_QNAME.withoutRevision().intern(); - public static final QName NETCONF_DEFAULT_OPERATION_QNAME = + public static final @NonNull NodeIdentifier NETCONF_DATA_NODEID = NodeIdentifier.create(NETCONF_DATA_QNAME); + + public static final @NonNull QName NETCONF_RPC_REPLY_QNAME = QName.create(NETCONF_QNAME, "rpc-reply").intern(); + public static final @NonNull NodeIdentifier NETCONF_RPC_REPLY_NODEID = + NodeIdentifier.create(NETCONF_RPC_REPLY_QNAME); + + public static final @NonNull QName NETCONF_OK_QNAME = QName.create(NETCONF_QNAME, "ok").intern(); + public static final @NonNull QName NETCONF_ERROR_OPTION_QNAME = + QName.create(NETCONF_QNAME, "error-option").intern(); + public static final @NonNull NodeIdentifier NETCONF_ERROR_OPTION_NODEID = + NodeIdentifier.create(NETCONF_ERROR_OPTION_QNAME); + public static final @NonNull QName NETCONF_RUNNING_QNAME = QName.create(NETCONF_QNAME, "running").intern(); + public static final @NonNull QName NETCONF_SOURCE_QNAME = QName.create(NETCONF_QNAME, "source").intern(); + public static final @NonNull NodeIdentifier NETCONF_SOURCE_NODEID = NodeIdentifier.create(NETCONF_SOURCE_QNAME); + public static final @NonNull QName NETCONF_CANDIDATE_QNAME = QName.create(NETCONF_QNAME, "candidate").intern(); + public static final @NonNull QName NETCONF_TARGET_QNAME = QName.create(NETCONF_QNAME, "target").intern(); + public static final @NonNull NodeIdentifier NETCONF_TARGET_NODEID = NodeIdentifier.create(NETCONF_TARGET_QNAME); + public static final @NonNull QName NETCONF_CONFIG_QNAME = QName.create(NETCONF_QNAME, "config").intern(); + public static final @NonNull NodeIdentifier NETCONF_CONFIG_NODEID = NodeIdentifier.create(NETCONF_CONFIG_QNAME); + + public static final @NonNull QName NETCONF_COMMIT_QNAME = QName.create(NETCONF_QNAME, "commit").intern(); + public static final @NonNull SchemaPath NETCONF_COMMIT_PATH = toPath(NETCONF_COMMIT_QNAME); + public static final @NonNull QName NETCONF_VALIDATE_QNAME = QName.create(NETCONF_QNAME, "validate").intern(); + public static final @NonNull NodeIdentifier NETCONF_VALIDATE_NODEID = NodeIdentifier.create(NETCONF_VALIDATE_QNAME); + public static final @NonNull SchemaPath NETCONF_VALIDATE_PATH = toPath(NETCONF_VALIDATE_QNAME); + public static final @NonNull QName NETCONF_COPY_CONFIG_QNAME = QName.create(NETCONF_QNAME, "copy-config").intern(); + public static final @NonNull NodeIdentifier NETCONF_COPY_CONFIG_NODEID = + NodeIdentifier.create(NETCONF_COPY_CONFIG_QNAME); + public static final @NonNull SchemaPath NETCONF_COPY_CONFIG_PATH = toPath(NETCONF_COPY_CONFIG_QNAME); + + public static final @NonNull QName NETCONF_OPERATION_QNAME = QName.create(NETCONF_QNAME, "operation").intern(); + private static final @NonNull QName NETCONF_OPERATION_QNAME_LEGACY = + NETCONF_OPERATION_QNAME.withoutRevision().intern(); + public static final @NonNull QName NETCONF_DEFAULT_OPERATION_QNAME = QName.create(NETCONF_OPERATION_QNAME, "default-operation").intern(); - public static final NodeIdentifier NETCONF_DEFAULT_OPERATION_NODEID = + public static final @NonNull NodeIdentifier NETCONF_DEFAULT_OPERATION_NODEID = NodeIdentifier.create(NETCONF_DEFAULT_OPERATION_QNAME); - public static final QName NETCONF_EDIT_CONFIG_QNAME = QName.create(NETCONF_QNAME, "edit-config").intern(); - public static final NodeIdentifier NETCONF_EDIT_CONFIG_NODEID = NodeIdentifier.create(NETCONF_EDIT_CONFIG_QNAME); - public static final SchemaPath NETCONF_EDIT_CONFIG_PATH = toPath(NETCONF_EDIT_CONFIG_QNAME); - public static final QName NETCONF_GET_CONFIG_QNAME = QName.create(NETCONF_QNAME, "get-config"); - public static final NodeIdentifier NETCONF_GET_CONFIG_NODEID = NodeIdentifier.create(NETCONF_GET_CONFIG_QNAME); - public static final SchemaPath NETCONF_GET_CONFIG_PATH = toPath(NETCONF_GET_CONFIG_QNAME); - public static final QName NETCONF_DISCARD_CHANGES_QNAME = QName.create(NETCONF_QNAME, "discard-changes"); - public static final SchemaPath NETCONF_DISCARD_CHANGES_PATH = toPath(NETCONF_DISCARD_CHANGES_QNAME); - public static final QName NETCONF_TYPE_QNAME = QName.create(NETCONF_QNAME, "type").intern(); - public static final QName NETCONF_FILTER_QNAME = QName.create(NETCONF_QNAME, "filter").intern(); - public static final QName NETCONF_GET_QNAME = QName.create(NETCONF_QNAME, "get").intern(); - public static final NodeIdentifier NETCONF_GET_NODEID = NodeIdentifier.create(NETCONF_GET_QNAME); - public static final SchemaPath NETCONF_GET_PATH = toPath(NETCONF_GET_QNAME); - public static final QName NETCONF_RPC_QNAME = QName.create(NETCONF_QNAME, "rpc").intern(); + public static final @NonNull QName NETCONF_EDIT_CONFIG_QNAME = QName.create(NETCONF_QNAME, "edit-config").intern(); + public static final @NonNull NodeIdentifier NETCONF_EDIT_CONFIG_NODEID = + NodeIdentifier.create(NETCONF_EDIT_CONFIG_QNAME); + public static final @NonNull SchemaPath NETCONF_EDIT_CONFIG_PATH = toPath(NETCONF_EDIT_CONFIG_QNAME); + public static final @NonNull QName NETCONF_GET_CONFIG_QNAME = QName.create(NETCONF_QNAME, "get-config"); + public static final @NonNull NodeIdentifier NETCONF_GET_CONFIG_NODEID = + NodeIdentifier.create(NETCONF_GET_CONFIG_QNAME); + public static final @NonNull SchemaPath NETCONF_GET_CONFIG_PATH = toPath(NETCONF_GET_CONFIG_QNAME); + public static final @NonNull QName NETCONF_DISCARD_CHANGES_QNAME = QName.create(NETCONF_QNAME, "discard-changes"); + public static final @NonNull SchemaPath NETCONF_DISCARD_CHANGES_PATH = toPath(NETCONF_DISCARD_CHANGES_QNAME); + public static final @NonNull QName NETCONF_TYPE_QNAME = QName.create(NETCONF_QNAME, "type").intern(); + public static final @NonNull QName NETCONF_FILTER_QNAME = QName.create(NETCONF_QNAME, "filter").intern(); + public static final @NonNull QName NETCONF_GET_QNAME = QName.create(NETCONF_QNAME, "get").intern(); + public static final @NonNull NodeIdentifier NETCONF_GET_NODEID = NodeIdentifier.create(NETCONF_GET_QNAME); + public static final @NonNull SchemaPath NETCONF_GET_PATH = toPath(NETCONF_GET_QNAME); + public static final @NonNull QName NETCONF_RPC_QNAME = QName.create(NETCONF_QNAME, "rpc").intern(); public static final QName YANG_QNAME = null; public static final URI NETCONF_ACTION_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:1"); public static final String NETCONF_ACTION = "action"; @@ -186,36 +194,36 @@ public final class NetconfMessageTransformUtil { public static final URI NETCONF_RUNNING_WRITABLE_URI = URI .create("urn:ietf:params:netconf:capability:writable-running:1.0"); - public static final QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock").intern(); - public static final NodeIdentifier NETCONF_LOCK_NODEID = NodeIdentifier.create(NETCONF_LOCK_QNAME); - public static final SchemaPath NETCONF_LOCK_PATH = toPath(NETCONF_LOCK_QNAME); - public static final QName NETCONF_UNLOCK_QNAME = QName.create(NETCONF_QNAME, "unlock").intern(); - public static final NodeIdentifier NETCONF_UNLOCK_NODEID = NodeIdentifier.create(NETCONF_UNLOCK_QNAME); - public static final SchemaPath NETCONF_UNLOCK_PATH = toPath(NETCONF_UNLOCK_QNAME); + public static final @NonNull QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock").intern(); + public static final @NonNull NodeIdentifier NETCONF_LOCK_NODEID = NodeIdentifier.create(NETCONF_LOCK_QNAME); + public static final @NonNull SchemaPath NETCONF_LOCK_PATH = toPath(NETCONF_LOCK_QNAME); + public static final @NonNull QName NETCONF_UNLOCK_QNAME = QName.create(NETCONF_QNAME, "unlock").intern(); + public static final @NonNull NodeIdentifier NETCONF_UNLOCK_NODEID = NodeIdentifier.create(NETCONF_UNLOCK_QNAME); + public static final @NonNull SchemaPath NETCONF_UNLOCK_PATH = toPath(NETCONF_UNLOCK_QNAME); - public static final NodeIdentifier EDIT_CONTENT_NODEID = NodeIdentifier.create(EditContent.QNAME); + public static final @NonNull NodeIdentifier EDIT_CONTENT_NODEID = NodeIdentifier.create(EditContent.QNAME); // Discard changes message - public static final ContainerNode DISCARD_CHANGES_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode DISCARD_CHANGES_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(NETCONF_DISCARD_CHANGES_QNAME)).build(); // Commit changes message - public static final ContainerNode COMMIT_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode COMMIT_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(NETCONF_COMMIT_QNAME)).build(); // Get message - public static final ContainerNode GET_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode GET_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NETCONF_GET_NODEID).build(); // Create-subscription changes message - public static final ContainerNode CREATE_SUBSCRIPTION_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode CREATE_SUBSCRIPTION_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(CREATE_SUBSCRIPTION_RPC_QNAME)).build(); - public static final SchemaPath CREATE_SUBSCRIPTION_RPC_PATH = toPath(CREATE_SUBSCRIPTION_RPC_QNAME); + public static final @NonNull SchemaPath CREATE_SUBSCRIPTION_RPC_PATH = toPath(CREATE_SUBSCRIPTION_RPC_QNAME); - public static final NodeIdentifier NETCONF_FILTER_NODEID = NodeIdentifier.create(NETCONF_FILTER_QNAME); + public static final @NonNull NodeIdentifier NETCONF_FILTER_NODEID = NodeIdentifier.create(NETCONF_FILTER_QNAME); - public static final DataContainerChild EMPTY_FILTER; + public static final @NonNull DataContainerChild EMPTY_FILTER; static { final Element element = XmlUtil.createElement(BLANK_DOCUMENT, NETCONF_FILTER_QNAME.getLocalName(), @@ -328,20 +336,20 @@ public final class NetconfMessageTransformUtil { || NETCONF_GET_QNAME.getLocalName().equals(rpc.getLocalName())); } - public static ContainerSchemaNode createSchemaForDataRead(final SchemaContext schemaContext) { + public static @NonNull ContainerSchemaNode createSchemaForDataRead(final SchemaContext schemaContext) { return new NodeContainerProxy(NETCONF_DATA_QNAME, schemaContext.getChildNodes()); } - public static ContainerSchemaNode createSchemaForNotification(final NotificationDefinition next) { + public static @NonNull ContainerSchemaNode createSchemaForNotification(final NotificationDefinition next) { return new NodeContainerProxy(next.getQName(), next.getChildNodes(), next.getAvailableAugmentations()); } @Deprecated - public static ContainerNode wrap(final QName name, final DataContainerChild... node) { + public static @NonNull ContainerNode wrap(final QName name, final DataContainerChild... node) { return wrap(toId(name), node); } - public static ContainerNode wrap(final NodeIdentifier name, final DataContainerChild... node) { + public static @NonNull ContainerNode wrap(final NodeIdentifier name, final DataContainerChild... node) { return Builders.containerBuilder().withNodeIdentifier(name).withValue(ImmutableList.copyOf(node)).build(); } @@ -408,7 +416,7 @@ public final class NetconfMessageTransformUtil { .withChild(createEditConfigAnyxml(ctx, dataPath, operation, lastChildOverride)).build(); } - public static SchemaPath toPath(final QName rpc) { + public static @NonNull SchemaPath toPath(final QName rpc) { return SchemaPath.ROOT.createChild(rpc); } @@ -495,7 +503,7 @@ public final class NetconfMessageTransformUtil { final Element actualElement = document.createElementNS(actualNS.getNamespace().toString(), actualNS.getLocalName()); if (next instanceof NodeWithValue) { - actualElement.setNodeValue(((NodeWithValue) next).getValue().toString()); + actualElement.setNodeValue(((NodeWithValue) next).getValue().toString()); } else if (next instanceof NodeIdentifierWithPredicates) { for (Entry entry : ((NodeIdentifierWithPredicates) next).entrySet()) { final Element entryElement = document.createElementNS(entry.getKey().getNamespace().toString(), diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java index a45549a20a..8c9c0e7d1d 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java @@ -392,16 +392,19 @@ public class NetconfDeviceCommunicatorTest { new TimedReconnectStrategy(GlobalEventExecutor.INSTANCE, 10000, 0, 1.0, null, 100L, null); final ReconnectStrategy reconnectStrategy = spy(new ReconnectStrategy() { @Override + @Deprecated public int getConnectTimeout() throws Exception { return timedReconnectStrategy.getConnectTimeout(); } @Override + @Deprecated public Future scheduleReconnect(final Throwable cause) { return timedReconnectStrategy.scheduleReconnect(cause); } @Override + @Deprecated public void reconnectSuccessful() { timedReconnectStrategy.reconnectSuccessful(); } diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java index 598bfa6c64..0e28ebb9e2 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java @@ -19,6 +19,7 @@ import com.google.common.util.concurrent.SettableFuture; import java.net.InetSocketAddress; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import org.eclipse.jdt.annotation.NonNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -45,7 +46,8 @@ public class KeepaliveSalFacadeResponseWaitingTest { private static final RemoteDeviceId REMOTE_DEVICE_ID = new RemoteDeviceId("test", new InetSocketAddress("localhost", 22)); - private static final ContainerNode KEEPALIVE_PAYLOAD = NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_NODEID, + private static final @NonNull ContainerNode KEEPALIVE_PAYLOAD = + NetconfMessageTransformUtil.wrap(NETCONF_GET_CONFIG_NODEID, getSourceNode(NETCONF_RUNNING_QNAME), NetconfMessageTransformUtil.EMPTY_FILTER); private KeepaliveSalFacade keepaliveSalFacade;