Rework BindingRuntimeTypes
[mdsal.git] / binding / mdsal-binding-generator / src / main / java / org / opendaylight / mdsal / binding / generator / impl / reactor / RpcInputGenerator.java
@@ -7,26 +7,16 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl.reactor;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.generator.impl.reactor.CollisionDomain.Member;
-import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
 import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement;
 
 /**
  * Specialization for legacy RPC services.
  */
-final class RpcContainerGenerator extends OperationContainerGenerator {
-    private final @NonNull String suffix;
-
-    RpcContainerGenerator(final InputEffectiveStatement statement, final AbstractCompositeGenerator<?> parent) {
-        super(statement, parent);
-        suffix = BindingMapping.RPC_INPUT_SUFFIX;
-    }
-
-    RpcContainerGenerator(final OutputEffectiveStatement statement, final AbstractCompositeGenerator<?> parent) {
+// FIXME: hide this once we have RpcRuntimeType
+public final class RpcInputGenerator extends InputGenerator {
+    RpcInputGenerator(final InputEffectiveStatement statement, final AbstractCompositeGenerator<?, ?> parent) {
         super(statement, parent);
-        suffix = BindingMapping.RPC_OUTPUT_SUFFIX;
     }
 
     @Override
@@ -35,12 +25,12 @@ final class RpcContainerGenerator extends OperationContainerGenerator {
     }
 
     @Override
-    AbstractCompositeGenerator<?> getPackageParent() {
+    AbstractCompositeGenerator<?, ?> getPackageParent() {
         return getParent().getParent();
     }
 
     @Override
     Member createMember(final CollisionDomain domain) {
-        return domain.addSecondary(this, getParent().ensureMember(), suffix, statement().argument());
+        return domain.addSecondary(this, getParent().ensureMember());
     }
 }