Removed sonar warnings.

[mdsal.git] / binding2 / mdsal-binding2-generator-util / src / main / java / org / opendaylight / mdsal / binding2 / generator / util / Binding2GeneratorUtil.java

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Binding2GeneratorUtil.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Binding2GeneratorUtil.java
index e3a70aeb09c2cb2d64576b89067c1ad3ed849484..19062cae696180f2310aeb5293ed0d2b7991aa89 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Binding2GeneratorUtil.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Binding2GeneratorUtil.java
@@ -10,19 +10,10 @@ package org.opendaylight.mdsal.binding2.generator.util;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.CharMatcher;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import java.util.Comparator;
 import java.util.Iterator;
-import java.util.List;
-import org.opendaylight.mdsal.binding2.model.api.Restrictions;
-import org.opendaylight.mdsal.binding2.model.api.Type;
-import org.opendaylight.mdsal.binding2.model.api.type.builder.TypeMemberBuilder;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
-import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
-import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 /**
  * Standard Util class that contains various method for converting
@@ -32,40 +23,12 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 @Beta
 public final class Binding2GeneratorUtil {
 
-    private Binding2GeneratorUtil() {
-        throw new UnsupportedOperationException("Utility class");
-    }
-
     private static final CharMatcher GT_MATCHER = CharMatcher.is('>');
     private static final CharMatcher LT_MATCHER = CharMatcher.is('<');
 
-    private static final Restrictions EMPTY_RESTRICTIONS = new Restrictions() {
-        @Override
-        public List<LengthConstraint> getLengthConstraints() {
-            return ImmutableList.of();
-        }
-
-        @Override
-        public List<PatternConstraint> getPatternConstraints() {
-            return ImmutableList.of();
-        }
-
-        @Override
-        public List<RangeConstraint> getRangeConstraints() {
-            return ImmutableList.of();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
-
-    private static final Comparator<TypeMemberBuilder<?>> SUID_MEMBER_COMPARATOR =
-            (o1, o2) -> o1.getName().compareTo(o2.getName());
-
-    private static final Comparator<Type> SUID_NAME_COMPARATOR =
-            (o1, o2) -> o1.getFullyQualifiedName().compareTo(o2.getFullyQualifiedName());
+    private Binding2GeneratorUtil() {
+        throw new UnsupportedOperationException("Utility class");
+    }
 
     /**
      * Creates package name from specified <code>basePackageName</code> (package
@@ -148,11 +111,12 @@ public final class Binding2GeneratorUtil {
      * @return string with encoded angle brackets
      */
     public static String encodeAngleBrackets(String description) {
-        if (description != null) {
-            description = LT_MATCHER.replaceFrom(description, "&lt;");
-            description = GT_MATCHER.replaceFrom(description, "&gt;");
+        String newDesc = description;
+        if (newDesc != null) {
+            newDesc = LT_MATCHER.replaceFrom(newDesc, "&lt;");
+            newDesc = GT_MATCHER.replaceFrom(newDesc, "&gt;");
         }
-        return description;
+        return newDesc;
     }
 
     //TODO: further implementation of static util methods...