Move appendPrefix()

The decision to append a prefix is a policy decision, hence it should
live in NamingStrategy. StatementNamespace only provides the knobs.

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

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CamelCaseWithNamespaceNamingStrategy.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CamelCaseWithNamespaceNamingStrategy.java
index 5a60fe4582279c3b8cbad32b7edf42f7ef9b27fa..e9bcabdc29d64422c13b59b5d4c47716550bfcb1 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CamelCaseWithNamespaceNamingStrategy.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CamelCaseWithNamespaceNamingStrategy.java
@@ -20,7 +20,10 @@ final class CamelCaseWithNamespaceNamingStrategy extends ClassNamingStrategy {
 
     @Override
     String simpleClassName() {
-        return delegate.namespace().appendSuffix(delegate.simpleClassName());
+        final var delegateName = delegate.simpleClassName();
+        final var suffix = delegate.namespace().suffix();
+
+        return suffix.isEmpty() ? delegateName : delegateName + suffix;
     }
 
     @Override

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/StatementNamespace.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/StatementNamespace.java
index 12dcdaceb5ddf8e7ef59e4fa8f74b1ebf9296260..c9e8f1fc7671b21a7b832f15c619dada539e1ebd 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/StatementNamespace.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/StatementNamespace.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl.reactor;
 
-import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.jdt.annotation.NonNull;
@@ -54,7 +53,7 @@ enum StatementNamespace {
         this.suffix = requireNonNull(suffix);
     }
 
-    @NonNull String appendSuffix(final String str) {
-        return suffix.isEmpty() ? verifyNotNull(str) : str + suffix;
+    @NonNull String suffix() {
+        return suffix;
     }
 }