Deprecate {String,UUID}Identifier

[yangtools.git] / common / concepts / src / main / java / org / opendaylight / yangtools / concepts / CompositeObjectRegistration.java

diff --git a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java
index ab3c91e01c43590b014b4ef2a21a0c5ab61669c0..f80f4850ff481fd3ce625903ff60ab572f0e0f53 100644 (file)
--- a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java
+++ b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java
@@ -12,6 +12,11 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * @deprecated This class does not have good semantics with regard to constituent registrations' lifecycle and should
+ *             not be used.
+ */
+@Deprecated
 public final class CompositeObjectRegistration<T> extends AbstractObjectRegistration<T> {
 
     private final Set<Registration> registrations;
@@ -50,7 +55,7 @@ public final class CompositeObjectRegistration<T> extends AbstractObjectRegistra
         }
 
         public CompositeObjectRegistrationBuilder<T> add(final ObjectRegistration<? super T> registration) {
-            if (registration.getInstance() != instance) {
+            if (!registration.getInstance().equals(instance)) {
                 throw new IllegalArgumentException("Instance must be same.");
             }
             registrations.add(registration);
@@ -58,7 +63,7 @@ public final class CompositeObjectRegistration<T> extends AbstractObjectRegistra
         }
 
         public CompositeObjectRegistrationBuilder<T> remove(final ObjectRegistration<? super T> registration) {
-            if (registration.getInstance() != instance) {
+            if (!registration.getInstance().equals(instance)) {
                 throw new IllegalArgumentException("Instance must be same.");
             }
             registrations.remove(registration);
@@ -69,13 +74,5 @@ public final class CompositeObjectRegistration<T> extends AbstractObjectRegistra
         public CompositeObjectRegistration<T> build() {
             return new CompositeObjectRegistration<>(instance, registrations);
         }
-
-        /*
-         * @deprecated Use #build() instead.
-         */
-        @Deprecated
-        public CompositeObjectRegistration<T> toInstance() {
-            return build();
-        }
     }
 }