Merge "Bug 2932: NPE on bundle activation"

[controller.git] / opendaylight / netconf / netconf-testtool / src / main / java / org / opendaylight / controller / netconf / test / tool / FakeModuleBuilderCapability.java

diff --git a/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/FakeModuleBuilderCapability.java b/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/FakeModuleBuilderCapability.java
index 5f8107ccb19e1bc1c490d34b04a71911eac007f2..b397bcb4c488aaf731285f6136d17b8feb9a241a 100644 (file)
--- a/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/FakeModuleBuilderCapability.java
+++ b/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/FakeModuleBuilderCapability.java
@@ -9,53 +9,16 @@
 package org.opendaylight.controller.netconf.test.tool;
 
 import com.google.common.base.Optional;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import org.opendaylight.controller.netconf.api.Capability;
-import org.opendaylight.controller.netconf.confignetconfconnector.util.Util;
-import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
 
 /**
  * Can be passed instead of ModuleBuilderCapability when building capabilities
  * in NetconfDeviceSimulator when testing various schema resolution related exceptions.
  */
-public class FakeModuleBuilderCapability implements Capability{
-    private static final Date NO_REVISION = new Date(0);
-    private static final List<String> NETCONF = Collections.singletonList("NETCONF");
-    private final ModuleBuilder input;
-    private final Optional<String> content;
+public class FakeModuleBuilderCapability extends ModuleBuilderCapability {
 
     public FakeModuleBuilderCapability(final ModuleBuilder input, final String inputStream) {
-        this.input = input;
-        this.content = Optional.of(inputStream);
-    }
-
-    @Override
-    public String getCapabilityUri() {
-        // FIXME capabilities in Netconf-impl need to check for NO REVISION
-        final String withoutRevision = getModuleNamespace().get() + "?module=" + getModuleName().get();
-        return hasRevision() ? withoutRevision + "&revision=" + Util.writeDate(input.getRevision()) : withoutRevision;
-    }
-
-    @Override
-    public Optional<String> getModuleNamespace() {
-        return Optional.of(input.getNamespace().toString());
-    }
-
-    @Override
-    public Optional<String> getModuleName() {
-        return Optional.of(input.getName());
-    }
-
-    @Override
-    public Optional<String> getRevision() {
-        return Optional.of(hasRevision() ? QName.formattedRevision(input.getRevision()) : "");
-    }
-
-    private boolean hasRevision() {
-        return !input.getRevision().equals(NO_REVISION);
+        super(input, inputStream);
     }
 
     /**
@@ -66,10 +29,4 @@ public class FakeModuleBuilderCapability implements Capability{
     public Optional<String> getCapabilitySchema() {
         return Optional.absent();
     }
-
-    @Override
-    public List<String> getLocation() {
-        return NETCONF;
-    }
-
 }