Roll master to snapshot version for New Delhi release

[sdnc/northbound.git] / generic-resource-api / provider / src / test / java / org / onap / sdnc / northbound / util / MDSALUtil.java

diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java
index d959b9f..5db09f9 100644 (file)
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java
@@ -36,6 +36,22 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.re
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationOutputBuilder;
+
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationOutputBuilder;
+
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationOutputBuilder;
+
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationOutputBuilder;
+
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationOutputBuilder;
+
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationOutputBuilder;
+
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationInputBuilder;
@@ -76,7 +92,6 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.re
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.pnf.details.PnfDetailsBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.pnf.response.information.PnfResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.pnf.topology.identifier.structure.PnfTopologyIdentifierStructureBuilder;
-import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 
@@ -111,6 +126,26 @@ public class MDSALUtil {
         return new PreloadVfModuleTopologyOperationInputBuilder();
     }
 
+    public static GenericConfigurationTopologyOperationInputBuilder GenericConfigurationTopologyOperationInput() {
+        return new GenericConfigurationTopologyOperationInputBuilder();
+    }
+
+    public static GenericConfigurationNotificationInputBuilder GenericConfigurationNotificationInput() {
+        return new GenericConfigurationNotificationInputBuilder();
+    }
+
+    public static GetpathsegmentTopologyOperationInputBuilder GetpathsegmentTopologyOperationInput() {
+        return new GetpathsegmentTopologyOperationInputBuilder();
+    }
+
+    public static PolicyUpdateNotifyOperationInputBuilder PolicyUpdateNotifyOperationInput() {
+        return new PolicyUpdateNotifyOperationInputBuilder();
+    }
+
+    public static PortMirrorTopologyOperationInputBuilder PortMirrorTopologyOperationInput() {
+        return new PortMirrorTopologyOperationInputBuilder();
+    }
+
     public static PreloadVfModuleTopologyOperationOutputBuilder preloadVfModuleTopologyOperationOutput() {
         return new PreloadVfModuleTopologyOperationOutputBuilder();
     }
@@ -317,28 +352,6 @@ public class MDSALUtil {
         return new ServiceLevelOperStatusBuilder();
     }
 
-    public static <P> P build(Builder<P> b) {
-        return b == null ? null : b.build();
-    }
-
-    public static <P, B extends Builder<P>> P build(Function<P, B> builderConstructor, P sourceDataObject) {
-        if (sourceDataObject == null) {
-            return null;
-        }
-        B bp = builderConstructor.apply(sourceDataObject);
-        return bp.build();
-    }
-
-    public static <P, B extends Builder<P>> P build(Function<P, B> builderConstructor, P sourceDataObject,
-        Consumer<B> builder) {
-        if (sourceDataObject == null) {
-            return null;
-        }
-        B bp = builderConstructor.apply(sourceDataObject);
-        builder.accept(bp);
-        return bp.build();
-    }
-
     public static <I, O> O exec(Function<I, Future<RpcResult<O>>> rpc, I rpcParameter,
         Function<RpcResult<O>, O> rpcResult) throws Exception {
         Future<RpcResult<O>> future = rpc.apply(rpcParameter);