Remove deprecated InMemoryDOMDataStoreFactory methods

These methods are taking the old SchemaService, remove them
in favor of the new methods which use DOMSchemaService.

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

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java
index aad39987fa9d5bb244319584ce27978d3cda7294..f5c5c4ac7b8d4122825ca5058726d354cca1e710 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java
@@ -10,7 +10,6 @@ package org.opendaylight.controller.md.sal.dom.store.impl;
 import java.util.concurrent.ExecutorService;
 import javax.annotation.Nullable;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import java.util.concurrent.ExecutorService;
 import javax.annotation.Nullable;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

-import org.opendaylight.controller.sal.core.api.model.SchemaService;

 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 


@@ -24,40 +23,11 @@ public final class InMemoryDOMDataStoreFactory {
     private InMemoryDOMDataStoreFactory() {
     }
 
     private InMemoryDOMDataStoreFactory() {
     }
 

-    /**
-     * Deprecated.
-     *
-     * @deprecated Use {@link #create(String, DOMSchemaService)} instead.
-     */
-    @Deprecated
-    public static InMemoryDOMDataStore create(final String name,
-            @Nullable final SchemaService schemaService) {
-        return create(name, (DOMSchemaService)schemaService);
-    }
-

     public static InMemoryDOMDataStore create(final String name,
             @Nullable final DOMSchemaService schemaService) {
         return create(name, schemaService, null);
     }
 
     public static InMemoryDOMDataStore create(final String name,
             @Nullable final DOMSchemaService schemaService) {
         return create(name, schemaService, null);
     }
 

-    /**
-     * Creates an InMemoryDOMDataStore instance.
-     *
-     * @param name the name of the data store
-     * @param schemaService the SchemaService to which to register the data store.
-     * @param properties configuration properties for the InMemoryDOMDataStore instance. If null,
-     *                   default property values are used.
-     * @return an InMemoryDOMDataStore instance
-     *
-     * @deprecated Use {@link #create(String, DOMSchemaService, InMemoryDOMDataStoreConfigProperties)} instead.
-     */
-    @Deprecated
-    public static InMemoryDOMDataStore create(final String name,
-            @Nullable final SchemaService schemaService,
-            @Nullable final InMemoryDOMDataStoreConfigProperties properties) {
-        return create(name, (DOMSchemaService) schemaService, properties);
-    }
-

     /**
      * Creates an InMemoryDOMDataStore instance.
      *
     /**
      * Creates an InMemoryDOMDataStore instance.
      *


@@ -73,47 +43,6 @@ public final class InMemoryDOMDataStoreFactory {
         return create(name, LogicalDatastoreType.OPERATIONAL, schemaService, false, properties);
     }
 
         return create(name, LogicalDatastoreType.OPERATIONAL, schemaService, false, properties);
     }
 

-    /**
-     * Creates an InMemoryDOMDataStore instance.
-     *
-     * @param name the name of the data store
-     * @param schemaService the SchemaService to which to register the data store.
-     * @param debugTransactions enable transaction debugging
-     * @param properties configuration properties for the InMemoryDOMDataStore instance. If null,
-     *                   default property values are used.
-     * @return an InMemoryDOMDataStore instance
-     *
-     * @deprecated Use {@link #create(String, LogicalDatastoreType, SchemaService, boolean,
-     *     InMemoryDOMDataStoreConfigProperties)} instead.
-     */
-    @Deprecated
-    public static InMemoryDOMDataStore create(final String name,
-            @Nullable final SchemaService schemaService, final boolean debugTransactions,
-            @Nullable final InMemoryDOMDataStoreConfigProperties properties) {
-        return create(name, LogicalDatastoreType.OPERATIONAL, schemaService, debugTransactions, properties);
-    }
-
-    /**
-     * Creates an InMemoryDOMDataStore instance.
-     *
-     * @param name the name of the data store
-     * @param type Data store type
-     * @param schemaService the SchemaService to which to register the data store.
-     * @param debugTransactions enable transaction debugging
-     * @param properties configuration properties for the InMemoryDOMDataStore instance. If null,
-     *                   default property values are used.
-     * @return an InMemoryDOMDataStore instance
-     *
-     * @deprecated Use {@link #create(String, LogicalDatastoreType, DOMSchemaService, boolean,
-     *                                InMemoryDOMDataStoreConfigProperties)} instead.
-     */
-    @Deprecated
-    public static InMemoryDOMDataStore create(final String name, final LogicalDatastoreType type,
-            @Nullable final SchemaService schemaService, final boolean debugTransactions,
-            @Nullable final InMemoryDOMDataStoreConfigProperties properties) {
-        return create(name, type, (DOMSchemaService) schemaService, debugTransactions, properties);
-    }
-

     /**
      * Creates an InMemoryDOMDataStore instance.
      *
     /**
      * Creates an InMemoryDOMDataStore instance.
      *