migrate sdnr features to sulfur

fix sdnr code for sulfur

Issue-ID: CCSDK-3692
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I0a62ade424bb978222e7ce6450215fb327f957b7
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

2 files changed, 55 insertions, 47 deletions

diff --git a/sdnr/wt/common-yang/openroadm-pm-types/pom.xml b/sdnr/wt/common-yang/openroadm-pm-types/pom.xml
index a20e65fcf..fc8d6756f 100755
--- a/sdnr/wt/common-yang/openroadm-pm-types/pom.xml
+++ b/sdnr/wt/common-yang/openroadm-pm-types/pom.xml
@@ -22,13 +22,14 @@
   ~ ============LICENSE_END=======================================================
   ~
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/sdnr/wt/common-yang/openroadm-pm-types/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java b/sdnr/wt/common-yang/openroadm-pm-types/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
index f89197b82..52ae92c88 100644
--- a/sdnr/wt/common-yang/openroadm-pm-types/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
+++ b/sdnr/wt/common-yang/openroadm-pm-types/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
@@ -1,58 +1,65 @@
 package org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129;
-
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import java.lang.String;
+import java.lang.UnsupportedOperationException;
 import java.math.BigDecimal;
+
+import javax.annotation.processing.Generated;
+
+import org.opendaylight.yangtools.yang.common.Decimal64;
 import org.opendaylight.yangtools.yang.common.Uint64;
 
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+
 /**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string
- * representation. In some cases it is very difficult to automate it since there can be unions such as (uint32 -
- * uint16), or (string - uint32).
+ * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
+ * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
  *
- * The reason behind putting it under src/main/java is: This class is generated in form of a stub and needs to be
- * finished by the user. This class is generated only once to prevent loss of user code.
+ * The reason behind putting it under src/main/java is:
+ * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
+ * loss of user code.
  *
  */
+@Generated("mdsal-binding-generator")
 @JsonPOJOBuilder(buildMethodName = "build", withPrefix = "set")
 public class PmDataTypeBuilder {
-    private Uint64 _uint64;
-    private Long _int64;
-    private BigDecimal _decimal64;
-
-    public PmDataTypeBuilder() {}
-
-    //Aluminium uses constructor
-    public PmDataTypeBuilder(String v) {
-        this.setUint64(v);
-    }
-
-    public PmDataTypeBuilder setUint64(String v) {
-        _uint64 = Uint64.valueOf(v);
-        return this;
-    }
-
-    public PmDataTypeBuilder setInt64(String v) {
-        _int64 = Long.valueOf(v);
-        return this;
-    }
-
-    public PmDataTypeBuilder setDecimal64(String v) {
-        _decimal64 = new BigDecimal(v);
-        return this;
-    }
-
-    public PmDataType build() {
-        if (_uint64 != null) {
-            return new PmDataType(_uint64);
-        } else if (_int64 != null) {
-            return new PmDataType(_int64);
-        } else {
-            return new PmDataType(_decimal64);
-        }
-    }
-
-    public static PmDataType getDefaultInstance(String defaultValue) {
-        return new PmDataTypeBuilder().setUint64(defaultValue).build();
-    }
+	 private Uint64 _uint64;
+	    private Long _int64;
+	    private Decimal64 _decimal64;
+
+	    public PmDataTypeBuilder() {}
+
+	    //Aluminium uses constructor
+	    public PmDataTypeBuilder(String v) {
+	        this.setUint64(v);
+	    }
+
+	    public PmDataTypeBuilder setUint64(String v) {
+	        _uint64 = Uint64.valueOf(v);
+	        return this;
+	    }
+
+	    public PmDataTypeBuilder setInt64(String v) {
+	        _int64 = Long.valueOf(v);
+	        return this;
+	    }
+
+	    public PmDataTypeBuilder setDecimal64(String v) {
+	        _decimal64 = Decimal64.valueOf(v);
+	        return this;
+	    }
+
+	    public PmDataType build() {
+	        if (_uint64 != null) {
+	            return new PmDataType(_uint64);
+	        } else if (_int64 != null) {
+	            return new PmDataType(_int64);
+	        } else {
+	            return new PmDataType(_decimal64);
+	        }
+	    }
+
+	    public static PmDataType getDefaultInstance(String defaultValue) {
+	        return new PmDataTypeBuilder().setUint64(defaultValue).build();
+	    }
 
 }