Move BaseYangTypesProvider

BaseYangTypesProvider is not really used anywhere, centralize it in
mdsal-binding-generator-impl prior to its removal.

Change-Id: I7c92885446f2ce25869f364f8ec922c3d2f43c88
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
index efc5ee8819f976a4e62ff5a5620749c4cc6a60a2..070012158f9bf8d10f14d4d5b0948559cbb4d0b0 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
@@ -24,7 +24,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 import org.opendaylight.mdsal.binding.generator.spi.TypeProvider;
-import org.opendaylight.mdsal.binding.generator.util.BaseYangTypesProvider;
 import org.opendaylight.mdsal.binding.model.api.AccessModifier;
 import org.opendaylight.mdsal.binding.model.api.ConcreteType;
 import org.opendaylight.mdsal.binding.model.api.Enumeration;

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProvider.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesProvider.java
similarity index 85%
rename from binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProvider.java
rename to binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesProvider.java
index 21f8e52e3c54f75581fa3cdef8d5cdf5c5a6d30b..ea76bf5b17a45fa1af72d046355d58adece18492 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProvider.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesProvider.java
@@ -5,9 +5,8 @@
  * 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.generator.util;
+package org.opendaylight.mdsal.binding.yang.types;
 
-import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.generator.spi.TypeProvider;
 import org.opendaylight.mdsal.binding.model.api.Restrictions;
@@ -17,10 +16,9 @@ import org.opendaylight.mdsal.binding.model.util.Types;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
-@Beta
-public final class BaseYangTypesProvider implements TypeProvider {
-    // FIXME: 8.0.0: we want to expose this as a proper singleton I guess
-    public static final @NonNull BaseYangTypesProvider INSTANCE = new BaseYangTypesProvider();
+@Deprecated(forRemoval = true)
+final class BaseYangTypesProvider implements TypeProvider {
+    static final @NonNull BaseYangTypesProvider INSTANCE = new BaseYangTypesProvider();
 
     private BaseYangTypesProvider() {
         // Hidden on purpose

diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProviderTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesProviderTest.java
similarity index 99%
rename from binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProviderTest.java
rename to binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesProviderTest.java
index cdf1c3de7bd7ddaf7e88ee66689d1da451f28cdb..6916da8a696564dd0a646e8956213a085eb85650 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BaseYangTypesProviderTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesProviderTest.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.generator.util;
+package org.opendaylight.mdsal.binding.yang.types;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

diff --git a/binding/mdsal-binding-generator-util/src/main/java/module-info.java b/binding/mdsal-binding-generator-util/src/main/java/module-info.java
index 35a81701122abe06a5401a6f7288dd1756782e83..748e3ffb63ecaf64f96c26e80e1d586904e3c281 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/module-info.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/module-info.java
@@ -6,13 +6,9 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 module org.opendaylight.mdsal.binding.generator.util {
-    exports org.opendaylight.mdsal.binding.generator.util;
     exports org.opendaylight.mdsal.binding.model.util;
     exports org.opendaylight.mdsal.binding.model.util.generated.type.builder;
 
-    // FIXME: 8.0.0: is this a service?
-    // provides TypeProvider with BaseYangTypesProvider;
-
     requires transitive org.opendaylight.mdsal.binding.generator.api;
     requires org.opendaylight.mdsal.binding.spec.util;
     requires org.opendaylight.yangtools.util;