BUG-865: remove use of yang.model.util.repo

This package is deprecated and about to be removed. Remove all
references to it.

Change-Id: Ie962aa4bdc6400b70def7f2486356b123ff19eb4
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaContextProviderFactory.java b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaContextProviderFactory.java
deleted file mode 100644 (file)
index 637de11..0000000
--- a/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaContextProviderFactory.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2014 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.netconf.sal.connect.api;
-
-import java.io.InputStream;
-import java.util.Collection;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
-import org.opendaylight.yangtools.yang.model.util.repo.SchemaSourceProvider;
-
-public interface SchemaContextProviderFactory {
-
-    SchemaContextProvider createContextProvider(Collection<QName> capabilities, SchemaSourceProvider<InputStream> sourceProvider);
-
-}
\ No newline at end of file

diff --git a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java
index ea726da8cd58878e5816cae0405162b89fca0e34..9ec9464d93908613d6e8a677af167a3940a352d3 100644 (file)
--- a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java
+++ b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/NetconfDeviceConnectionManager.java
@@ -13,7 +13,6 @@ import io.netty.util.HashedWheelTimer;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.InetSocketAddress;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -31,10 +30,6 @@ import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
 import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.repo.util.FilesystemSchemaSourceCache;
-import org.opendaylight.yangtools.yang.model.util.repo.AbstractCachingSchemaSourceProvider;
-import org.opendaylight.yangtools.yang.model.util.repo.FilesystemSchemaCachingProvider;
-import org.opendaylight.yangtools.yang.model.util.repo.SchemaSourceProvider;
-import org.opendaylight.yangtools.yang.model.util.repo.SchemaSourceProviders;
 import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository;
 import org.opendaylight.yangtools.yang.parser.util.TextToASTTransformer;
 
@@ -125,14 +120,6 @@ public class NetconfDeviceConnectionManager implements Closeable {
         handler = null;
     }
 
-    private static AbstractCachingSchemaSourceProvider<String, InputStream> getGlobalNetconfSchemaProvider() {
-        // FIXME move to args
-        final String storageFile = "cache/schema";
-        final File directory = new File(storageFile);
-        final SchemaSourceProvider<String> defaultProvider = SchemaSourceProviders.noopProvider();
-        return FilesystemSchemaCachingProvider.createFromStringSourceProvider(defaultProvider, directory);
-    }
-
     @Override
     public void close() throws IOException {
         executor.shutdownNow();

diff --git a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/BasicDataHolderReader.java b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/BasicDataHolderReader.java
index a2baea3b1bc621fe5bde3ebea2512912618cd715..e8c51b4d42e411eb2e0c5330044f0c21c5a293dd 100644 (file)
--- a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/BasicDataHolderReader.java
+++ b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/BasicDataHolderReader.java
@@ -9,7 +9,6 @@ package org.opendaylight.netconf.cli.reader.impl;
 
 import static org.opendaylight.netconf.cli.io.IOUtil.isSkipInput;
 import static org.opendaylight.netconf.cli.io.IOUtil.listType;
-
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.BiMap;
@@ -161,7 +160,7 @@ public abstract class BasicDataHolderReader<T extends DataSchemaNode> extends Ab
             return type;
         }
 
-        private Optional<TypeDefinitionAwareCodec<Object, ? extends TypeDefinition<?>>> getCodecForType(
+        private static Optional<TypeDefinitionAwareCodec<Object, ? extends TypeDefinition<?>>> getCodecForType(
                 final TypeDefinition<?> type) {
             if (type != null) {
                 return Optional

diff --git a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ChoiceReader.java b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ChoiceReader.java
index a7ace645a3b8dc9630a236048f9608bdbdc361e2..e44041c831d56940190e6a457e2afc0c4c9120e4 100644 (file)
--- a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ChoiceReader.java
+++ b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ChoiceReader.java
@@ -99,7 +99,7 @@ public class ChoiceReader extends AbstractReader<ChoiceSchemaNode> {
         return newNodes;
     }
 
-    private Object formatSet(final Set<String> values) {
+    private static Object formatSet(final Set<String> values) {
         final StringBuilder formatedValues = new StringBuilder();
         for (final String value : values) {
             formatedValues.append("\n  ");
@@ -108,7 +108,7 @@ public class ChoiceReader extends AbstractReader<ChoiceSchemaNode> {
         return formatedValues.toString();
     }
 
-    private boolean containsOnlyOneEmptyLeaf(final ChoiceCaseNode selectedCase) {
+    private static boolean containsOnlyOneEmptyLeaf(final ChoiceCaseNode selectedCase) {
         if (selectedCase.getChildNodes().size() != 1) {
             return false;
         }
@@ -122,7 +122,7 @@ public class ChoiceReader extends AbstractReader<ChoiceSchemaNode> {
         return false;
     }
 
-    private Map<String, ChoiceCaseNode> collectAllCases(final ChoiceSchemaNode schemaNode) {
+    private static Map<String, ChoiceCaseNode> collectAllCases(final ChoiceSchemaNode schemaNode) {
         return Maps.uniqueIndex(schemaNode.getCases(), new Function<ChoiceCaseNode, String>() {
             @Override
             public String apply(final ChoiceCaseNode input) {

diff --git a/opendaylight/netconf/tools/netconf-cli/src/test/java/org/opendaylight/netconf/cli/NetconfCliTest.java b/opendaylight/netconf/tools/netconf-cli/src/test/java/org/opendaylight/netconf/cli/NetconfCliTest.java
index ac56127e513488f51dd55e2928628cdf7336f35e..b0ce5b96927f379ae0c8564695451bee43233d9e 100644 (file)
--- a/opendaylight/netconf/tools/netconf-cli/src/test/java/org/opendaylight/netconf/cli/NetconfCliTest.java
+++ b/opendaylight/netconf/tools/netconf-cli/src/test/java/org/opendaylight/netconf/cli/NetconfCliTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.netconf.cli;
 
 import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.netconf.cli.io.IOUtil.PROMPT_SUFIX;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -113,15 +112,15 @@ public class NetconfCliTest {
 
     }
 
-    private Deque<String> value(final String... values) {
+    private static Deque<String> value(final String... values) {
         return new ArrayDeque<>(Arrays.asList(values));
     }
 
-    private String prompt(final String path) {
+    private static String prompt(final String path) {
         return "/localhost" + path + PROMPT_SUFIX;
     }
 
-    private DataSchemaNode findTopLevelElement(final String namespace, final String revision,
+    private static DataSchemaNode findTopLevelElement(final String namespace, final String revision,
             final String topLevelElement, final SchemaContext schemaContext) {
         final QName requiredElement = QName.create(namespace, revision, topLevelElement);
         for (final DataSchemaNode dataSchemaNode : schemaContext.getChildNodes()) {