Deprecate {String,UUID}Identifier

[yangtools.git] / common / util / src / main / java / org / opendaylight / yangtools / util / StringIdentifier.java

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/StringIdentifier.java b/common/util/src/main/java/org/opendaylight/yangtools/util/StringIdentifier.java
index 9b7ec5694fa872ee3df0a4a92df92c5583bfebbd..232f652d159d6994acb5f079ec1bde285bf9dc0f 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/StringIdentifier.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/StringIdentifier.java
@@ -8,43 +8,29 @@
 package org.opendaylight.yangtools.util;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
 import org.opendaylight.yangtools.concepts.Identifier;
 
 /**
  * Utility {@link Identifier} backed by a {@link String}.
+ *
+ * @deprecated Treats instantiations as equal, not providing safety against mixing instances from different modules.
+ *             Use a subclass of {@link AbstractStringIdentifier} instead.
  */
+@Deprecated
 @Beta
-public final class StringIdentifier implements Identifier, Comparable<StringIdentifier> {
+public final class StringIdentifier extends AbstractStringIdentifier<StringIdentifier> {
     private static final long serialVersionUID = 1L;
-    private final String string;
 
     public StringIdentifier(final String string) {
-        this.string = Preconditions.checkNotNull(string);
+        super(string);
     }
 
+    /**
+     * @deprecated use {@link #getValue()} instead.
+     * @return
+     */
+    @Deprecated
     public String getString() {
-        return string;
-    }
-
-    @Override
-    public int hashCode() {
-        return string.hashCode();
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        return this == o || (o instanceof StringIdentifier && string.equals(((StringIdentifier)o).string));
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(StringIdentifier.class).add("string", string).toString();
-    }
-
-    @Override
-    public int compareTo(final StringIdentifier o) {
-        return string.compareTo(o.string);
+        return getValue();
     }
 }