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 <rovarga@cisco.com>

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 cc503f60c3938947b8acb29882a9cd161bafda5c..1438515f040e41c547a8742010aec37b6ab2471b 100644 (file)
--- 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;
 
 
 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.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;
 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;
 
 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";
     public static final String CLOSE_SESSION = "close-session";

-    private NetconfSession netconfSession;

 
     public DefaultCloseSession(String netconfSessionIdForReporting) {
         super(netconfSessionIdForReporting);
 
     public DefaultCloseSession(String netconfSessionIdForReporting) {
         super(netconfSessionIdForReporting);


@@ -48,13 +45,4 @@ public class DefaultCloseSession extends AbstractNetconfOperation implements Def
         opRouter.close();
         return document.createElement(XmlNetconfConstants.OK);
     }
         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 f34529d53fe0549c7ce5ad6ce6b995386c00ab64..904f3f613e43549134eafcf7fc733591f32f4a2f 100644 (file)
--- 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 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.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;
 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;
 
 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 static final Logger logger = LoggerFactory.getLogger(DefaultGetSchema.class);

+    private final CapabilityProvider cap;

 
     public DefaultGetSchema(CapabilityProvider cap, String netconfSessionIdForReporting) {
         super(netconfSessionIdForReporting);
         this.cap = 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)
     @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();
             }
             } else {
                 version = Optional.absent();
             }

-

         }
     }
         }
     }

-
-    public void setNetconfSession(NetconfSession s) {
-        this.netconfSession = s;
-    }
-
-    public NetconfSession getNetconfSession() {
-        return netconfSession;
-    }

 }
 }