Binding v2 runtime - refactor - part1

  * various runtime classes lost in generator or even spec v2 packages
    are grouped in new runtime v2 module and used in runtime v2
  * move BindingRuntimeContext and BindingSchemaContextUtils

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

diff --git a/binding2/mdsal-binding2-dom-codec/pom.xml b/binding2/mdsal-binding2-dom-codec/pom.xml
index 3a3bea9dd6cc0a48425ae8d43defcb17a2d08df4..4b885ccc53dfac0d2782fcf1191ff6f35917fd79 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/pom.xml
+++ b/binding2/mdsal-binding2-dom-codec/pom.xml
@@ -51,6 +51,10 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding2-generator-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-runtime</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
@@ -121,4 +125,4 @@
         </site>
     </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>

diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/factory/BindingTreeCodecFactory.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/factory/BindingTreeCodecFactory.java
index b1045136bdb935ed63b60eee2ae36c2039695567..2947f17494006460e454f8848ad07503a73fb3ee 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/factory/BindingTreeCodecFactory.java
+++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/api/factory/BindingTreeCodecFactory.java
@@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding.javav2.dom.codec.api.factory;
 
 import com.google.common.annotations.Beta;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.api.codecs.BindingTreeCodec;
-import org.opendaylight.mdsal.binding.javav2.generator.impl.util.BindingRuntimeContext;
+import org.opendaylight.mdsal.binding.javav2.runtime.context.BindingRuntimeContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 @Beta

diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/api/TreeNodeSerializerGenerator.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/api/TreeNodeSerializerGenerator.java
index 3f77ead9e8274c2ad0e5e47419ecaa3d23c8783a..1456c3ec91a310b8c8df5d80207a015eea423c29 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/api/TreeNodeSerializerGenerator.java
+++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/api/TreeNodeSerializerGenerator.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.binding.javav2.dom.codec.generator.api;
 
 import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.binding.javav2.generator.impl.util.BindingRuntimeContext;
+import org.opendaylight.mdsal.binding.javav2.runtime.context.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.TreeNodeSerializerImplementation;
 
 /**

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 8831609f21ee908547b7cbc26ef7604a6b8f0cf8..44c4936e023ffa3cfdc6c02dd1c1c8e081c2a920 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
@@ -28,10 +28,10 @@ import org.opendaylight.mdsal.binding.javav2.dom.codec.generator.impl.StaticBind
 import org.opendaylight.mdsal.binding.javav2.dom.codec.generator.impl.TreeNodeSerializerPrototype;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.source.AbstractTreeNodeSerializerSource;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.serializer.AugmentableDispatchSerializer;
-import org.opendaylight.mdsal.binding.javav2.generator.impl.util.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.javav2.generator.impl.util.javassist.JavassistUtils;
 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.spec.base.Instantiable;
 import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode;
 import org.opendaylight.mdsal.binding.javav2.spec.runtime.BindingStreamEventWriter;

diff --git a/binding2/mdsal-binding2-runtime/pom.xml b/binding2/mdsal-binding2-runtime/pom.xml
index 5b93f068ebc834b34b756afa43c023029f7d5236..396b5e946c600e63d92f46c7914426c5f0ffca5d 100644 (file)
--- a/binding2/mdsal-binding2-runtime/pom.xml
+++ b/binding2/mdsal-binding2-runtime/pom.xml
@@ -43,6 +43,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding2-generator-impl</artifactId>
+        </dependency>
         <dependency><groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/BindingRuntimeContext.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java
similarity index 99%
rename from binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/BindingRuntimeContext.java
rename to binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java
index 7174b940a78068610c8c849d20c4c9a0607a2a80..253b58e94edb6afb7fae92b22993173702bf0c27 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/BindingRuntimeContext.java
+++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.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.generator.impl.util;
+package org.opendaylight.mdsal.binding.javav2.runtime.context;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
@@ -38,6 +38,7 @@ import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature;
 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.spec.structural.Augmentation;
 import org.opendaylight.mdsal.binding.javav2.spec.util.BindingReflections;
 import org.opendaylight.yangtools.concepts.Immutable;
@@ -77,6 +78,7 @@ import org.slf4j.LoggerFactory;
  */
 @Beta
 public class BindingRuntimeContext implements Immutable {
+
     private static final Logger LOG = LoggerFactory.getLogger(BindingRuntimeContext.class);
     private static final char DOT = '.';
     private final ClassLoadingStrategy strategy;

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/BindingSchemaContextUtils.java b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java
similarity index 99%
rename from binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/BindingSchemaContextUtils.java
rename to binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java
index 5be37fd61a5f8a98d2b295abd128b8bc31605664..5280013f4c4c9ccc2b245a8f6bcc89b221da476c 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/BindingSchemaContextUtils.java
+++ b/binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/util/BindingSchemaContextUtils.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.mdsal.binding.javav2.generator.impl.util;
+package org.opendaylight.mdsal.binding.javav2.runtime.context.util;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;

diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml
index 7f3ba1786a4825598f0fa23e70b1cfe999041168..3385ce1443e1628e163ed0295a3086575ed643b2 100644 (file)
--- a/common/artifacts/pom.xml
+++ b/common/artifacts/pom.xml
@@ -160,6 +160,11 @@
                 <artifactId>mdsal-binding2-maven-api-gen-plugin</artifactId>
                 <version>0.10.1-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-binding2-runtime</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding2-dom-codec</artifactId>