X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FOpendaylightNamespaceHandler.java;h=371b7efecdec1fa6e67f700acce75e10aa4beebd;hb=HEAD;hp=962f5c047bc6ef9ef6db83fd65f0dc79abe96864;hpb=82284ce97ea00c26af1cad479211ce1fed68a533;p=controller.git diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java index 962f5c047b..371b7efecd 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java @@ -11,7 +11,6 @@ import com.google.common.base.Strings; import java.io.IOException; import java.io.StringReader; import java.net.URL; -import java.util.Collections; import java.util.Set; import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.NamespaceHandler; @@ -48,17 +47,11 @@ import org.xml.sax.SAXException; * @author Thomas Pantelis */ public final class OpendaylightNamespaceHandler implements NamespaceHandler { - public static final String NAMESPACE_2_0_0 = "http://opendaylight.org/xmlns/blueprint/v2.0.0"; - static final String ROUTED_RPC_REG_CONVERTER_NAME = "org.opendaylight.blueprint.RoutedRpcRegConverter"; - static final String DOM_RPC_PROVIDER_SERVICE_NAME = "org.opendaylight.blueprint.DOMRpcProviderService"; - static final String RPC_REGISTRY_NAME = "org.opendaylight.blueprint.RpcRegistry"; - static final String BINDING_RPC_PROVIDER_SERVICE_NAME = "org.opendaylight.blueprint.RpcProviderService"; - static final String SCHEMA_SERVICE_NAME = "org.opendaylight.blueprint.SchemaService"; - static final String NOTIFICATION_SERVICE_NAME = "org.opendaylight.blueprint.NotificationService"; - static final String TYPE_ATTR = "type"; - static final String UPDATE_STRATEGY_ATTR = "update-strategy"; + public static final String NAMESPACE_1_0_0 = "http://opendaylight.org/xmlns/blueprint/v1.0.0"; private static final Logger LOG = LoggerFactory.getLogger(OpendaylightNamespaceHandler.class); + private static final String TYPE_ATTR = "type"; + private static final String UPDATE_STRATEGY_ATTR = "update-strategy"; private static final String COMPONENT_PROCESSOR_NAME = ComponentProcessor.class.getName(); private static final String RESTART_DEPENDENTS_ON_UPDATES = "restart-dependents-on-updates"; private static final String USE_DEFAULT_FOR_REFERENCE_TYPES = "use-default-for-reference-types"; @@ -68,13 +61,13 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { @SuppressWarnings("rawtypes") @Override public Set getManagedClasses() { - return Collections.emptySet(); + return Set.of(); } @Override public URL getSchemaLocation(final String namespace) { - if (NAMESPACE_2_0_0.equals(namespace)) { - URL url = getClass().getResource("/opendaylight-blueprint-ext-2.0.0.xsd"); + if (NAMESPACE_1_0_0.equals(namespace)) { + URL url = getClass().getResource("/opendaylight-blueprint-ext-1.0.0.xsd"); LOG.debug("getSchemaLocation for {} returning URL {}", namespace, url); return url; }