Binding v2 runtime - refactor - part2

  * various runtime classes lost in generator or even spec v2 packages
    are grouped in new runtime v2 module and used in runtime v2
  * move AugmentationFieldGetter and BindingReflections
  * move tests

Change-Id: I61459f6a392890e2a2c038ab25e4592c2b135e05
Signed-off-by: Jakub Toth <jakub.toth@pantheon.tech>
(cherry picked from commit 0836a9a58b22244e880d68cb701346ac6ae03175)

diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/generator/AbstractStreamWriterGenerator.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/generator/AbstractStreamWriterGenerator.java
index 44c4936e023ffa3cfdc6c02dd1c1c8e081c2a920..5add72037695be4ae16e98faeb99f9de5a99e8aa 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/generator/AbstractStreamWriterGenerator.java
+++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/generator/AbstractStreamWriterGenerator.java
@@ -32,12 +32,12 @@ import org.opendaylight.mdsal.binding.javav2.generator.impl.util.javassist.Javas
 import org.opendaylight.mdsal.binding.javav2.generator.util.Types;
 import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding.javav2.runtime.context.BindingRuntimeContext;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.BindingReflections;
 import org.opendaylight.mdsal.binding.javav2.spec.base.Instantiable;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingStreamEventWriter;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.TreeNodeSerializerImplementation;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.TreeNodeSerializerRegistry;
-import org.opendaylight.mdsal.binding.javav2.spec.util.BindingReflections;
 import org.opendaylight.yangtools.util.ClassLoaderUtils;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;

diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/AugmentableDispatchSerializer.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/AugmentableDispatchSerializer.java
index 9fc787a64aa41403759fb5da8029090d7fb1f96f..5931f489c18041eb0b52ee87197636e927598ada 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/AugmentableDispatchSerializer.java
+++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/AugmentableDispatchSerializer.java
@@ -16,6 +16,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.api.AugmentationReader;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.BindingReflections;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingStreamEventWriter;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.TreeNodeSerializer;
@@ -23,7 +24,6 @@ import org.opendaylight.mdsal.binding.javav2.spec.runtime.TreeNodeSerializerImpl
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.TreeNodeSerializerRegistry;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
-import org.opendaylight.mdsal.binding.javav2.spec.util.BindingReflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/ValueTypeCodec.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/ValueTypeCodec.java
index 77dfdc4cdf023ae116617bbf6b5f59467837799c..89a9304c209c2375669516150063763acc4dbaee 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/ValueTypeCodec.java
+++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/ValueTypeCodec.java
@@ -13,7 +13,7 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import org.opendaylight.mdsal.binding.javav2.spec.util.BindingReflections;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.BindingReflections;
 import org.opendaylight.yangtools.concepts.Codec;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;

diff --git a/binding2/mdsal-binding2-runtime/pom.xml b/binding2/mdsal-binding2-runtime/pom.xml
index 396b5e946c600e63d92f46c7914426c5f0ffca5d..b1fcc87f3cf26c34bcb5aa3d632978d97e789b85 100644 (file)
--- a/binding2/mdsal-binding2-runtime/pom.xml
+++ b/binding2/mdsal-binding2-runtime/pom.xml
@@ -51,6 +51,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <!--

diff --git a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java
index 253b58e94edb6afb7fae92b22993173702bf0c27..37865318e5f30cb560d9995681e4f3b703a172fe 100644 (file)
--- a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java
+++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java
@@ -39,8 +39,8 @@ import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType;
 import org.opendaylight.mdsal.binding.javav2.model.api.Type;
 import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.mdsal.binding.javav2.runtime.context.util.BindingSchemaContextUtils;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.BindingReflections;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
-import org.opendaylight.mdsal.binding.javav2.spec.util.BindingReflections;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;

diff --git a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java
index 5280013f4c4c9ccc2b245a8f6bcc89b221da476c..5defa72f2944c66c5360acf7f93138364f5590cf 100644 (file)
--- a/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java
+++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java
@@ -15,13 +15,13 @@ import java.util.Iterator;
 import java.util.Set;
 import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifier;
 import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.BindingReflections;
 import org.opendaylight.mdsal.binding.javav2.spec.base.InstanceIdentifier;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeArgument;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.YangModuleInfo;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.TreeChildNode;
-import org.opendaylight.mdsal.binding.javav2.spec.util.BindingReflections;
 import org.opendaylight.mdsal.binding.javav2.util.BindingMapping;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/AugmentationFieldGetter.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetter.java
