Author: tn
Date: Sun Mar 17 18:21:58 2013
New Revision: 1457508
URL: http://svn.apache.org/r1457508
Log:
[COLLECTIONS-451] Hide constructors for *Utils classes.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/BagUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ClosureUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ComparatorUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/EnumerationUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/FactoryUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IteratorUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ListUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/MapUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SetUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/BagUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/BagUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/BagUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/BagUtils.java
Sun Mar 17 18:21:58 2013
@@ -47,11 +47,9 @@ public class BagUtils {
UnmodifiableSortedBag.unmodifiableSortedBag(new TreeBag<Object>());
/**
- * Instantiation of BagUtils is not intended or required. However, some
- * tools require an instance to operate.
+ * Instantiation of BagUtils is not intended or required.
*/
- public BagUtils() {
- }
+ private BagUtils() {}
//-----------------------------------------------------------------------
/**
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ClosureUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ClosureUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ClosureUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ClosureUtils.java
Sun Mar 17 18:21:58 2013
@@ -55,9 +55,7 @@ public class ClosureUtils {
/**
* This class is not normally instantiated.
*/
- public ClosureUtils() {
- super();
- }
+ private ClosureUtils() {}
/**
* Gets a Closure that always throws an exception.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/CollectionUtils.java
Sun Mar 17 18:21:58 2013
@@ -195,8 +195,7 @@ public class CollectionUtils {
/**
* <code>CollectionUtils</code> should not normally be instantiated.
*/
- public CollectionUtils() {
- }
+ private CollectionUtils() {}
/**
* Returns the immutable EMPTY_COLLECTION with generic type safety.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ComparatorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ComparatorUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ComparatorUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ComparatorUtils.java
Sun Mar 17 18:21:58 2013
@@ -43,8 +43,7 @@ public class ComparatorUtils {
/**
* ComparatorUtils should not normally be instantiated.
*/
- public ComparatorUtils() {
- }
+ private ComparatorUtils() {}
/**
* Comparator for natural sort order.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/EnumerationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/EnumerationUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/EnumerationUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/EnumerationUtils.java
Sun Mar 17 18:21:58 2013
@@ -34,9 +34,7 @@ public class EnumerationUtils {
/**
* EnumerationUtils is not normally instantiated.
*/
- public EnumerationUtils() {
- // no init.
- }
+ private EnumerationUtils() {}
/**
* Creates a list based on an enumeration.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/FactoryUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/FactoryUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/FactoryUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/FactoryUtils.java
Sun Mar 17 18:21:58 2013
@@ -41,9 +41,7 @@ public class FactoryUtils {
/**
* This class is not normally instantiated.
*/
- public FactoryUtils() {
- super();
- }
+ private FactoryUtils() {}
/**
* Gets a Factory that always throws an exception.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IteratorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IteratorUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IteratorUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/IteratorUtils.java
Sun Mar 17 18:21:58 2013
@@ -112,8 +112,7 @@ public class IteratorUtils {
/**
* IteratorUtils is not normally instantiated.
*/
- public IteratorUtils() {
- }
+ private IteratorUtils() {}
// Empty
//-----------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ListUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ListUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ListUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/ListUtils.java
Sun Mar 17 18:21:58 2013
@@ -50,8 +50,7 @@ public class ListUtils {
/**
* <code>ListUtils</code> should not normally be instantiated.
*/
- public ListUtils() {
- }
+ private ListUtils() {}
//-----------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/MapUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/MapUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/MapUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/MapUtils.java
Sun Mar 17 18:21:58 2013
@@ -97,8 +97,7 @@ public class MapUtils {
/**
* <code>MapUtils</code> should not normally be instantiated.
*/
- public MapUtils() {
- }
+ private MapUtils() {}
// Type safe getters
//-------------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
Sun Mar 17 18:21:58 2013
@@ -74,9 +74,7 @@ public class PredicateUtils {
/**
* This class is not normally instantiated.
*/
- public PredicateUtils() {
- super();
- }
+ private PredicateUtils() {}
// Simple predicates
//-----------------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SetUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SetUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SetUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SetUtils.java
Sun Mar 17 18:21:58 2013
@@ -77,8 +77,7 @@ public class SetUtils {
/**
* <code>SetUtils</code> should not normally be instantiated.
*/
- public SetUtils() {
- }
+ private SetUtils() {}
//-----------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
Sun Mar 17 18:21:58 2013
@@ -41,8 +41,9 @@ public class SplitMapUtils {
/**
* <code>SplitMapUtils</code> should not normally be instantiated.
*/
- public SplitMapUtils() {
- }
+ private SplitMapUtils() {}
+
+ //-----------------------------------------------------------------------
private static class WrappedGet<K, V> implements IterableMap<K, V>,
Unmodifiable {
private final Get<K, V> get;
@@ -193,6 +194,8 @@ public class SplitMapUtils {
}
}
+ //-----------------------------------------------------------------------
+
/**
* Get the specified {@link Get} as an instance of {@link IterableMap}.
* If <code>get</code> implements {@link IterableMap} directly, no
conversion will take place.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/TransformerUtils.java
Sun Mar 17 18:21:58 2013
@@ -64,9 +64,7 @@ public class TransformerUtils {
/**
* This class is not normally instantiated.
*/
- public TransformerUtils() {
- super();
- }
+ private TransformerUtils() {}
/**
* Gets a transformer that always throws an exception.
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java?rev=1457508&r1=1457507&r2=1457508&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java
Sun Mar 17 18:21:58 2013
@@ -1523,15 +1523,6 @@ public class CollectionUtilsTest extends
(Object)map, 0));
}
- /**
- * TODO: Should {@link CollectionUtils} be able to be extended? If it is
extended, subclasses must 'override' the static methods with
- * call-throughs anyhow, otherwise java compiler warnings will result
- */
- @Test
- public void ensureCollectionUtilsCanBeExtended() {
- new CollectionUtils() {};
- }
-
@Test
public void reverse() {
CollectionUtils.reverseArray(new Object[] {});
