Bug 865: Deprecated Hydrogen Source Repository APIs

Deprecated Hydrogen Source Repository APIs, which are not
used in Helium MD-SAL runtime code and
migrated necessary utility methods from deprecated classes
to non-deprecated ones.

Change-Id: I01e2411c501dd221a6126e6fb80edcd0af6bc852
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java
index 6b1d6c61232e0221c718d15a9a16a95a0b03df54..5b084e3fb1056e5fd68d30b6bb02cdb3b7f4766f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java
@@ -7,11 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.model.util.repo;
 
-import org.opendaylight.yangtools.concepts.Delegator;
-
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import org.opendaylight.yangtools.concepts.Delegator;
 
 
 /**
@@ -21,7 +20,10 @@ import com.google.common.base.Preconditions;
  *
  * @param <I> Input Schema Source Representation
  * @param <O> Output Schema Source Representation
+ *
+ * @deprecated Replaced with {@link org.opendaylight.yangtools.yang.model.repo.util.AbstractSchemaSourceCache}
  */
+@Deprecated
 public abstract class AbstractCachingSchemaSourceProvider<I, O> implements AdvancedSchemaSourceProvider<O>,
         Delegator<AdvancedSchemaSourceProvider<I>> {
 

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AdvancedSchemaSourceProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AdvancedSchemaSourceProvider.java
index 846bf0380bd9887277a105aa38e37bc7d546bc50..afb70736e156793910baef1e665376313e12ab01 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AdvancedSchemaSourceProvider.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AdvancedSchemaSourceProvider.java
@@ -40,7 +40,11 @@ import com.google.common.base.Optional;
  *
  * @param <T>
  *            Schema source representation type provided by this implementation
+ *
+ * @deprecated Replaced with {@link org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider}
+ * and related APIs.
  */
+@Deprecated
 public interface AdvancedSchemaSourceProvider<T> extends SchemaSourceProvider<T> {
 
     /**

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/FilesystemSchemaCachingProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/FilesystemSchemaCachingProvider.java
index 4e80033dc34cd81f9f24b41743706479c5fc4e61..2c243b2e2458d3e21123ee3f53deb27e7cbdadc3 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/FilesystemSchemaCachingProvider.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/FilesystemSchemaCachingProvider.java
@@ -7,6 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.model.util.repo;
 
+import com.google.common.base.Charsets;
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,15 +27,9 @@ import java.util.Date;
 import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-
 /**
  * Filesystem-based schema caching source provider
  *
@@ -42,7 +40,10 @@ import com.google.common.base.Preconditions;
  * @param <I>
  *            Input format in which schema source is represented.
  *
+ * @deprecated Replaced with {@link org.opendaylight.yangtools.yang.model.repo.util.FilesystemSchemaSourceCache}
+ *
  */
+@Deprecated
 public final class FilesystemSchemaCachingProvider<I> extends AbstractCachingSchemaSourceProvider<I, InputStream> {
     private static final Logger LOG = LoggerFactory.getLogger(FilesystemSchemaCachingProvider.class);
     public static final Pattern REVISION_PATTERN = Pattern.compile("\\d\\d\\d\\d-\\d\\d-\\d\\d");

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProvider.java
index 82fea38e4a296c99aace36e74499f6c1b290a1b3..7c85777fa217ba59466eb8efcda5e796d6be9aa1 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProvider.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProvider.java
@@ -17,7 +17,9 @@ import com.google.common.base.Optional;
  * for other components.
  *
  * @param <F> Format in which YANG source is represented.
+ * @deprecated Repalced With {@link AdvancedSchemaSourceProvider}
  */
+@Deprecated
 public interface SchemaSourceProvider<F> {
 
     /**

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProviders.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProviders.java
index 4f7f111b9396c10e0cf6d94087f11dd016f6e793..47b6f7f6a0be7342ec56a7ff51d1fad9df610fa7 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProviders.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceProviders.java
@@ -7,21 +7,22 @@
  */
 package org.opendaylight.yangtools.yang.model.util.repo;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.opendaylight.yangtools.concepts.Delegator;
-
 import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import org.opendaylight.yangtools.concepts.Delegator;
 
 /**
  *
  * Utility functions for {@link SchemaSourceProvider}
  *
+ *
+ * @deprecated Utility classes for deprecated APIs.
  */
+@Deprecated
 public final class SchemaSourceProviders {
 
     @SuppressWarnings("rawtypes")

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceTransformation.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceTransformation.java
index 6836618a85d78afc0363c300a0c382aa64ddd066..4282463e8c7564263d7b6083ac736f701a78ba43 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceTransformation.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SchemaSourceTransformation.java
@@ -33,8 +33,11 @@ import com.google.common.annotations.Beta;
  *
  * @param <I> Input schema source representation
  * @param <O> Output schema source representation
+ *
+ * @deprecated Replaced with {@link org.opendaylight.yangtools.yang.model.repo.util.SchemaSourceTransformer}
  */
 @Beta
+@Deprecated
 public interface SchemaSourceTransformation<I, O> {
 
     /**

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SourceIdentifier.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SourceIdentifier.java
index 3c7812b0d81d5cbc58fe3087ba7d7a8cce9c7b4c..44e6dccf6468328aa90df938ce22de5cbe185b69 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SourceIdentifier.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/SourceIdentifier.java
@@ -7,9 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.model.util.repo;
 
-import org.opendaylight.yangtools.concepts.Immutable;
-
 import com.google.common.base.Optional;
+import org.opendaylight.yangtools.concepts.Immutable;
 
 /**
  *
@@ -34,7 +33,9 @@ import com.google.common.base.Optional;
  * http://tools.ietf.org/html/rfc6022#section-3.1 ).
  *
  *
+ * @deprecated Replaced with {@link org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier}
  */
+@Deprecated
 public final class SourceIdentifier implements Immutable {
 
     private final String name;

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java
index 502bc9da9b9fff04bf967f8688356a97d13c9e9d..69e07e809a4b0fcc994f5ba06bb775563607e26b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java
@@ -1,9 +1,8 @@
 package org.opendaylight.yangtools.yang.model.util.repo;
 
-import org.opendaylight.yangtools.concepts.Delegator;
-
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import org.opendaylight.yangtools.concepts.Delegator;
 
 /**
  *
@@ -16,7 +15,10 @@ import com.google.common.base.Preconditions;
  *            Representation of schema sources used by delegate
  * @param <O>
  *            Representation of schema sources exposed by this provider
+ *
+ * @deprecated Replaced with {@link org.opendaylight.yangtools.yang.model.repo.util.SchemaSourceTransformer}
  */
+@Deprecated
 public final class TransformingSourceProvider<I, O> implements //
         AdvancedSchemaSourceProvider<O>, Delegator<AdvancedSchemaSourceProvider<I>> {
 

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java
index 46c2f8240d3cb08f8eb28cce17da647125ebc0df..bbe69e0410b701c924ef3972b81ca1400fb9df64 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java
@@ -45,6 +45,7 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
  * @see SubmoduleDependencyInfo
  *
  */
+
 public abstract class YangModelDependencyInfo {
 
     private final String name;

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContext.java
index 0a1cdf4f36131b7165c7f7bbdd668f5ca46ba6e4..a0ddc56b0a99dd5b42cc8d44f9aac5702240d4f0 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContext.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContext.java
@@ -57,6 +57,7 @@ import org.opendaylight.yangtools.yang.parser.builder.impl.BuilderUtils;
  *
  */
 // FIXME: for some reason this class is Closeable even though close is never called and no resources are leaked
+@Deprecated
 @ThreadSafe
 public class YangSourceContext implements AdvancedSchemaSourceProvider<InputStream>, Closeable,
         Delegator<AdvancedSchemaSourceProvider<InputStream>> {
@@ -70,11 +71,11 @@ public class YangSourceContext implements AdvancedSchemaSourceProvider<InputStre
 
     /**
      * Construct YANG Source Context
-     * 
+     *
      * @param validSourcesSet Set of identifiers of valid sources
      * @param missingSourcesSet Set of identifiers of missing sources
      * @param missingDependenciesMap Map of identifiers of resolved sources and their missing imports.
-     * @param sourceProvider Source provider which was used for context resolution or 
+     * @param sourceProvider Source provider which was used for context resolution or
      *          null if provider was not used.
      */
     YangSourceContext(final ImmutableSet<SourceIdentifier> validSourcesSet,

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java
index 27db5a0de010d35b7ff385ccaecd323abe5474f7..a960a2f3783c28333d5ec04a2b08c1e2569501fb 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceContextResolver.java
@@ -56,36 +56,37 @@ import org.slf4j.LoggerFactory;
  * </ul>
  *
  */
+@Deprecated
 @NotThreadSafe
 public abstract class YangSourceContextResolver {
 
     /**
-     * 
+     *
      * State of source code resolution
-     * 
+     *
      */
     public enum ResolutionState {
         /**
-         * 
+         *
          * Source was missing during source resolution
-         * 
+         *
          */
-        MISSING_SOURCE, 
+        MISSING_SOURCE,
         /**
-         * 
-         * One or multiple of dependencies of source are missing 
-         * 
+         *
+         * One or multiple of dependencies of source are missing
+         *
          */
-        MISSING_DEPENDENCY, 
+        MISSING_DEPENDENCY,
         /**
          * Other error ocurred during resolution
-         * 
+         *
          */
-        OTHER_ERROR, 
+        OTHER_ERROR,
         /**
          * Source, its dependencies and its transient dependencies
          * are resolved.
-         * 
+         *
          */
         EVERYTHING_OK,
     }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromCapabilitiesResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromCapabilitiesResolver.java
index cf3f5f2999ce767887cc806a81dfa55ecd277dc2..5d09777914f98967f5222a7b57ca8fae3bfe8d7a 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromCapabilitiesResolver.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromCapabilitiesResolver.java
@@ -24,6 +24,7 @@ import org.opendaylight.yangtools.yang.model.util.repo.SourceIdentifier;
  * and there is {@link SchemaSourceProvider} able to retrieve YANG models.
  *
  */
+@Deprecated
 public final class YangSourceFromCapabilitiesResolver extends YangSourceContextResolver {
 
     private final Iterable<QName> capabilities;

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromDependencyInfoResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromDependencyInfoResolver.java
index 85f3f6c21b7ed35980a61deba16980129a51ea12..4af02ed9f942e53f67ea524fc3c14a70906c482f 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromDependencyInfoResolver.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangSourceFromDependencyInfoResolver.java
@@ -25,6 +25,7 @@ import org.opendaylight.yangtools.yang.model.util.repo.SourceIdentifier;
  * {@link YangSourceContext}.
  *
  */
+@Deprecated
 @NotThreadSafe
 public final class YangSourceFromDependencyInfoResolver extends YangSourceContextResolver {
 

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java
index a8aef6984b964177e98270b7492b31b254fb4e40..d2ff63d0319ccc6b429ef12e60e0556edd29167f 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolverTest.java
@@ -17,6 +17,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.parser.impl.util.YangModelDependencyInfo;
 
+@Deprecated
 public class DependencyResolverTest {
 
     @Test