similarity index 98%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/AugmentationFieldGetter.java
rename to binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetter.java
index d15a3be02568fb1e48ece42f5bd8f233f80a2a12..77fbff5722da12ca81c0cb2e730d85f32f06b0d3 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/AugmentationFieldGetter.java
+++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetter.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.mdsal.binding.javav2.spec.util;
+package org.opendaylight.mdsal.binding.javav2.runtime.reflection;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/BindingReflections.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java
similarity index 99%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/BindingReflections.java
rename to binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java
index 5474552ce45574ad933da0e164ef7f96dee8868a..d40a6eed794dc71c1ad5df5a8e5da58e0876beb1 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/BindingReflections.java
+++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflections.java
@@ -5,10 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.javav2.spec.util;
+package org.opendaylight.mdsal.binding.javav2.runtime.reflection;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;

diff --git a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/AugmentationFieldGetterTest.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java
similarity index 94%
rename from binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/AugmentationFieldGetterTest.java
rename to binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java
index 1c9c3dd484b49543b085114bdf630a78939b9364..ea16886aa96d5d767e14872b4b923c8321bf91a7 100644 (file)
--- a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/AugmentationFieldGetterTest.java
+++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetterTest.java
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.javav2.spec.util;
+package org.opendaylight.mdsal.binding.javav2.runtime.reflection;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
-import static org.opendaylight.mdsal.binding.javav2.spec.util.AugmentationFieldGetter.getGetter;
+import static org.opendaylight.mdsal.binding.javav2.runtime.reflection.AugmentationFieldGetter.getGetter;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/BindingReflectionsTest.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflectionsTest.java
similarity index 94%
rename from binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/BindingReflectionsTest.java
rename to binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflectionsTest.java
index 83789fc72ee872e2d6f978c68195a29320e1e5b1..157b70911d492fae38bc60d804e4cc99c312cb18 100644 (file)
--- a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/BindingReflectionsTest.java
+++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/BindingReflectionsTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.javav2.spec.util;
+package org.opendaylight.mdsal.binding.javav2.runtime.reflection;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -18,6 +18,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Future;
 import org.junit.Test;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.test.mock.FooChild;
+import org.opendaylight.mdsal.binding.javav2.runtime.reflection.test.mock.GroupingFoo;
 import org.opendaylight.mdsal.binding.javav2.spec.base.BaseIdentity;
 import org.opendaylight.mdsal.binding.javav2.spec.base.Input;
 import org.opendaylight.mdsal.binding.javav2.spec.base.Rpc;
@@ -25,8 +27,6 @@ import org.opendaylight.mdsal.binding.javav2.spec.base.RpcCallback;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.TreeChildNode;
-import org.opendaylight.mdsal.binding.javav2.spec.util.test.mock.FooChild;
-import org.opendaylight.mdsal.binding.javav2.spec.util.test.mock.GroupingFoo;
 import org.opendaylight.yangtools.yang.common.QName;
 
 public class BindingReflectionsTest {

diff --git a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/test/mock/FooChild.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/test/mock/FooChild.java
similarity index 87%
rename from binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/test/mock/FooChild.java
rename to binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/test/mock/FooChild.java
index c6743c93bc3751300f110ee5f2abafcbf5f06f1c..ae7f2dbaed7fea989c244c19aae0427d1fb3e6ff 100644 (file)
--- a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/test/mock/FooChild.java
+++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/test/mock/FooChild.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.javav2.spec.util.test.mock;
+package org.opendaylight.mdsal.binding.javav2.runtime.reflection.test.mock;
 
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeArgument;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.TreeChildNode;

diff --git a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/test/mock/GroupingFoo.java b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/test/mock/GroupingFoo.java
similarity index 85%
rename from binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/test/mock/GroupingFoo.java
rename to binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/test/mock/GroupingFoo.java
index 795e234b734ee3218088814c6b9d9c5e1cc873b1..91edfc21c3feed702b42333f5dee3e4200dd45a6 100644 (file)
--- a/binding2/mdsal-binding2-spec/test/main/java/org/opendaylight/mdsal/binding/javav2/spec/util/test/mock/GroupingFoo.java
+++ b/binding2/mdsal-binding2-runtime/src/test/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/test/mock/GroupingFoo.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.mdsal.binding.javav2.spec.util.test.mock;
+package org.opendaylight.mdsal.binding.javav2.runtime.reflection.test.mock;
 
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;