X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Frest%2Fimpl%2FStringModuleInstanceIdentifierCodec.java;h=77489dec72694c138b0ed0b7e3e6531aee3f103e;hb=aa0006992ccc87f68e9810c0dee6c16cf339f544;hp=a265ea95a212b40c6dc4bcd5698fb2de57e5c372;hpb=c09b7ffd0f3812a237c82805ea16a67ffdeda89d;p=netconf.git diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java index a265ea95a2..77489dec72 100644 --- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java +++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/StringModuleInstanceIdentifierCodec.java @@ -12,6 +12,7 @@ import com.google.common.base.Preconditions; import java.net.URI; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.opendaylight.restconf.utils.patch.Draft16StringModuleInstanceIdentifierCodec; import org.opendaylight.yangtools.yang.data.util.AbstractModuleStringInstanceIdentifierCodec; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.Module; @@ -19,29 +20,29 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * @deprecated This class will be replaced by - * {@link org.opendaylight.restconf.utils.patch.Draft11StringModuleInstanceIdentifierCodec} + * {@link Draft16StringModuleInstanceIdentifierCodec} */ @Deprecated -final class StringModuleInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec { +public final class StringModuleInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec { private final DataSchemaContextTree dataContextTree; private final SchemaContext context; private final String defaultPrefix; - StringModuleInstanceIdentifierCodec(SchemaContext context) { + public StringModuleInstanceIdentifierCodec(final SchemaContext context) { this.context = Preconditions.checkNotNull(context); this.dataContextTree = DataSchemaContextTree.from(context); this.defaultPrefix = ""; } - StringModuleInstanceIdentifierCodec(SchemaContext context, @Nonnull String defaultPrefix) { + StringModuleInstanceIdentifierCodec(final SchemaContext context, @Nonnull final String defaultPrefix) { this.context = Preconditions.checkNotNull(context); this.dataContextTree = DataSchemaContextTree.from(context); this.defaultPrefix = defaultPrefix; } @Override - protected Module moduleForPrefix(@Nonnull String prefix) { + protected Module moduleForPrefix(@Nonnull final String prefix) { if (prefix.isEmpty() && !this.defaultPrefix.isEmpty()) { return this.context.findModuleByName(this.defaultPrefix, null); } else { @@ -57,7 +58,7 @@ final class StringModuleInstanceIdentifierCodec extends AbstractModuleStringInst @Nullable @Override - protected String prefixForNamespace(@Nonnull URI namespace) { + protected String prefixForNamespace(@Nonnull final URI namespace) { final Module module = this.context.findModuleByNamespaceAndRevision(namespace, null); return module == null ? null : module.getName(); }