svn commit: r1556985 - in /commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer: Normalizer.java Utils.java

[mb...@apache.org]

Author: mbenson
Date: Thu Jan  9 23:44:55 2014
New Revision: 1556985

URL: http://svn.apache.org/r1556985
Log:
use method from lang 3.2

Modified:
    commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
    commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Utils.java

Modified: commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java?rev=1556985&r1=1556984&r2=1556985&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java Thu Jan  9 23:44:55 2014
@@ -35,6 +35,7 @@ import javax.activation.DataSource;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.CharEncoding;
+import org.apache.commons.lang3.Conversion;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.tuple.MutablePair;
@@ -57,9 +58,15 @@ import org.objectweb.asm.commons.Remappe
 import org.objectweb.asm.commons.RemappingClassAdapter;
 import org.objectweb.asm.commons.SimpleRemapper;
 
+/**
+ * Handles the work of "normalizing" anonymous class definitions.
+ */
 public class Normalizer {
     private static final Type OBJECT_TYPE = Type.getType(Object.class);
 
+    /**
+     * Marker annotation.
+     */
     @Target(ElementType.TYPE)
     private @interface Marker {
     }
@@ -381,8 +388,8 @@ public class Normalizer {
     }
 
     /**
-     * Create the normalized version of a given class in the configured target package. The Normalizer will gladly
-     * create this in a package from which the normalized class will not actually be able to reference any types upon
+     * Create the normalized version of a given class in the configured target package. The {@link Normalizer} will
+     * gladly do so in a package from which the normalized class will not actually be able to reference any types upon
      * which it relies; in such a situation you must specify the target package as the package of the supertype.
      * 
      * @param key used to generate the normalized classname.
@@ -402,7 +409,7 @@ public class Normalizer {
         md5.update(key.getLeft().getBytes(UTF8));
         md5.update(key.getRight().getBytes(UTF8));
 
-        final long digest = Utils.byteArrayToLong(md5.digest(), 0, 0L, 0, Long.SIZE / Byte.SIZE);
+        final long digest = Conversion.byteArrayToLong(md5.digest(), 0, 0L, 0, Long.SIZE / Byte.SIZE);
 
         final String result = new StringBuilder(targetPackage).append("/$normalized").append(digest).toString();
 

Modified: commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Utils.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Utils.java?rev=1556985&r1=1556984&r2=1556985&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Utils.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Utils.java Thu Jan  9 23:44:55 2014
@@ -20,6 +20,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.Conversion;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 
@@ -67,43 +68,4 @@ class Utils {
         }
         return result;
     }
-
-    /**
-     * From Commons lang 3.2; use when available.
-     * <p>
-     * Converts an array of byte into a long using the default (little endian, Lsb0) byte and
-     * bit ordering.
-     * </p>
-     * 
-     * @param src the byte array to convert
-     * @param srcPos the position in {@code src}, in byte unit, from where to start the
-     *            conversion
-     * @param dstInit initial value of the destination long
-     * @param dstPos the position of the lsb, in bits, in the result long
-     * @param nBytes the number of bytes to convert
-     * @return a long containing the selected bits
-     * @throws NullPointerException if {@code src} is {@code null}
-     * @throws IllegalArgumentException if {@code (nBytes-1)*8+dstPos >= 64}
-     * @throws ArrayIndexOutOfBoundsException if {@code srcPos + nBytes > src.length}
-     */
-    public static long byteArrayToLong(final byte[] src, final int srcPos, final long dstInit, final int dstPos,
-        final int nBytes) {
-        if ((src.length == 0 && srcPos == 0) || 0 == nBytes) {
-            return dstInit;
-        }
-        if ((nBytes - 1) * 8 + dstPos >= 64) {
-            throw new IllegalArgumentException(
-                "(nBytes-1)*8+dstPos is greather or equal to than 64");
-        }
-        long out = dstInit;
-        int shift = 0;
-        for (int i = 0; i < nBytes; i++ ) {
-            shift = i * 8 + dstPos;
-            final long bits = (0xffL & src[i + srcPos]) << shift;
-            final long mask = 0xffL << shift;
-            out = (out & ~mask) | bits;
-        }
-        return out;
-    }
-
 }