Migrate mdsal-dom-schema-service-osgi to JDT annotations

This removes the use of javax.annotation nullable annotations
to remove import-package.

Change-Id: Ife7598dcaca40e2bacc32f2da679cd85f60c1567
JIRA: MDSAL-373
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-schema-service-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/service/osgi/OsgiBundleScanningSchemaService.java b/dom/mdsal-dom-schema-service-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/service/osgi/OsgiBundleScanningSchemaService.java
index 859f8ffc0192fecf99192d57bc82b3224573b460..4180c1339883c4fd92e9388bedbc6f961902dc25 100644 (file)
--- a/dom/mdsal-dom-schema-service-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/service/osgi/OsgiBundleScanningSchemaService.java
+++ b/dom/mdsal-dom-schema-service-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/service/osgi/OsgiBundleScanningSchemaService.java
@@ -8,8 +8,9 @@
 package org.opendaylight.mdsal.dom.schema.service.osgi;
 
 import static com.google.common.base.Preconditions.checkState;
 package org.opendaylight.mdsal.dom.schema.service.osgi;
 
 import static com.google.common.base.Preconditions.checkState;

+import static java.util.Objects.requireNonNull;
+

 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.annotations.VisibleForTesting;

-import com.google.common.base.Preconditions;

 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import java.net.URL;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import java.net.URL;


@@ -18,8 +19,8 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;

-import javax.annotation.Nonnull;

 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.GuardedBy;

+import org.eclipse.jdt.annotation.NonNull;

 import org.opendaylight.mdsal.dom.broker.schema.ScanningSchemaServiceProvider;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
 import org.opendaylight.mdsal.dom.broker.schema.ScanningSchemaServiceProvider;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;


@@ -54,12 +55,12 @@ public class OsgiBundleScanningSchemaService extends ScanningSchemaServiceProvid
     private volatile boolean stopping;
 
     private OsgiBundleScanningSchemaService(final BundleContext context) {
     private volatile boolean stopping;
 
     private OsgiBundleScanningSchemaService(final BundleContext context) {

-        this.context = Preconditions.checkNotNull(context);
+        this.context = requireNonNull(context);

     }
 
     }
 

-    public static @Nonnull OsgiBundleScanningSchemaService createInstance(final BundleContext ctx) {
+    public static @NonNull OsgiBundleScanningSchemaService createInstance(final BundleContext ctx) {

         final OsgiBundleScanningSchemaService instance = new OsgiBundleScanningSchemaService(ctx);
         final OsgiBundleScanningSchemaService instance = new OsgiBundleScanningSchemaService(ctx);

-        Preconditions.checkState(GLOBAL_INSTANCE.compareAndSet(null, instance));
+        checkState(GLOBAL_INSTANCE.compareAndSet(null, instance));

         instance.start();
         return instance;
     }
         instance.start();
         return instance;
     }


@@ -90,7 +91,7 @@ public class OsgiBundleScanningSchemaService extends ScanningSchemaServiceProvid
 
     public static OsgiBundleScanningSchemaService getInstance() {
         final OsgiBundleScanningSchemaService instance = GLOBAL_INSTANCE.get();
 
     public static OsgiBundleScanningSchemaService getInstance() {
         final OsgiBundleScanningSchemaService instance = GLOBAL_INSTANCE.get();

-        Preconditions.checkState(instance != null, "Global Instance was not instantiated");
+        checkState(instance != null, "Global Instance was not instantiated");

         return instance;
     }
 
         return instance;
     }
 


@@ -98,7 +99,6 @@ public class OsgiBundleScanningSchemaService extends ScanningSchemaServiceProvid
     public static void destroyInstance() throws Exception {
         final OsgiBundleScanningSchemaService instance = GLOBAL_INSTANCE.getAndSet(null);
         if (instance != null) {
     public static void destroyInstance() throws Exception {
         final OsgiBundleScanningSchemaService instance = GLOBAL_INSTANCE.getAndSet(null);
         if (instance != null) {

-

             instance.closeInstance();
         }
     }
             instance.closeInstance();
         }
     }