Update yang-xpath-api design

[yangtools.git] / yang / yang-xpath-api / src / main / java / org / opendaylight / yangtools / yang / xpath / api / YangLiteralExpr.java

diff --git a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java
index 1ece060f05e1ec00c3d6b731440f8a7bb6ce817b..efff7c6929ae6f0bea91b81a8a64532ba34a9815 100644 (file)
--- a/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java
+++ b/yang/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/YangLiteralExpr.java
@@ -28,22 +28,9 @@ import org.eclipse.jdt.annotation.Nullable;
  * @author Robert Varga
  */
 @Beta
-public class YangLiteralExpr implements YangExpr {
-    private static final class Empty extends YangLiteralExpr {
-        private static final long serialVersionUID = 1L;
-
-        Empty() {
-            super("");
-        }
-
-        @SuppressWarnings("static-method")
-        Object readResolve() {
-            return empty();
-        }
-    }
-
+public final class YangLiteralExpr implements YangExpr {
     private static final long serialVersionUID = 1L;
-    private static final YangLiteralExpr EMPTY = new Empty();
+    private static final YangLiteralExpr EMPTY = new YangLiteralExpr("");
 
     private final String literal;
 
@@ -51,30 +38,34 @@ public class YangLiteralExpr implements YangExpr {
         this.literal = requireNonNull(literal);
     }
 
-    public static final YangLiteralExpr empty() {
+    public static YangLiteralExpr empty() {
         return EMPTY;
     }
 
-    public static final YangLiteralExpr of(final String literal) {
+    public static YangLiteralExpr of(final String literal) {
         return literal.isEmpty() ? EMPTY : new YangLiteralExpr(literal);
     }
 
-    public final String getLiteral() {
+    public String getLiteral() {
         return literal;
     }
 
     @Override
-    public final int hashCode() {
+    public int hashCode() {
         return literal.hashCode();
     }
 
     @Override
-    public final boolean equals(final @Nullable Object obj) {
+    public boolean equals(final @Nullable Object obj) {
         return this == obj || obj instanceof YangLiteralExpr && literal.equals(((YangLiteralExpr) obj).literal);
     }
 
     @Override
-    public final String toString() {
+    public String toString() {
         return literal;
     }
+
+    protected Object readResolve() {
+        return literal.isEmpty() ? EMPTY : this;
+    }
 }