BUG-5280: optimize identifier serialization format

[controller.git] / opendaylight / md-sal / cds-access-api / src / test / java / org / opendaylight / controller / cluster / access / concepts / FrontendIdentifierTest.java

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifierTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifierTest.java
index 5611bb5b16e945ae122f2591f899b3061f4403c6..cc56fc1101b3efecba6dbfa0285bd207b4734761 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifierTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifierTest.java
@@ -7,49 +7,27 @@
  */
 package org.opendaylight.controller.cluster.access.concepts;
 
-public class FrontendIdentifierTest extends AbstractIdentifierTest<FrontendIdentifier<?>> {
-    static final FrontendType ONE_FRONTEND_TYPE = new FrontendType() {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String toSimpleString() {
-            return "one";
-        }
-
-        private Object readResolve() {
-            return ONE_FRONTEND_TYPE;
-        }
-    };
-    static final FrontendType OTHER_FRONTEND_TYPE = new FrontendType() {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public String toSimpleString() {
-            return "two";
-        }
-
-        private Object readResolve() {
-            return OTHER_FRONTEND_TYPE;
-        }
-    };
+public class FrontendIdentifierTest extends AbstractIdentifierTest<FrontendIdentifier> {
+    static final FrontendType ONE_FRONTEND_TYPE = FrontendType.forName("one");
+    static final FrontendType OTHER_FRONTEND_TYPE = FrontendType.forName("two");
 
     private static final MemberName MEMBER = MemberName.forName("test");
-    private static final FrontendIdentifier<?> OBJECT = new FrontendIdentifier<>(MEMBER, ONE_FRONTEND_TYPE);
-    private static final FrontendIdentifier<?> DIFFERENT_OBJECT = new FrontendIdentifier<>(MEMBER, OTHER_FRONTEND_TYPE);
-    private static final FrontendIdentifier<?> EQUAL_OBJECT = new FrontendIdentifier<>(MEMBER, ONE_FRONTEND_TYPE);
+    private static final FrontendIdentifier OBJECT = new FrontendIdentifier(MEMBER, ONE_FRONTEND_TYPE);
+    private static final FrontendIdentifier DIFFERENT_OBJECT = new FrontendIdentifier(MEMBER, OTHER_FRONTEND_TYPE);
+    private static final FrontendIdentifier EQUAL_OBJECT = new FrontendIdentifier(MEMBER, ONE_FRONTEND_TYPE);
 
     @Override
-    FrontendIdentifier<?> object() {
+    FrontendIdentifier object() {
         return OBJECT;
     }
 
     @Override
-    FrontendIdentifier<?> differentObject() {
+    FrontendIdentifier differentObject() {
         return DIFFERENT_OBJECT;
     }
 
     @Override
-    FrontendIdentifier<?> equalObject() {
+    FrontendIdentifier equalObject() {
         return EQUAL_OBJECT;
     }
 }