Re: svn commit: r1241124 - in /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2: ./ internal/

Mon, 06 Feb 2012 11:47:03 -0800

+1 for that! it was getting pretty packed in the main package ;-) Please have a look at AssertionsTest as well (imports have to be changed). 

Regards,
Benedikt

Am 06.02.2012 20:41, schrieb simonetrip...@apache.org:

Author: simonetripodi
Date: Mon Feb  6 19:41:07 2012
New Revision: 1241124

URL: http://svn.apache.org/viewvc?rev=1241124&view=rev
Log:
moved the Assertions class in a separate package, just realized not everything 
can be contained in the main package and that class can be reused

Added:
     
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/
     
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java
       - copied, changed from r1237727, 
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java
Removed:
     
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java
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/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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -22,9 +22,9 @@ 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.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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 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

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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
   * under the License.
   */

-import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.internal.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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 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.Assertions.checkNoneIsNull;
-import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static 
org.apache.commons.beanutils2.internal.Assertions.checkNoneIsNull;
+import static org.apache.commons.beanutils2.internal.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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -20,8 +20,8 @@ package org.apache.commons.beanutils2;
   */

  import static java.lang.String.format;
-import static org.apache.commons.beanutils2.Assertions.checkArgument;
-import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.internal.Assertions.checkArgument;
+import static org.apache.commons.beanutils2.internal.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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -20,8 +20,8 @@ package org.apache.commons.beanutils2;
   */

  import static org.apache.commons.beanutils2.Argument.getParameterTypes;
-import static org.apache.commons.beanutils2.Assertions.checkNoneIsNull;
-import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static 
org.apache.commons.beanutils2.internal.Assertions.checkNoneIsNull;
+import static org.apache.commons.beanutils2.internal.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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -21,7 +21,7 @@ package org.apache.commons.beanutils2;

  import static java.lang.Thread.currentThread;

-import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.internal.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=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
   * under the License.
   */

-import static org.apache.commons.beanutils2.Assertions.checkArgument;
+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/DefaultIndexedPropertySetterAccessor.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultIndexedPropertySetterAccessor.java?rev=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
   * under the License.
   */

-import static org.apache.commons.beanutils2.Assertions.checkArgument;
+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/TypeUtils.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/TypeUtils.java?rev=1241124&r1=1241123&r2=1241124&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
 Mon Feb  6 19:41:07 2012
@@ -19,7 +19,7 @@ package org.apache.commons.beanutils2;
   * under the License.
   */

-import static org.apache.commons.beanutils2.Assertions.checkNotNull;
+import static org.apache.commons.beanutils2.internal.Assertions.checkNotNull;

  final class TypeUtils
  {

Copied: 
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java
 (from r1237727, 
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java)
URL: 
http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java?p2=commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java&p1=commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java&r1=1237727&r2=1241124&rev=1241124&view=diff
==============================================================================
--- 
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/Assertions.java
 (original)
+++ 
commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/internal/Assertions.java
 Mon Feb  6 19:41:07 2012
@@ -1,4 +1,4 @@
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.internal;

  /*
   * 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
   */
-final class Assertions
+public final class Assertions
  {

      private Assertions()




---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org

Reply via email to