Bug 1459-2 - Re-organize mdsal-binding2-spec

- new 'base' & 'structural' packages added
- various replacements done based on bug description
- some Javadocs added

Change-Id: I9d2266845d77a9902a1c937e21884a409585a630
Signed-off-by: Martin Ciglan <mciglan@cisco.com>

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java
index 44a38c42a1238e95b46f4348765a7197e50122aa..80899ea671cb0a4e2afce1dc20631a80e5805b37 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java
@@ -28,6 +28,8 @@ import org.opendaylight.mdsal.binding2.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding2.model.api.Type;
 import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilderBase;
+import org.opendaylight.mdsal.binding2.spec.base.TreeNode;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentable;
 import org.opendaylight.mdsal.binding2.txt.yangTemplateForModule;
 import org.opendaylight.mdsal.binding2.txt.yangTemplateForNode;
 import org.opendaylight.mdsal.binding2.util.BindingMapping;
@@ -416,9 +418,9 @@ final class GenHelperUtil {
      * <code>schemaNode</code>.
      *
      * The new builder always implements
-     * {@link org.opendaylight.mdsal.binding2.spec.TreeNode TreeNode}.<br>
+     * {@link TreeNode TreeNode}.<br>
      * If <code>schemaNode</code> is instance of GroupingDefinition it also
-     * implements {@link org.opendaylight.mdsal.binding2.spec.Augmentable
+     * implements {@link Augmentable
      * Augmentable}.<br>
      * If <code>schemaNode</code> is instance of
      * {@link org.opendaylight.yangtools.yang.model.api.DataNodeContainer

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java
index 833b4e8b225cf667dbb9ed0a7a7f9d8340202e88..575e44fcb2951c6a68c4bf50236685aaafcb01db 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java
@@ -12,14 +12,14 @@ import javax.management.NotificationListener;
 import org.opendaylight.mdsal.binding2.model.api.ConcreteType;
 import org.opendaylight.mdsal.binding2.model.api.ParameterizedType;
 import org.opendaylight.mdsal.binding2.model.api.Type;
-import org.opendaylight.mdsal.binding2.spec.Augmentable;
-import org.opendaylight.mdsal.binding2.spec.Augmentation;
-import org.opendaylight.mdsal.binding2.spec.IdentifiableItem;
-import org.opendaylight.mdsal.binding2.spec.InstanceIdentifier;
-import org.opendaylight.mdsal.binding2.spec.Notification;
-import org.opendaylight.mdsal.binding2.spec.TreeChildNode;
-import org.opendaylight.mdsal.binding2.spec.TreeNode;
-import org.opendaylight.mdsal.binding2.spec.TreeRoot;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentable;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.base.IdentifiableItem;
+import org.opendaylight.mdsal.binding2.spec.base.InstanceIdentifier;
+import org.opendaylight.mdsal.binding2.spec.base.Notification;
+import org.opendaylight.mdsal.binding2.spec.structural.TreeChildNode;
+import org.opendaylight.mdsal.binding2.spec.base.TreeNode;
+import org.opendaylight.mdsal.binding2.spec.base.TreeRoot;
 import org.opendaylight.yangtools.concepts.Identifier;
 
 public final class BindingTypes {

diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java
index 80946153a057c415ca988dec4cd5c89b8e7526e0..e0db4c4673da73992d0056a6661328cf35355490 100644 (file)
--- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java
+++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java
@@ -29,9 +29,9 @@ import org.opendaylight.mdsal.binding2.model.api.ParameterizedType;
 import org.opendaylight.mdsal.binding2.model.api.Restrictions;
 import org.opendaylight.mdsal.binding2.model.api.Type;
 import org.opendaylight.mdsal.binding2.model.api.WildcardType;
-import org.opendaylight.mdsal.binding2.spec.Augmentable;
-import org.opendaylight.mdsal.binding2.spec.Augmentation;
-import org.opendaylight.mdsal.binding2.spec.RpcCallback;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentable;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.base.RpcCallback;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
@@ -193,7 +193,7 @@ public final class Types {
      * Creates instance of
      * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType
      * ParameterizedType} where raw type is
-     * {@link org.opendaylight.mdsal.binding2.spec.Augmentable} and actual
+     * {@link Augmentable} and actual
      * parameter is <code>valueType</code>.
      *
      * @param valueType
@@ -211,7 +211,7 @@ public final class Types {
      * Creates instance of
      * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType
      * ParameterizedType} where raw type is
-     * {@link org.opendaylight.mdsal.binding2.spec.Augmentation} and actual
+     * {@link Augmentation} and actual
      * parameter is <code>valueType</code>.
      *
      * @param valueType

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java
index a2821f8053498601abd551aed6de017bce7e8a05..3afec308332c894392ef3bb7d404371767e72ff7 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java
@@ -15,8 +15,8 @@ import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject;
 import org.opendaylight.mdsal.binding2.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding2.model.api.Type;
 import org.opendaylight.mdsal.binding2.model.api.UnitName;
-import org.opendaylight.mdsal.binding2.spec.Augmentable;
-import org.opendaylight.mdsal.binding2.spec.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentable;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
 import org.opendaylight.yangtools.concepts.Identifier;
 
 /**

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java
index 96acc65fb47911afe0d42327b91efaf95c2d8f84..91576b8ff32662d8592c5a098a79eaa687557740 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java
@@ -39,8 +39,8 @@ import org.opendaylight.mdsal.binding2.model.api.GeneratedType;
 import org.opendaylight.mdsal.binding2.model.api.MethodSignature;
 import org.opendaylight.mdsal.binding2.model.api.ParameterizedType;
 import org.opendaylight.mdsal.binding2.model.api.Type;
-import org.opendaylight.mdsal.binding2.spec.Augmentable;
-import org.opendaylight.mdsal.binding2.spec.TreeNode;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentable;
+import org.opendaylight.mdsal.binding2.spec.base.TreeNode;
 import org.opendaylight.mdsal.binding2.txt.builderConstructorHelperTemplate;
 import org.opendaylight.mdsal.binding2.txt.builderTemplate;
 import org.opendaylight.yangtools.concepts.Builder;

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java
index 8cbbe6289113b1fdeb15b59b96700defbc6749d3..1d76c86a8f0b603a850bf812b3db40864196817d 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java
@@ -124,7 +124,7 @@ public class UnionRenderer extends ClassRenderer {
             if ("java.lang.String".equals(propertyReturnType.getFullyQualifiedName())) {
                 sb.append(fieldName(property)).append(".toCharArray();");
             // generated type InstanceIdentifier
-            } else if ("org.opendaylight.mdsal.binding2.spec.InstanceIdentifier".equals(propertyReturnType
+            } else if ("org.opendaylight.mdsal.binding2.spec.base.InstanceIdentifier".equals(propertyReturnType
                     .getFullyQualifiedName())) {
                 sb.append(fieldName(field))
                     .append(" = ")

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Action.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Action.java
deleted file mode 100644 (file)
index c12fa4d..0000000
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Action.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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.binding2.spec;
-
-public interface Action<I extends Input<I> & Instantiable<I>, O extends Output<O> & Instantiable<O>> {
-
-    void invoke(I input, RpcCallback<O> callback);
-}

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Action.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Action.java
new file mode 100644 (file)
index 0000000..f2a7b67
--- /dev/null
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Action.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.binding2.spec.base;
+
+/**
+ *  The "action" statement is used to define an operation connected to a
+ *  specific container or list data node. The "action" statement defines
+ *  an action node in the schema tree. Under the action node, a schema node
+ *  with the name "input" and a schema node with the name "output" are also
+ *  defined. The nodes "input" and "output" are defined in the module’s namespace.
+ */
+public interface Action<I extends Input<I> & Instantiable<I>, O extends Output<O> & Instantiable<O>> {
+
+    void invoke(I input, RpcCallback<O> callback);
+}

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/IdentifiableItem.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/IdentifiableItem.java
similarity index 92%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/IdentifiableItem.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/IdentifiableItem.java
index a719233db5d55bd9d7d28ce1c2aa7ba18f581477..cbc545ac21aaca07c888e618c82634b9cfbc42e9 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/IdentifiableItem.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/IdentifiableItem.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 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/binding2/spec/Input.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Input.java
similarity index 75%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Input.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Input.java
index 9cbb8dfd161acc32d12ac7ca83bc3d0073252254..4b30051569401ab510448be09ca0844c080777b2 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Input.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Input.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifier.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifier.java
similarity index 98%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifier.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifier.java
index 6339ce4017e90c36da68c1b8580623c9f154f7b7..b2cfcbd304a4eca8344595201c7f0beb529a415e 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifier.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifier.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2013 - 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects;
@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.structural.TreeChildNode;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.util.HashCodeBuilder;

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifierBuilder.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifierBuilder.java
similarity index 89%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifierBuilder.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifierBuilder.java
index bbb217c61e2eecb376d9502a1cea2bf86a549f14..40ce2bd5419563d2eda5b199a21471fc069ff8ad 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifierBuilder.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifierBuilder.java
@@ -1,13 +1,15 @@
 /*
- * Copyright (c) 2013 - 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.structural.TreeChildNode;
 import org.opendaylight.yangtools.concepts.Builder;
 
 @Beta

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifierBuilderImpl.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifierBuilderImpl.java
similarity index 94%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifierBuilderImpl.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifierBuilderImpl.java
index 0e41a5be6f44084e4ff0c563713fd194ba032be7..a755ea2b18d7f67777a8aa8729308516fecaccc4 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/InstanceIdentifierBuilderImpl.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/InstanceIdentifierBuilderImpl.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2013 - 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import java.util.Objects;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.structural.TreeChildNode;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.util.HashCodeBuilder;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Instantiable.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Instantiable.java
similarity index 84%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Instantiable.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Instantiable.java
index 51e9ff0798483fb217c39f1077439adb3f9dd415..9358e304c0ca745efe41d77f2cbce39540f7e67c 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Instantiable.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Instantiable.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Item.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Item.java
similarity index 88%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Item.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Item.java
index b426c99b6cdcd2bdcd4690fae3979b5e66050439..86bdba9d0cb910c2353df76714987cfc54adea80 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Item.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Item.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 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/binding2/spec/KeyedInstanceIdentifier.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/KeyedInstanceIdentifier.java
similarity index 94%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/KeyedInstanceIdentifier.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/KeyedInstanceIdentifier.java
index 6d415bf3c675a78b6c8e22613054c5e0bb27b876..a053f733f3ddcfa9ff4a19ac26bf8ee18a194e77 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/KeyedInstanceIdentifier.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/KeyedInstanceIdentifier.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Notification.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Notification.java
similarity index 78%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Notification.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Notification.java
index 522c4efc6dd23ba3740cba9d0b6895690fb0fcc6..6d5735e94f414ef499360b1ca0f1b43a1af1e318 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Notification.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Notification.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Output.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Output.java
similarity index 75%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Output.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Output.java
index ee13478d2fd2ea84c950f3e5428c1d2db2536b4f..8ba4eedd96e11f3ca0a37aacf716c50383bd057c 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Output.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/Output.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/RpcCallback.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/RpcCallback.java
similarity index 77%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/RpcCallback.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/RpcCallback.java
index 7965afc962759db90283b6e953fbae1cecb7def4..af8faed1cb9bd6882753eaebc1c5d8122dd62ec9 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/RpcCallback.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/RpcCallback.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeArgument.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeArgument.java
similarity index 86%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeArgument.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeArgument.java
index eca52ec2d9bc822f9f21e820201fb13dcd7ba1b6..e39bdf9378bf140c12662ebe6f90e04ebb5fe80e 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeArgument.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeArgument.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
+import org.opendaylight.mdsal.binding2.spec.structural.TreeChildNode;
 
 @Beta
 public abstract class TreeArgument<T> {

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeNode.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeNode.java
similarity index 58%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeNode.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeNode.java
index 0f8da677f8d8904a25b360ad136409da3d610f51..52a09668ddcb44ec68d974d8e0939ce72254a382 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeNode.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeNode.java
@@ -1,23 +1,23 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
+import org.opendaylight.mdsal.binding2.spec.structural.TreeChildNode;
 
 /**
  *
- *
+ * Replaces org.opendaylight.yangtools.yang.binding.DataObject from Binding Spec v1
  * @see TreeRoot
  * @see TreeChildNode
  *
  */
-
 @Beta
 public interface TreeNode {
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeRoot.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeRoot.java
similarity index 74%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeRoot.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeRoot.java
index 76cc76bc7d9fa274f9b317e519262bf7209edc2e..cceddae354408cfc869ed88deff69bb5c3917afa 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeRoot.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/base/TreeRoot.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.base;
 
 import com.google.common.annotations.Beta;
 

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/BindingNamespaceType.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingNamespaceType.java
similarity index 89%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/BindingNamespaceType.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingNamespaceType.java
index b8960a80ef8665fedb2b13392131248e50b12185..1f155bdf96358a002d58e6f3311ae8efd5f69146 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/BindingNamespaceType.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingNamespaceType.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.runtime;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
@@ -14,8 +14,6 @@ import com.google.common.base.Preconditions;
 /**
  * Binding Namespace is structure of Java packages designed to prevent conflicts in YANG Java
  * Binding, since Java does have only one namespace.
- *
- *
  */
 @Beta
 public enum BindingNamespaceType {

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingStreamEventWriter.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingStreamEventWriter.java
index 7d45475bb06e839e83e6c1f94880dd0bc4777dfc..6d4a8fa709968a0353cc0c61db86a55a0f7babe4 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingStreamEventWriter.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/BindingStreamEventWriter.java
@@ -12,10 +12,10 @@ import com.google.common.annotations.Beta;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.io.IOException;
-import org.opendaylight.mdsal.binding2.spec.Augmentation;
-import org.opendaylight.mdsal.binding2.spec.IdentifiableItem;
-import org.opendaylight.mdsal.binding2.spec.Item;
-import org.opendaylight.mdsal.binding2.spec.TreeNode;
+import org.opendaylight.mdsal.binding2.spec.structural.Augmentation;
+import org.opendaylight.mdsal.binding2.spec.base.IdentifiableItem;
+import org.opendaylight.mdsal.binding2.spec.base.Item;
+import org.opendaylight.mdsal.binding2.spec.base.TreeNode;
 
 /**
  * Event Stream Writer for Binding version 2 Representation

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/TreeNodeSerializer.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/TreeNodeSerializer.java
index 3ca856c1ea0d9d219bc36dfee32190bc56440feb..ac6852daf53eb43377eff02fb5c64f61d8218d17 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/TreeNodeSerializer.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/runtime/TreeNodeSerializer.java
@@ -10,7 +10,7 @@ package org.opendaylight.mdsal.binding2.spec.runtime;
 
 import com.google.common.annotations.Beta;
 import java.io.IOException;
-import org.opendaylight.mdsal.binding2.spec.TreeNode;
+import org.opendaylight.mdsal.binding2.spec.base.TreeNode;
 
 /*
  * A serializer which writes TreeNode to supplied stream event writer.

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Augmentable.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/Augmentable.java
similarity index 92%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Augmentable.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/Augmentable.java
index d243d2ddc83fed27e08e70e103632984ccfad7c0..2ead99f682ef1fc7b75712daeb738c6e7321b416 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Augmentable.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/Augmentable.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.structural;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ClassToInstanceMap;

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Augmentation.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/Augmentation.java
similarity index 82%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Augmentation.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/Augmentation.java
index a91ed0cb559fcd05b753288b697dbd89cc1b5046..f5f49f3910a45c94bca2e640c09463195245cf14 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/Augmentation.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/Augmentation.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.structural;
 
 import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.util.ClassLoaderUtils;

diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeChildNode.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/TreeChildNode.java
similarity index 66%
rename from binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeChildNode.java
rename to binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/TreeChildNode.java
index 15cfe679fcdd454c7a9bc47c7a7b4b7a4ae69986..534d57aaba7c4fe4c8e09ca9892b2255c05a6ab2 100644 (file)
--- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/TreeChildNode.java
+++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding2/spec/structural/TreeChildNode.java
@@ -1,16 +1,22 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.binding2.spec;
+package org.opendaylight.mdsal.binding2.spec.structural;
 
 import com.google.common.annotations.Beta;
+import org.opendaylight.mdsal.binding2.spec.base.TreeArgument;
+import org.opendaylight.mdsal.binding2.spec.base.TreeNode;
 import org.opendaylight.yangtools.util.ClassLoaderUtils;
 
+/**
+ *
+ * Replaces org.opendaylight.yangtools.yang.binding.ChildOf from Binding Spec v1
+ */
 @Beta
 public interface TreeChildNode<P extends TreeNode, I extends TreeArgument<?>> extends TreeNode {