You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2012/06/19 14:27:31 UTC
svn commit: r1351671 - in /commons/sandbox/beanutils2/trunk/src: main/java/org/apache/commons/beanutils2/ main/java/org/apache/commons/beanutils2/internal/ test/java/org/apache/commons/beanutils2/ test/java/org/apache/commons/beanutils2/internal/

Author: simonetripodi
Date: Tue Jun 19 12:27:30 2012
New Revision: 1351671

URL: http://svn.apache.org/viewvc?rev=1351671&view=rev
Log:
no more use of `internal` package

Added:
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java
      - copied, changed from r1243711, commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java
    commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/AssertionsTest.java
      - copied, changed from r1243711, commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/internal/AssertionsTest.java
Removed:
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/
    commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/internal/
Modified:
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Argument.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultArgumentsAccessor.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanProperties.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanPropertySetter.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassLoaderBuilder.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertyGetterAccessor.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertySetterAccessor.java
    commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/TypeUtils.java

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/AccessibleObjectsRegistry.java Tue Jun 19 12:27:30 2012
@@ -22,10 +22,10 @@ package org.apache.commons.beanutils2;
 import static java.lang.System.getSecurityManager;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.security.AccessController.doPrivileged;
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
 import static org.apache.commons.beanutils2.TypeUtils.checkTypesCompatible;
 import static org.apache.commons.beanutils2.TypeUtils.getPrimitiveWrapper;
 import static org.apache.commons.beanutils2.TypeUtils.isAssignmentCompatible;
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Argument.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Argument.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Argument.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Argument.java Tue Jun 19 12:27:30 2012
@@ -19,9 +19,9 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 import static org.apache.commons.beanutils2.TypeUtils.isAssignmentCompatible;
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
 
 /**
  * An argument represents a value of some type that can be passed to a method or

Copied: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java (from r1243711, commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java?p2=commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java&p1=commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java&r1=1243711&r2=1351671&rev=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java Tue Jun 19 12:27:30 2012
@@ -1,4 +1,4 @@
-package org.apache.commons.beanutils2.internal;
+package org.apache.commons.beanutils2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import static java.lang.String.format;
 /**
  * Code partially extracted from Google Collections
  */
-public final class Assertions
+final class Assertions
 {
 
     private Assertions()

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanUtils.java Tue Jun 19 12:27:30 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 
 public final class BeanUtils
 {

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultArgumentsAccessor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultArgumentsAccessor.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultArgumentsAccessor.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultArgumentsAccessor.java Tue Jun 19 12:27:30 2012
@@ -22,8 +22,8 @@ package org.apache.commons.beanutils2;
 import static java.lang.String.format;
 import static org.apache.commons.beanutils2.Argument.getParameterTypes;
 import static org.apache.commons.beanutils2.Argument.getParameters;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNoneIsNull;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkNoneIsNull;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanAccessor.java Tue Jun 19 12:27:30 2012
@@ -19,8 +19,8 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 import static org.apache.commons.beanutils2.BeanUtils.on;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
 
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanProperties.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanProperties.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanProperties.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanProperties.java Tue Jun 19 12:27:30 2012
@@ -18,8 +18,8 @@ package org.apache.commons.beanutils2;
  */
 
 import static java.lang.String.format;
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 
 import java.beans.IndexedPropertyDescriptor;
 import java.beans.IntrospectionException;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanPropertySetter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanPropertySetter.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanPropertySetter.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultBeanPropertySetter.java Tue Jun 19 12:27:30 2012
@@ -19,8 +19,8 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
 import static org.apache.commons.beanutils2.TypeUtils.isAssignmentCompatible;
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java Tue Jun 19 12:27:30 2012
@@ -20,8 +20,8 @@ package org.apache.commons.beanutils2;
  */
 
 import static org.apache.commons.beanutils2.Argument.getParameterTypes;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNoneIsNull;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkNoneIsNull;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassLoaderBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassLoaderBuilder.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassLoaderBuilder.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassLoaderBuilder.java Tue Jun 19 12:27:30 2012
@@ -20,7 +20,7 @@ package org.apache.commons.beanutils2;
  */
 
 import static java.lang.Thread.currentThread;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 
 final class DefaultClassLoaderBuilder
     implements ClassLoaderBuilder

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertyGetterAccessor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertyGetterAccessor.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertyGetterAccessor.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertyGetterAccessor.java Tue Jun 19 12:27:30 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertySetterAccessor.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertySetterAccessor.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertySetterAccessor.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertySetterAccessor.java Tue Jun 19 12:27:30 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/TypeUtils.java
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/TypeUtils.java?rev=1351671&r1=1351670&r2=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/TypeUtils.java (original)
+++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/TypeUtils.java Tue Jun 19 12:27:30 2012
@@ -19,8 +19,8 @@ package org.apache.commons.beanutils2;
  * under the License.
  */
 
-import static org.apache.commons.beanutils2.internal.Assertions.checkNoneIsNull;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkNoneIsNull;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
 
 final class TypeUtils
 {

Copied: commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/AssertionsTest.java (from r1243711, commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/internal/AssertionsTest.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/AssertionsTest.java?p2=commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/AssertionsTest.java&p1=commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/internal/AssertionsTest.java&r1=1243711&r2=1351671&rev=1351671&view=diff
==============================================================================
--- commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/internal/AssertionsTest.java (original)
+++ commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/AssertionsTest.java Tue Jun 19 12:27:30 2012
@@ -1,4 +1,4 @@
-package org.apache.commons.beanutils2.internal;
+package org.apache.commons.beanutils2;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,10 +20,10 @@ package org.apache.commons.beanutils2.in
  */
 
 import static java.util.Arrays.fill;
-import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNoneIsNull;
-import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;
-import static org.apache.commons.beanutils2.internal.Assertions.checkState;
+import static org.apache.commons.beanutils2.Assertions.checkArgument;
+import static org.apache.commons.beanutils2.Assertions.checkNoneIsNull;
+import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.Assertions.checkState;
 import static org.junit.Assert.assertSame;
 
 import org.junit.Rule;