Fix a few formatting issues

[aaa.git] / aaa-authn / src / main / java / org / opendaylight / aaa / SecureBlockingQueue.java

diff --git a/aaa-authn/src/main/java/org/opendaylight/aaa/SecureBlockingQueue.java b/aaa-authn/src/main/java/org/opendaylight/aaa/SecureBlockingQueue.java
index 7544df5b9978aa4b005b93815a1edf12b04bfd6d..2a9255412674f93983b822ea8c5bc23659e29cc0 100644 (file)
--- a/aaa-authn/src/main/java/org/opendaylight/aaa/SecureBlockingQueue.java
+++ b/aaa-authn/src/main/java/org/opendaylight/aaa/SecureBlockingQueue.java
@@ -13,7 +13,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import org.opendaylight.aaa.api.Authentication;
 
 /**
@@ -42,11 +41,29 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
         return setAuth(queue.remove());
     }
 
+    @Override
+    public boolean remove(Object object) {
+        Iterator<SecureData<T>> it = queue.iterator();
+        while (it.hasNext()) {
+            SecureData<T> sd = it.next();
+            if (sd.data.equals(object)) {
+                return queue.remove(sd);
+            }
+        }
+        return false;
+    }
+
+
     @Override
     public T poll() {
         return setAuth(queue.poll());
     }
 
+    @Override
+    public T poll(long timeout, TimeUnit unit) throws InterruptedException {
+        return setAuth(queue.poll(timeout, unit));
+    }
+
     @Override
     public T element() {
         return setAuth(queue.element());
@@ -96,28 +113,28 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
 
     @SuppressWarnings("hiding")
     @Override
-    public <T> T[] toArray(T[] a) {
-        return toData().toArray(a);
+    public <T> T[] toArray(T[] array) {
+        return toData().toArray(array);
     }
 
     @Override
-    public boolean containsAll(Collection<?> c) {
-        return toData().containsAll(c);
+    public boolean containsAll(Collection<?> collection) {
+        return toData().containsAll(collection);
     }
 
     @Override
-    public boolean addAll(Collection<? extends T> c) {
-        return queue.addAll(fromData(c));
+    public boolean addAll(Collection<? extends T> collection) {
+        return queue.addAll(fromData(collection));
     }
 
     @Override
-    public boolean removeAll(Collection<?> c) {
-        return queue.removeAll(fromData(c));
+    public boolean removeAll(Collection<?> collection) {
+        return queue.removeAll(fromData(collection));
     }
 
     @Override
-    public boolean retainAll(Collection<?> c) {
-        return queue.retainAll(fromData(c));
+    public boolean retainAll(Collection<?> collection) {
+        return queue.retainAll(fromData(collection));
     }
 
     @Override
@@ -126,24 +143,23 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
     }
 
     @Override
-    public boolean add(T e) {
-        return queue.add(new SecureData<>(e));
+    public boolean add(T element) {
+        return queue.add(new SecureData<>(element));
     }
 
     @Override
-    public boolean offer(T e) {
-        return queue.offer(new SecureData<>(e));
+    public boolean offer(T element) {
+        return queue.offer(new SecureData<>(element));
     }
 
     @Override
-    public void put(T e) throws InterruptedException {
-        queue.put(new SecureData<T>(e));
+    public boolean offer(T element, long timeout, TimeUnit unit) throws InterruptedException {
+        return queue.offer(new SecureData<>(element), timeout, unit);
     }
 
     @Override
-    public boolean offer(T e, long timeout, TimeUnit unit)
-            throws InterruptedException {
-        return queue.offer(new SecureData<>(e), timeout, unit);
+    public void put(T element) throws InterruptedException {
+        queue.put(new SecureData<>(element));
     }
 
     @Override
@@ -151,34 +167,17 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
         return setAuth(queue.take());
     }
 
-    @Override
-    public T poll(long timeout, TimeUnit unit) throws InterruptedException {
-        return setAuth(queue.poll(timeout, unit));
-    }
-
     @Override
     public int remainingCapacity() {
         return queue.remainingCapacity();
     }
 
     @Override
-    public boolean remove(Object o) {
-        Iterator<SecureData<T>> it = queue.iterator();
-        while (it.hasNext()) {
-            SecureData<T> sd = it.next();
-            if (sd.data.equals(o)) {
-                return queue.remove(sd);
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean contains(Object o) {
+    public boolean contains(Object object) {
         Iterator<SecureData<T>> it = queue.iterator();
         while (it.hasNext()) {
             SecureData<T> sd = it.next();
-            if (sd.data.equals(o)) {
+            if (sd.data.equals(object)) {
                 return true;
             }
         }
@@ -186,32 +185,32 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
     }
 
     @Override
-    public int drainTo(Collection<? super T> c) {
+    public int drainTo(Collection<? super T> collection) {
         Collection<SecureData<T>> sd = new ArrayList<>();
-        int n = queue.drainTo(sd);
-        c.addAll(toData(sd));
-        return n;
+        int number = queue.drainTo(sd);
+        collection.addAll(toData(sd));
+        return number;
     }
 
     @Override
-    public int drainTo(Collection<? super T> c, int maxElements) {
+    public int drainTo(Collection<? super T> collection, int maxElements) {
         Collection<SecureData<T>> sd = new ArrayList<>();
-        int n = queue.drainTo(sd, maxElements);
-        c.addAll(toData(sd));
-        return n;
+        int number = queue.drainTo(sd, maxElements);
+        collection.addAll(toData(sd));
+        return number;
     }
 
     // Rehydrate security context
-    private T setAuth(SecureData<T> i) {
-        AuthenticationManager.instance().set(i.auth);
-        return i.data;
+    private T setAuth(SecureData<T> secureData) {
+        AuthenticationManager.instance().set(secureData.auth);
+        return secureData.data;
     }
 
     // Construct secure data collection from a plain old data collection
     @SuppressWarnings("unchecked")
-    private Collection<SecureData<T>> fromData(Collection<?> c) {
-        Collection<SecureData<T>> sd = new ArrayList<>(c.size());
-        for (Object d : c) {
+    private Collection<SecureData<T>> fromData(Collection<?> collection) {
+        Collection<SecureData<T>> sd = new ArrayList<>(collection.size());
+        for (Object d : collection) {
             sd.add((SecureData<T>) new SecureData<>(d));
         }
         return sd;
@@ -220,8 +219,7 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
     // Extract the data portion out from the secure data
     @SuppressWarnings("unchecked")
     private Collection<T> toData() {
-        return toData(Arrays.<SecureData<T>> asList(queue
-                .toArray(new SecureData[0])));
+        return toData(Arrays.<SecureData<T>>asList(queue.toArray(new SecureData[0])));
     }
 
     // Extract the data portion out from the secure data
@@ -246,12 +244,11 @@ public class SecureBlockingQueue<T> implements BlockingQueue<T> {
 
         @SuppressWarnings("rawtypes")
         @Override
-        public boolean equals(Object o) {
-            if (o == null) {
+        public boolean equals(Object object) {
+            if (object == null) {
                 return false;
             }
-            return (o instanceof SecureData)
-                    ? data.equals(((SecureData) o).data): false;
+            return object instanceof SecureData ? data.equals(((SecureData) object).data) : false;
         }
 
         @Override