From a5c571df79212de5c8a1b3939d0d8d5a436a55f1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 9 Feb 2014 16:48:01 +0100 Subject: [PATCH] Remove unused DefaultNetconfOperation marker DefaultCloseSession and DefaultGetSchema do not need the netconf session. so drop their use of DefaultNetconfOperation. Change-Id: I724bd56d913b0f836c88ca8d1b436be308852a30 Signed-off-by: Robert Varga --- .../operations/DefaultCloseSession.java | 14 +---------- .../mapping/operations/DefaultGetSchema.java | 24 ++++--------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCloseSession.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCloseSession.java index cc503f60c3..1438515f04 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCloseSession.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultCloseSession.java @@ -8,10 +8,8 @@ package org.opendaylight.controller.netconf.impl.mapping.operations; -import org.opendaylight.controller.netconf.api.NetconfSession; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfOperationRouter; -import org.opendaylight.controller.netconf.mapping.api.DefaultNetconfOperation; import org.opendaylight.controller.netconf.mapping.api.HandlingPriority; import org.opendaylight.controller.netconf.util.mapping.AbstractNetconfOperation; import org.opendaylight.controller.netconf.util.xml.XmlElement; @@ -19,9 +17,8 @@ import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; -public class DefaultCloseSession extends AbstractNetconfOperation implements DefaultNetconfOperation { +public class DefaultCloseSession extends AbstractNetconfOperation { public static final String CLOSE_SESSION = "close-session"; - private NetconfSession netconfSession; public DefaultCloseSession(String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); @@ -48,13 +45,4 @@ public class DefaultCloseSession extends AbstractNetconfOperation implements Def opRouter.close(); return document.createElement(XmlNetconfConstants.OK); } - - @Override - public void setNetconfSession(NetconfSession s) { - this.netconfSession = s; - } - - public NetconfSession getNetconfSession() { - return netconfSession; - } } diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java index f34529d53f..904f3f613e 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/mapping/operations/DefaultGetSchema.java @@ -11,11 +11,9 @@ package org.opendaylight.controller.netconf.impl.mapping.operations; import java.util.HashMap; import java.util.Map; -import org.opendaylight.controller.netconf.api.NetconfSession; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfOperationRouter; import org.opendaylight.controller.netconf.impl.mapping.CapabilityProvider; -import org.opendaylight.controller.netconf.mapping.api.DefaultNetconfOperation; import org.opendaylight.controller.netconf.mapping.api.HandlingPriority; import org.opendaylight.controller.netconf.util.mapping.AbstractNetconfOperation; import org.opendaylight.controller.netconf.util.xml.XmlElement; @@ -29,22 +27,19 @@ import org.w3c.dom.Element; import com.google.common.base.Optional; import com.google.common.collect.Maps; -public final class DefaultGetSchema extends AbstractNetconfOperation implements DefaultNetconfOperation { - - private final CapabilityProvider cap; - private NetconfSession netconfSession; +public final class DefaultGetSchema extends AbstractNetconfOperation { + public static final String GET_SCHEMA = "get-schema"; + public static final String IDENTIFIER = "identifier"; + public static final String VERSION = "version"; private static final Logger logger = LoggerFactory.getLogger(DefaultGetSchema.class); + private final CapabilityProvider cap; public DefaultGetSchema(CapabilityProvider cap, String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); this.cap = cap; } - public static final String GET_SCHEMA = "get-schema"; - public static final String IDENTIFIER = "identifier"; - public static final String VERSION = "version"; - @Override protected HandlingPriority canHandle(String netconfOperationName, String namespace) { if (netconfOperationName.equals("get-schema") == false) @@ -117,15 +112,6 @@ public final class DefaultGetSchema extends AbstractNetconfOperation implements } else { version = Optional.absent(); } - } } - - public void setNetconfSession(NetconfSession s) { - this.netconfSession = s; - } - - public NetconfSession getNetconfSession() { - return netconfSession; - } } -- 2.36.6