X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FOpendaylightNamespaceHandler.java;fp=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FOpendaylightNamespaceHandler.java;h=c8056faca81d11f930cee1f3d9e18895a1df7f58;hp=af26acae0a16e1d7fd1a40d67181b8f2f682a51b;hb=38a901672a5bc7c5658a7627f8f5aa14dfedd80d;hpb=16997ff04c96e198f570d69c4bdcef6659f80b92 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 af26acae0a..c8056faca8 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 @@ -98,26 +98,37 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { LOG.debug("In parse for {}", element); if (nodeNameEquals(element, RpcImplementationBean.RPC_IMPLEMENTATION)) { + warnDeprecatedElement(RpcImplementationBean.RPC_IMPLEMENTATION); return parseRpcImplementation(element, context); } else if (nodeNameEquals(element, RPC_SERVICE)) { + warnDeprecatedElement(RPC_SERVICE); return parseRpcService(element, context); } else if (nodeNameEquals(element, NotificationListenerBean.NOTIFICATION_LISTENER)) { + warnDeprecatedElement(NotificationListenerBean.NOTIFICATION_LISTENER); return parseNotificationListener(element, context); } else if (nodeNameEquals(element, CLUSTERED_APP_CONFIG)) { return parseClusteredAppConfig(element, context); } else if (nodeNameEquals(element, SPECIFIC_SERVICE_REF_LIST)) { + warnDeprecatedElement(SPECIFIC_SERVICE_REF_LIST); return parseSpecificReferenceList(element, context); } else if (nodeNameEquals(element, STATIC_REFERENCE)) { + warnDeprecatedElement(SPECIFIC_SERVICE_REF_LIST); return parseStaticReference(element, context); } else if (nodeNameEquals(element, ACTION_SERVICE)) { + warnDeprecatedElement(ACTION_SERVICE); return parseActionService(element, context); } else if (nodeNameEquals(element, ActionProviderBean.ACTION_PROVIDER)) { + warnDeprecatedElement(ActionProviderBean.ACTION_PROVIDER); return parseActionProvider(element, context); } throw new ComponentDefinitionException("Unsupported standalone element: " + element.getNodeName()); } + private static void warnDeprecatedElement(final String element) { + LOG.warn("Encountered element {}, support for this element will be removed in the next major release", element); + } + @Override public ComponentMetadata decorate(final Node node, final ComponentMetadata component, final ParserContext context) { if (node instanceof Attr) { @@ -144,12 +155,10 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler { private static ComponentMetadata decorateServiceType(final Attr attr, final ComponentMetadata component, final ParserContext context) { - if (!(component instanceof MutableServiceMetadata)) { + if (!(component instanceof MutableServiceMetadata service)) { throw new ComponentDefinitionException("Expected an instanceof MutableServiceMetadata"); } - MutableServiceMetadata service = (MutableServiceMetadata)component; - LOG.debug("decorateServiceType for {} - adding type property {}", service.getId(), attr.getValue()); service.addServiceProperty(createValue(context, TYPE_ATTR), createValue(context, attr.getValue()));