BUG-865: mark yang-model-util types as deprecated

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / StringType.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
index 857e6a4d030037e89bc8dc7b01607149542a463c..911ed2c37ad0a8d91ff4acd6db3feefff796d54f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
+import com.google.common.base.Optional;
 import java.util.Collections;
 import java.util.List;
-
+import java.util.Objects;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -19,17 +20,17 @@ 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.StringTypeDefinition;
 
-import com.google.common.base.Optional;
-
 /**
  * The <code>default</code> implementation of String Type Definition interface.
  *
  * @see StringTypeDefinition
+ * @deprecated Use {@link org.opendaylight.yangtools.yang.model.util.type.BaseTypes#stringType()} instead
  */
+@Deprecated
 public final class StringType implements StringTypeDefinition, Immutable {
     private static final QName NAME = BaseTypes.STRING_QNAME;
-    private static final SchemaPath PATH = SchemaPath.create(Collections.singletonList(NAME), true);
-    private static final String DEFAULT_VALUE = "";
+    private static final SchemaPath PATH = SchemaPath.create(true, NAME);
+    private static final String DEFAULT_VALUE = null;
     private static final String DESCRIPTION = "";
     private static final String REFERENCE = "";
     private final List<LengthConstraint> lengthStatements;
@@ -166,10 +167,10 @@ public final class StringType implements StringTypeDefinition, Immutable {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((lengthStatements == null) ? 0 : lengthStatements.hashCode());
+        result = prime * result + Objects.hashCode(lengthStatements);
         result = prime * result + NAME.hashCode();
         result = prime * result + PATH.hashCode();
-        result = prime * result + ((patterns == null) ? 0 : patterns.hashCode());
+        result = prime * result + Objects.hashCode(patterns);
         return result;
     }
 
@@ -185,21 +186,7 @@ public final class StringType implements StringTypeDefinition, Immutable {
             return false;
         }
         StringType other = (StringType) obj;
-        if (lengthStatements == null) {
-            if (other.lengthStatements != null) {
-                return false;
-            }
-        } else if (!lengthStatements.equals(other.lengthStatements)) {
-            return false;
-        }
-        if (patterns == null) {
-            if (other.patterns != null) {
-                return false;
-            }
-        } else if (!patterns.equals(other.patterns)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(lengthStatements, other.lengthStatements) && Objects.equals(patterns, other.patterns);
     }
 
     @Override