You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/07/07 17:36:07 UTC
commons-collections git commit: Remove redundant type arguments.
Repository: commons-collections
Updated Branches:
refs/heads/master e22859d09 -> 9f1dabed5
Remove redundant type arguments.
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/9f1dabed
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/9f1dabed
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/9f1dabed
Branch: refs/heads/master
Commit: 9f1dabed562e5953af25369121fa7fe221a20276
Parents: e22859d
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat Jul 7 11:36:04 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat Jul 7 11:36:04 2018 -0600
----------------------------------------------------------------------
.../collections4/queue/SynchronizedQueue.java | 286 +++++++++----------
.../commons/collections4/QueueUtilsTest.java | 2 +-
2 files changed, 144 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/9f1dabed/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java b/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
index 5eda57f..c82e0ec 100644
--- a/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
@@ -1,143 +1,143 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.collections4.queue;
-
-import java.util.Queue;
-
-import org.apache.commons.collections4.collection.SynchronizedCollection;
-
-/**
- * Decorates another {@link Queue} to synchronize its behaviour for a multi-threaded environment.
- * <p>
- * Methods are synchronized, then forwarded to the decorated queue. Iterators must be separately synchronized around the
- * loop.
- *
- * @param <E> the type of the elements in the collection
- * @since 4.2
- */
-public class SynchronizedQueue<E> extends SynchronizedCollection<E> implements Queue<E> {
-
- /** Serialization version */
- private static final long serialVersionUID = 1L;
-
- /**
- * Factory method to create a synchronized queue.
- *
- * @param <E>
- * the type of the elements in the queue
- * @param queue
- * the queue to decorate, must not be null
- * @return a new synchronized Queue
- * @throws NullPointerException
- * if queue is null
- */
- public static <E> SynchronizedQueue<E> synchronizedQueue(final Queue<E> queue) {
- return new SynchronizedQueue<E>(queue);
- }
-
- // -----------------------------------------------------------------------
- /**
- * Constructor that wraps (not copies).
- *
- * @param queue
- * the queue to decorate, must not be null
- * @throws NullPointerException
- * if queue is null
- */
- protected SynchronizedQueue(final Queue<E> queue) {
- super(queue);
- }
-
- /**
- * Constructor that wraps (not copies).
- *
- * @param queue
- * the queue to decorate, must not be null
- * @param lock
- * the lock to use, must not be null
- * @throws NullPointerException
- * if queue or lock is null
- */
- protected SynchronizedQueue(final Queue<E> queue, final Object lock) {
- super(queue, lock);
- }
-
- /**
- * Gets the queue being decorated.
- *
- * @return the decorated queue
- */
- @Override
- protected Queue<E> decorated() {
- return (Queue<E>) super.decorated();
- }
-
- @Override
- public E element() {
- synchronized (lock) {
- return decorated().element();
- }
- }
-
- @Override
- public boolean equals(final Object object) {
- if (object == this) {
- return true;
- }
- synchronized (lock) {
- return decorated().equals(object);
- }
- }
-
- // -----------------------------------------------------------------------
-
- @Override
- public int hashCode() {
- synchronized (lock) {
- return decorated().hashCode();
- }
- }
-
- @Override
- public boolean offer(final E e) {
- synchronized (lock) {
- return decorated().offer(e);
- }
- }
-
- @Override
- public E peek() {
- synchronized (lock) {
- return decorated().peek();
- }
- }
-
- @Override
- public E poll() {
- synchronized (lock) {
- return decorated().poll();
- }
- }
-
- @Override
- public E remove() {
- synchronized (lock) {
- return decorated().remove();
- }
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.collections4.queue;
+
+import java.util.Queue;
+
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+
+/**
+ * Decorates another {@link Queue} to synchronize its behaviour for a multi-threaded environment.
+ * <p>
+ * Methods are synchronized, then forwarded to the decorated queue. Iterators must be separately synchronized around the
+ * loop.
+ *
+ * @param <E> the type of the elements in the collection
+ * @since 4.2
+ */
+public class SynchronizedQueue<E> extends SynchronizedCollection<E> implements Queue<E> {
+
+ /** Serialization version */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Factory method to create a synchronized queue.
+ *
+ * @param <E>
+ * the type of the elements in the queue
+ * @param queue
+ * the queue to decorate, must not be null
+ * @return a new synchronized Queue
+ * @throws NullPointerException
+ * if queue is null
+ */
+ public static <E> SynchronizedQueue<E> synchronizedQueue(final Queue<E> queue) {
+ return new SynchronizedQueue<>(queue);
+ }
+
+ // -----------------------------------------------------------------------
+ /**
+ * Constructor that wraps (not copies).
+ *
+ * @param queue
+ * the queue to decorate, must not be null
+ * @throws NullPointerException
+ * if queue is null
+ */
+ protected SynchronizedQueue(final Queue<E> queue) {
+ super(queue);
+ }
+
+ /**
+ * Constructor that wraps (not copies).
+ *
+ * @param queue
+ * the queue to decorate, must not be null
+ * @param lock
+ * the lock to use, must not be null
+ * @throws NullPointerException
+ * if queue or lock is null
+ */
+ protected SynchronizedQueue(final Queue<E> queue, final Object lock) {
+ super(queue, lock);
+ }
+
+ /**
+ * Gets the queue being decorated.
+ *
+ * @return the decorated queue
+ */
+ @Override
+ protected Queue<E> decorated() {
+ return (Queue<E>) super.decorated();
+ }
+
+ @Override
+ public E element() {
+ synchronized (lock) {
+ return decorated().element();
+ }
+ }
+
+ @Override
+ public boolean equals(final Object object) {
+ if (object == this) {
+ return true;
+ }
+ synchronized (lock) {
+ return decorated().equals(object);
+ }
+ }
+
+ // -----------------------------------------------------------------------
+
+ @Override
+ public int hashCode() {
+ synchronized (lock) {
+ return decorated().hashCode();
+ }
+ }
+
+ @Override
+ public boolean offer(final E e) {
+ synchronized (lock) {
+ return decorated().offer(e);
+ }
+ }
+
+ @Override
+ public E peek() {
+ synchronized (lock) {
+ return decorated().peek();
+ }
+ }
+
+ @Override
+ public E poll() {
+ synchronized (lock) {
+ return decorated().poll();
+ }
+ }
+
+ @Override
+ public E remove() {
+ synchronized (lock) {
+ return decorated().remove();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/9f1dabed/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java b/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
index 418dd86..8842ff7 100644
--- a/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
@@ -43,7 +43,7 @@ public class QueueUtilsTest {
@Test
public void testSynchronizedQueue() {
- final Queue<Object> queue = QueueUtils.synchronizedQueue(new LinkedList<Object>());
+ final Queue<Object> queue = QueueUtils.synchronizedQueue(new LinkedList<>());
assertTrue("Returned object should be a SynchronizedQueue.", queue instanceof SynchronizedQueue);
try {
QueueUtils.synchronizedQueue(null);