Centralize Data/Listener/Service suffixes

We have a central place for these strings in BindingMapping,
make sure we do not duplicate their definition.

Change-Id: I2c7e74830668cf9e3e0fd92ecadef0d3cc2a58d1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
index 24ac16201a9090e63462423d6bb687ee9a016c48..c9ae200ade344a6980dbd0bb1cd9225839ca622e 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypeGenerator.java
@@ -483,7 +483,7 @@ abstract class AbstractTypeGenerator {
      *             if module is null
      */
     private GeneratedTypeBuilder moduleToDataType(final ModuleContext context) {
-        final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder(context, "Data");
+        final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder(context, BindingMapping.DATA_ROOT_SUFFIX);
         final Module module = context.module();
         addImplementedInterfaceFromUses(module, moduleDataTypeBuilder);
         moduleDataTypeBuilder.addImplementsType(DATA_ROOT);
@@ -586,7 +586,7 @@ abstract class AbstractTypeGenerator {
             return;
         }
 
-        final GeneratedTypeBuilder interfaceBuilder = moduleTypeBuilder(context, "Service");
+        final GeneratedTypeBuilder interfaceBuilder = moduleTypeBuilder(context, BindingMapping.RPC_SERVICE_SUFFIX);
         interfaceBuilder.addImplementsType(RPC_SERVICE);
 
         addCodegenInformation(interfaceBuilder, module, "RPCs", rpcDefinitions);
@@ -650,7 +650,8 @@ abstract class AbstractTypeGenerator {
             return;
         }
 
-        final GeneratedTypeBuilder listenerInterface = moduleTypeBuilder(context, "Listener");
+        final GeneratedTypeBuilder listenerInterface = moduleTypeBuilder(context,
+            BindingMapping.NOTIFICATION_LISTENER_SUFFIX);
         listenerInterface.addImplementsType(NOTIFICATION_LISTENER);
 
         for (final NotificationDefinition notification : notifications) {

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
index 172365630ba72594a5ec8f85e75c070353c406e2..ae66252e6930d4bd3a6a04befc12ebcfe9a9f75d 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
@@ -1383,7 +1383,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
             final Iterator<QName> path = node.getPath().getPathFromRoot().iterator();
             path.next();
             if (!path.hasNext()) {
-                parentName = BindingMapping.getClassName(parent.getName()) + "Data";
+                parentName = BindingMapping.getClassName(parent.getName()) + BindingMapping.DATA_ROOT_SUFFIX;
                 final String basePackageName = BindingMapping.getRootPackageName(parent.getQNameModule());
                 className = basePackageName + "." + parentName + "." + BindingMapping.getClassName(node.getQName());
             } else {
@@ -1673,7 +1673,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
             final Module parent = schemaContext.findModule(first.getModule()).orElse(null);
             final String basePackageName = BindingMapping.getRootPackageName(parent.getQNameModule());
             if (!path.hasNext()) {
-                parentName = BindingMapping.getClassName(parent.getName()) + "Data";
+                parentName = BindingMapping.getClassName(parent.getName()) + BindingMapping.DATA_ROOT_SUFFIX;
                 className = basePackageName + "." + parentName + "." + BindingMapping.getClassName(node.getQName());
             } else {
                 final String packageName = BindingGeneratorUtil.packageNameForGeneratedType(basePackageName,