From a6b8387d25b63475f0c6a198f3ad1baea66660ef Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 8 Oct 2018 12:42:26 +0200
Subject: [PATCH] Remove mdsal-binding-util javax.annotation.Nullable reference

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

JIRA: MDSAL-373
Change-Id: Iace3fb91218fae8ccc8d65b5f295f865dc1ba94c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 binding/mdsal-binding-util/pom.xml               | 15 +++++++++++++++
 .../binding/util/TypedWriteTransactionImpl.java  | 16 ++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml
index 7938360b15..bcf0dccf5f 100644
--- a/binding/mdsal-binding-util/pom.xml
+++ b/binding/mdsal-binding-util/pom.xml
@@ -53,6 +53,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>!javax.annotation,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedWriteTransactionImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedWriteTransactionImpl.java
index 85746cceaf..a72069eb3e 100644
--- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedWriteTransactionImpl.java
+++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/TypedWriteTransactionImpl.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.util;
 
-import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -22,38 +21,39 @@ class TypedWriteTransactionImpl<D extends Datastore> extends TypedTransaction<D>
     // Temporarily package protected for TransactionAdapter
     final WriteTransaction delegate;
 
-    TypedWriteTransactionImpl(Class<D> datastoreType, WriteTransaction realTx) {
+    TypedWriteTransactionImpl(final Class<D> datastoreType, final WriteTransaction realTx) {
         super(datastoreType);
         this.delegate = realTx;
     }
 
     @Override
-    public <T extends DataObject> void put(InstanceIdentifier<T> path, T data) {
+    public <T extends DataObject> void put(final InstanceIdentifier<T> path, final T data) {
         delegate.put(getDatastoreType(), path, data);
     }
 
     @Override
-    public <T extends DataObject> void put(InstanceIdentifier<T> path, T data, boolean createMissingParents) {
+    public <T extends DataObject> void put(final InstanceIdentifier<T> path, final T data,
+            final boolean createMissingParents) {
         delegate.put(getDatastoreType(), path, data, createMissingParents);
     }
 
     @Override
-    public <T extends DataObject> void merge(InstanceIdentifier<T> path, T data) {
+    public <T extends DataObject> void merge(final InstanceIdentifier<T> path, final T data) {
         delegate.merge(getDatastoreType(), path, data);
     }
 
     @Override
-    public <T extends DataObject> void merge(InstanceIdentifier<T> path, T data, boolean createMissingParents) {
+    public <T extends DataObject> void merge(final InstanceIdentifier<T> path, final T data,
+            final boolean createMissingParents) {
         delegate.merge(getDatastoreType(), path, data, createMissingParents);
     }
 
     @Override
-    public void delete(InstanceIdentifier<?> path) {
+    public void delete(final InstanceIdentifier<?> path) {
         delegate.delete(getDatastoreType(), path);
     }
 
     @Override
-    @Nonnull
     public Object getIdentifier() {
         return delegate.getIdentifier();
     }
-- 
2.36.6