BUG-865: deprecate pre-Beryllium parser elements

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / ModuleIdentifierImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java
index 6e825dd666473fe878c46deb8bbc85f41c732517..63608b3e7a71d6d41aa40468fb8e56f623ead4d9 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleIdentifierImpl.java
@@ -8,9 +8,6 @@
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
-
 import com.google.common.base.Optional;
 import java.net.URI;
 import java.util.Date;
@@ -21,7 +18,10 @@ import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
  * ModuleIdentifier that can be used for indexing/searching by name.
  * Name is only non-null attribute.
  * Equality check on namespace and revision is only triggered if they are non-null
+ *
+ * @deprecated Pre-Beryllium implementation, scheduled for removal.
  */
+@Deprecated
 public class ModuleIdentifierImpl implements ModuleIdentifier {
     private final QNameModule qnameModule;
     private final String name;
@@ -56,7 +56,7 @@ public class ModuleIdentifierImpl implements ModuleIdentifier {
         return "ModuleIdentifierImpl{" +
                 "name='" + name + '\'' +
                 ", namespace=" + getNamespace() +
-                ", revision=" + getRevision() +
+                ", revision=" + qnameModule.getFormattedRevision() +
                 '}';
     }
 
@@ -65,7 +65,7 @@ public class ModuleIdentifierImpl implements ModuleIdentifier {
         if (this == o) {
             return true;
         }
-        if (o == null || (!(o instanceof ModuleIdentifier))) {
+        if (!(o instanceof ModuleIdentifier)) {
             return false;
         }
 
@@ -79,29 +79,8 @@ public class ModuleIdentifierImpl implements ModuleIdentifier {
         if (getNamespace() != null && !getNamespace().equals(that.getNamespace())) {
             return false;
         }
-
-        Date defaultRev = SimpleDateFormatUtil.DEFAULT_DATE_REV;
-        Date defaultImp = SimpleDateFormatUtil.DEFAULT_DATE_IMP;
-
-        // if revision is in import only, spec says that it is undefined which
-        // revision to take
-        if (getRevision() == defaultImp ^ that.getRevision() == defaultImp) {
-            return true;
-        }
-
-        // default and none revisions taken as equal
-        if ((defaultRev.equals(getRevision()) && that.getRevision() == null)
-                || (defaultRev.equals(that.getRevision()) && getRevision() == null)) {
-            return true;
-        }
-
-        // else if none of them is default and one null
-        if (getRevision() == null ^ that.getRevision() == null) {
-            return false;
-        }
-
         // only fail if this revision is non-null
-        if (getRevision() != null && that.getRevision() != null && !getRevision().equals(that.getRevision())) {
+        if (getRevision() != null && !getRevision().equals(that.getRevision())) {
             return false;
         }