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>
(cherry picked from commit ad5765cde7649fcb2a29f503e4e6b4613f96afb7)

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 30989d2c2ce9c9c903191107deb7bb890c0c5c8a..b7d17773f905a5275bb1111bce4fbd93d7153be4 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
@@ -484,7 +484,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);
@@ -587,7 +587,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);
@@ -651,7 +651,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 3d092c7b6e07860226f47f64c8114b6f00c8ac04..2833fc1275fa8bf909fcd19afcc5580e5b5809a9 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
@@ -1384,7 +1384,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 {
@@ -1674,7 +1674,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,