X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fgenerator%2Fimpl%2Freactor%2FCollisionDomain.java;h=ea6453e76ac546d4e4f1b46439474f5cb5c56f9e;hb=refs%2Fchanges%2F45%2F98245%2F100;hp=9cd5aac5327374fc8c5c3e08986af13d4dc1e716;hpb=60039d4d027e172f6e1d644fb1c2fa60688c06c0;p=mdsal.git

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java
index 9cd5aac532..ea6453e76a 100644
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CollisionDomain.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
 import org.opendaylight.yangtools.yang.common.AbstractQName;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
@@ -139,7 +140,7 @@ final class CollisionDomain {
 
         Secondary(final Generator gen, final Member primary, final String classSuffix) {
             super(gen);
-            this.classPrimary = requireNonNull(primary);
+            classPrimary = requireNonNull(primary);
             this.classSuffix = requireNonNull(classSuffix);
             primary.addSecondary(this);
         }
@@ -217,12 +218,12 @@ final class CollisionDomain {
         }
     }
 
-    private final AbstractCompositeGenerator<?> gen;
+    private final AbstractCompositeGenerator<?, ?> gen;
 
     private List<Member> members = List.of();
     private boolean solved;
 
-    CollisionDomain(final AbstractCompositeGenerator<?> gen) {
+    CollisionDomain(final AbstractCompositeGenerator<?, ?> gen) {
         this.gen = requireNonNull(gen);
     }
 
@@ -239,9 +240,14 @@ final class CollisionDomain {
         return addMember(new LeafSecondary(memberGen, primary, classSuffix));
     }
 
-    @NonNull Member addSecondary(final RpcContainerGenerator memberGen, final Member primary, final String classSuffix,
-            final AbstractQName packageSuffix) {
-        return addMember(new SuffixSecondary(memberGen, primary, classSuffix, packageSuffix));
+    @NonNull Member addSecondary(final RpcInputGenerator memberGen, final Member primary) {
+        return addMember(new SuffixSecondary(memberGen, primary, BindingMapping.RPC_INPUT_SUFFIX,
+            memberGen.statement().argument()));
+    }
+
+    @NonNull Member addSecondary(final RpcOutputGenerator memberGen, final Member primary) {
+        return addMember(new SuffixSecondary(memberGen, primary, BindingMapping.RPC_OUTPUT_SUFFIX,
+            memberGen.statement().argument()));
     }
 
     @NonNull Member addSecondary(final AbstractAugmentGenerator memberGen, final Member classPrimary,