X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=entityownership%2Fmdsal-eos-binding-api%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Feos%2Fbinding%2Fapi%2FEntityTest.java;h=f7acd9901a7fa66f25b71a18c896bde3cb91d5a3;hb=eb7ab8e1bb6a28cfafd22a5a62ea66e5f85a8c2d;hp=cf22c64fdd37608c6f9259f5dd8fc85d56fcffbb;hpb=dcacf7468c8d742f4207b7bc5175413e2ab9eb45;p=mdsal.git

diff --git a/entityownership/mdsal-eos-binding-api/src/test/java/org/opendaylight/mdsal/eos/binding/api/EntityTest.java b/entityownership/mdsal-eos-binding-api/src/test/java/org/opendaylight/mdsal/eos/binding/api/EntityTest.java
index cf22c64fdd..f7acd9901a 100644
--- a/entityownership/mdsal-eos-binding-api/src/test/java/org/opendaylight/mdsal/eos/binding/api/EntityTest.java
+++ b/entityownership/mdsal-eos-binding-api/src/test/java/org/opendaylight/mdsal/eos/binding/api/EntityTest.java
@@ -13,7 +13,9 @@ import static org.junit.Assert.assertNotNull;
 
 import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.DataRoot;
 import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -24,8 +26,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  */
 public class EntityTest {
 
-    static String ENTITY_TYPE1 = "type1";
-    static String ENTITY_TYPE2 = "type2";
+    static final String ENTITY_TYPE1 = "type1";
+    static final String ENTITY_TYPE2 = "type2";
     static final InstanceIdentifier<TestDataObject1> ID1 = InstanceIdentifier.create(TestDataObject1.class);
     static final InstanceIdentifier<TestDataObject2> ID2 = InstanceIdentifier.create(TestDataObject2.class);
 
@@ -70,29 +72,17 @@ public class EntityTest {
         assertNotNull("List key not found", keyID);
     }
 
-    static class TestDataObject1 implements DataObject {
+    interface TestDataObject1 extends ChildOf<DataRoot> {
         @Override
-        @Deprecated
-        public Class<? extends DataObject> getImplementedInterface() {
-            return DataObject.class;
-        }
-
-        @Override
-        public Class<? extends DataObject> implementedInterface() {
-            return DataObject.class;
+        default Class<? extends DataObject> implementedInterface() {
+            return TestDataObject1.class;
         }
     }
 
-    static class TestDataObject2 implements DataObject {
-        @Override
-        @Deprecated
-        public Class<? extends DataObject> getImplementedInterface() {
-            return DataObject.class;
-        }
-
+    interface TestDataObject2 extends ChildOf<DataRoot> {
         @Override
-        public Class<? extends DataObject> implementedInterface() {
-            return DataObject.class;
+        default Class<? extends DataObject> implementedInterface() {
+            return TestDataObject2.class;
         }
     }
 }