X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-inmemory-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FInMemoryDOMDataStoreFactory.java;h=6571c60425ad3f1ccdbb52782dda3c7bef9c3c93;hb=refs%2Fchanges%2F11%2F80211%2F6;hp=dde694207c82f0d52917a99d94c95d0980ec38f9;hpb=20a32e6459fd1e27e7669bf1ebc7742b96787b94;p=controller.git

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 dde694207c..6571c60425 100644
--- 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
@@ -8,9 +8,8 @@
 package org.opendaylight.controller.md.sal.dom.store.impl;
 
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.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;
 
@@ -18,23 +17,16 @@ import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
  * A factory for creating InMemoryDOMDataStore instances.
  *
  * @author Thomas Pantelis
+ *
+ * @deprecated Use {@link org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory} instead.
  */
+@Deprecated
 public final class InMemoryDOMDataStoreFactory {
 
     private InMemoryDOMDataStoreFactory() {
     }
 
-    /**
-     * @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) {
+    public static InMemoryDOMDataStore create(final String name, final @Nullable DOMSchemaService schemaService) {
         return create(name, schemaService, null);
     }
 
@@ -46,72 +38,12 @@ public final class InMemoryDOMDataStoreFactory {
      * @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.
-     *
-     * @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
-     */
-    public static InMemoryDOMDataStore create(final String name,
-            @Nullable final DOMSchemaService schemaService,
-            @Nullable final InMemoryDOMDataStoreConfigProperties properties) {
+    public static InMemoryDOMDataStore create(final String name, final @Nullable DOMSchemaService schemaService,
+            final @Nullable InMemoryDOMDataStoreConfigProperties 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.
      *
@@ -124,8 +56,8 @@ public final class InMemoryDOMDataStoreFactory {
      * @return an InMemoryDOMDataStore instance
      */
     public static InMemoryDOMDataStore create(final String name, final LogicalDatastoreType type,
-            @Nullable final DOMSchemaService schemaService, final boolean debugTransactions,
-            @Nullable final InMemoryDOMDataStoreConfigProperties properties) {
+            final @Nullable DOMSchemaService schemaService, final boolean debugTransactions,
+            final @Nullable InMemoryDOMDataStoreConfigProperties properties) {
 
         InMemoryDOMDataStoreConfigProperties actualProperties = properties;
         if (actualProperties == null) {