delete bytes file (#1669)

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Bytes.java

@@ -1,699 +0,0 @@
-/*
- * 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.dolphinscheduler.common.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-
-/**
- * Utility class that handles Bytes
- */
-public class Bytes {
-
-  private static final Logger logger = LoggerFactory.getLogger(Bytes.class);
-  public static final String UTF8_ENCODING = "UTF-8";
-  //An empty instance.
-  public static final byte [] EMPTY_BYTE_ARRAY = new byte [0];
-
-  /**
-   * Size of int in bytes
-   */
-  public static final int SIZEOF_INT = Integer.SIZE / Byte.SIZE;
-
-  /**
-   * Size of long in bytes
-   */
-  public static final int SIZEOF_LONG = Long.SIZE / Byte.SIZE;
-
-  /**
-   * Size of short in bytes
-   */
-  public static final int SIZEOF_SHORT = Short.SIZE / Byte.SIZE;
-
-
-
-  /**
-   * Put bytes at the specified byte array position.
-   * @param tgtBytes the byte array
-   * @param tgtOffset position in the array
-   * @param srcBytes array to write out
-   * @param srcOffset source offset
-   * @param srcLength source length
-   * @return incremented offset
-   */
-  public static int putBytes(byte[] tgtBytes, int tgtOffset, byte[] srcBytes,
-      int srcOffset, int srcLength) {
-    System.arraycopy(srcBytes, srcOffset, tgtBytes, tgtOffset, srcLength);
-    return tgtOffset + srcLength;
-  }
-
-  /**
-   * Write a single byte out to the specified byte array position.
-   * @param bytes the byte array
-   * @param offset position in the array
-   * @param b byte to write out
-   * @return incremented offset
-   */
-  public static int putByte(byte[] bytes, int offset, byte b) {
-    bytes[offset] = b;
-    return offset + 1;
-  }
-
-  /**
-   * Returns a new byte array, copied from the passed ByteBuffer.
-   * @param bb A ByteBuffer
-   * @return the byte array
-   */
-  public static byte[] toBytes(ByteBuffer bb) {
-    int length = bb.limit();
-    byte [] result = new byte[length];
-    System.arraycopy(bb.array(), bb.arrayOffset(), result, 0, length);
-    return result;
-  }
-
-  /**
-   * @param b Presumed UTF-8 encoded byte array.
-   * @return String made from <code>b</code>
-   */
-  public static String toString(final byte [] b) {
-    if (b == null) {
-      return null;
-    }
-    return toString(b, 0, b.length);
-  }
-
-  /**
-   * Joins two byte arrays together using a separator.
-   * @param b1 The first byte array.
-   * @param sep The separator to use.
-   * @param b2 The second byte array.
-   * @return two byte arrays together using a separator.
-   */
-  public static String toString(final byte [] b1,
-                                String sep,
-                                final byte [] b2) {
-    return toString(b1, 0, b1.length) + sep + toString(b2, 0, b2.length);
-  }
-
-  /**
-   * This method will convert utf8 encoded bytes into a string. If
-   * an UnsupportedEncodingException occurs, this method will eat it
-   * and return null instead.
-   *
-   * @param b Presumed UTF-8 encoded byte array.
-   * @param off offset into array
-   * @param len length of utf-8 sequence
-   * @return String made from <code>b</code> or null
-   */
-  public static String toString(final byte [] b, int off, int len) {
-    if (b == null) {
-      return null;
-    }
-    if (len == 0) {
-      return "";
-    }
-      return new String(b, off, len, StandardCharsets.UTF_8);
-  }
-
-
-  /**
-   * Converts a string to a UTF-8 byte array.
-   * @param s string
-   * @return the byte array
-   */
-  public static byte[] toBytes(String s) {
-      return s.getBytes(StandardCharsets.UTF_8);
-  }
-
-  /**
-   * Convert a boolean to a byte array. True becomes -1
-   * and false becomes 0.
-   *
-   * @param b value
-   * @return <code>b</code> encoded in a byte array.
-   */
-  public static byte [] toBytes(final boolean b) {
-    return new byte[] { b ? (byte) -1 : (byte) 0 };
-  }
-
-  /**
-   * Reverses {@link #toBytes(boolean)}
-   * @param b array
-   * @return True or false.
-   */
-  public static boolean toBoolean(final byte [] b) {
-    if (b.length != 1) {
-      throw new IllegalArgumentException("Array has wrong size: " + b.length);
-    }
-    return b[0] != (byte) 0;
-  }
-
-  /**
-   * Convert a long value to a byte array using big-endian.
-   *
-   * @param val value to convert
-   * @return the byte array
-   */
-  public static byte[] toBytes(long val) {
-    byte [] b = new byte[8];
-    for (int i = 7; i > 0; i--) {
-      b[i] = (byte) val;
-      val >>>= 8;
-    }
-    b[0] = (byte) val;
-    return b;
-  }
-
-  /**
-   * Converts a byte array to a long value. Reverses
-   * {@link #toBytes(long)}
-   * @param bytes array
-   * @return the long value
-   */
-  public static long toLong(byte[] bytes) {
-    return toLong(bytes, 0, SIZEOF_LONG);
-  }
-
-  /**
-   * Converts a byte array to a long value. Assumes there will be
-   * {@link #SIZEOF_LONG} bytes available.
-   *
-   * @param bytes bytes
-   * @param offset offset
-   * @return the long value
-   */
-  public static long toLong(byte[] bytes, int offset) {
-    return toLong(bytes, offset, SIZEOF_LONG);
-  }
-
-  /**
-   * Converts a byte array to a long value.
-   *
-   * @param bytes array of bytes
-   * @param offset offset into array
-   * @param length length of data (must be {@link #SIZEOF_LONG})
-   * @return the long value
-   * @throws IllegalArgumentException if length is not {@link #SIZEOF_LONG} or
-   * if there's not enough room in the array at the offset indicated.
-   */
-  public static long toLong(byte[] bytes, int offset, final int length) {
-    if (length != SIZEOF_LONG || offset + length > bytes.length) {
-      throw explainWrongLengthOrOffset(bytes, offset, length, SIZEOF_LONG);
-    }
-    long l = 0;
-    for(int i = offset; i < offset + length; i++) {
-      l <<= 8;
-      l ^= bytes[i] & 0xFF;
-    }
-    return l;
-  }
-
-  private static IllegalArgumentException
-    explainWrongLengthOrOffset(final byte[] bytes,
-                               final int offset,
-                               final int length,
-                               final int expectedLength) {
-    String reason;
-    if (length != expectedLength) {
-      reason = "Wrong length: " + length + ", expected " + expectedLength;
-    } else {
-     reason = "offset (" + offset + ") + length (" + length + ") exceed the"
-        + " capacity of the array: " + bytes.length;
-    }
-    return new IllegalArgumentException(reason);
-  }
-
-  /**
-   * Put a long value out to the specified byte array position.
-   * @param bytes the byte array
-   * @param offset position in the array
-   * @param val long to write out
-   * @return incremented offset
-   * @throws IllegalArgumentException if the byte array given doesn't have
-   * enough room at the offset specified.
-   */
-  public static int putLong(byte[] bytes, int offset, long val) {
-    if (bytes.length - offset < SIZEOF_LONG) {
-      throw new IllegalArgumentException("Not enough room to put a long at"
-          + " offset " + offset + " in a " + bytes.length + " byte array");
-    }
-    for(int i = offset + 7; i > offset; i--) {
-      bytes[i] = (byte) val;
-      val >>>= 8;
-    }
-    bytes[offset] = (byte) val;
-    return offset + SIZEOF_LONG;
-  }
-
-  /**
-   * Presumes float encoded as IEEE 754 floating-point "single format"
-   * @param bytes byte array
-   * @return Float made from passed byte array.
-   */
-  public static float toFloat(byte [] bytes) {
-    return toFloat(bytes, 0);
-  }
-
-  /**
-   * Presumes float encoded as IEEE 754 floating-point "single format"
-   * @param bytes array to convert
-   * @param offset offset into array
-   * @return Float made from passed byte array.
-   */
-  public static float toFloat(byte [] bytes, int offset) {
-    return Float.intBitsToFloat(toInt(bytes, offset, SIZEOF_INT));
-  }
-
-  /**
-   * @param bytes byte array
-   * @param offset offset to write to
-   * @param f float value
-   * @return New offset in <code>bytes</code>
-   */
-  public static int putFloat(byte [] bytes, int offset, float f) {
-    return putInt(bytes, offset, Float.floatToRawIntBits(f));
-  }
-
-  /**
-   * @param f float value
-   * @return the float represented as byte []
-   */
-  public static byte [] toBytes(final float f) {
-    // Encode it as int
-    return Bytes.toBytes(Float.floatToRawIntBits(f));
-  }
-
-  /**
-   * @param bytes byte array
-   * @return Return double made from passed bytes.
-   */
-  public static double toDouble(final byte [] bytes) {
-    return toDouble(bytes, 0);
-  }
-
-  /**
-   * @param bytes byte array
-   * @param offset offset where double is
-   * @return Return double made from passed bytes.
-   */
-  public static double toDouble(final byte [] bytes, final int offset) {
-    return Double.longBitsToDouble(toLong(bytes, offset, SIZEOF_LONG));
-  }
-
-  /**
-   * @param bytes byte array
-   * @param offset offset to write to
-   * @param d value
-   * @return New offset into array <code>bytes</code>
-   */
-  public static int putDouble(byte [] bytes, int offset, double d) {
-    return putLong(bytes, offset, Double.doubleToLongBits(d));
-  }
-
-  /**
-   * Serialize a double as the IEEE 754 double format output. The resultant
-   * array will be 8 bytes long.
-   *
-   * @param d value
-   * @return the double represented as byte []
-   */
-  public static byte [] toBytes(final double d) {
-    // Encode it as a long
-    return Bytes.toBytes(Double.doubleToRawLongBits(d));
-  }
-
-  /**
-   * Convert an int value to a byte array
-   * @param val value
-   * @return the byte array
-   */
-  public static byte[] toBytes(int val) {
-    byte [] b = new byte[4];
-    for(int i = 3; i > 0; i--) {
-      b[i] = (byte) val;
-      val >>>= 8;
-    }
-    b[0] = (byte) val;
-    return b;
-  }
-
-  /**
-   * Converts a byte array to an int value
-   * @param bytes byte array
-   * @return the int value
-   */
-  public static int toInt(byte[] bytes) {
-    return toInt(bytes, 0, SIZEOF_INT);
-  }
-
-  /**
-   * Converts a byte array to an int value
-   * @param bytes byte array
-   * @param offset offset into array
-   * @return the int value
-   */
-  public static int toInt(byte[] bytes, int offset) {
-    return toInt(bytes, offset, SIZEOF_INT);
-  }
-
-  /**
-   * Converts a byte array to an int value
-   * @param bytes byte array
-   * @param offset offset into array
-   * @param length length of int (has to be {@link #SIZEOF_INT})
-   * @return the int value
-   * @throws IllegalArgumentException if length is not {@link #SIZEOF_INT} or
-   * if there's not enough room in the array at the offset indicated.
-   */
-  public static int toInt(byte[] bytes, int offset, final int length) {
-    if (length != SIZEOF_INT || offset + length > bytes.length) {
-      throw explainWrongLengthOrOffset(bytes, offset, length, SIZEOF_INT);
-    }
-    int n = 0;
-    for(int i = offset; i < (offset + length); i++) {
-      n <<= 8;
-      n ^= bytes[i] & 0xFF;
-    }
-    return n;
-  }
-
-  /**
-   * Put an int value out to the specified byte array position.
-   * @param bytes the byte array
-   * @param offset position in the array
-   * @param val int to write out
-   * @return incremented offset
-   * @throws IllegalArgumentException if the byte array given doesn't have
-   * enough room at the offset specified.
-   */
-  public static int putInt(byte[] bytes, int offset, int val) {
-    if (bytes.length - offset < SIZEOF_INT) {
-      throw new IllegalArgumentException("Not enough room to put an int at"
-          + " offset " + offset + " in a " + bytes.length + " byte array");
-    }
-    for(int i= offset + 3; i > offset; i--) {
-      bytes[i] = (byte) val;
-      val >>>= 8;
-    }
-    bytes[offset] = (byte) val;
-    return offset + SIZEOF_INT;
-  }
-
-  /**
-   * Convert a short value to a byte array of {@link #SIZEOF_SHORT} bytes long.
-   * @param val value
-   * @return the byte array
-   */
-  public static byte[] toBytes(short val) {
-    byte[] b = new byte[SIZEOF_SHORT];
-    b[1] = (byte) val;
-    val >>= 8;
-    b[0] = (byte) val;
-    return b;
-  }
-
-  /**
-   * Converts a byte array to a short value
-   * @param bytes byte array
-   * @return the short value
-   */
-  public static short toShort(byte[] bytes) {
-    return toShort(bytes, 0, SIZEOF_SHORT);
-  }
-
-  /**
-   * Converts a byte array to a short value
-   * @param bytes byte array
-   * @param offset offset into array
-   * @return the short value
-   */
-  public static short toShort(byte[] bytes, int offset) {
-    return toShort(bytes, offset, SIZEOF_SHORT);
-  }
-
-  /**
-   * Converts a byte array to a short value
-   * @param bytes byte array
-   * @param offset offset into array
-   * @param length length, has to be {@link #SIZEOF_SHORT}
-   * @return the short value
-   * @throws IllegalArgumentException if length is not {@link #SIZEOF_SHORT}
-   * or if there's not enough room in the array at the offset indicated.
-   */
-  public static short toShort(byte[] bytes, int offset, final int length) {
-    if (length != SIZEOF_SHORT || offset + length > bytes.length) {
-      throw explainWrongLengthOrOffset(bytes, offset, length, SIZEOF_SHORT);
-    }
-    short n = 0;
-    n ^= bytes[offset] & 0xFF;
-    n <<= 8;
-    n ^= bytes[offset+1] & 0xFF;
-    return n;
-  }
-
-  /**
-   * This method will get a sequence of bytes from pos to limit,
-   * but will restore pos after.
-   * @param buf buffer
-   * @return byte array
-   */
-  public static byte[] getBytes(ByteBuffer buf) {
-    int savedPos = buf.position();
-    byte [] newBytes = new byte[buf.remaining()];
-    buf.get(newBytes);
-    buf.position(savedPos);
-    return newBytes;
-  }
-
-  /**
-   * Put a short value out to the specified byte array position.
-   * @param bytes the byte array
-   * @param offset position in the array
-   * @param val short to write out
-   * @return incremented offset
-   * @throws IllegalArgumentException if the byte array given doesn't have
-   * enough room at the offset specified.
-   */
-  public static int putShort(byte[] bytes, int offset, short val) {
-    if (bytes.length - offset < SIZEOF_SHORT) {
-      throw new IllegalArgumentException("Not enough room to put a short at"
-          + " offset " + offset + " in a " + bytes.length + " byte array");
-    }
-    bytes[offset+1] = (byte) val;
-    val >>= 8;
-    bytes[offset] = (byte) val;
-    return offset + SIZEOF_SHORT;
-  }
-
-  /**
-   * Convert a BigDecimal value to a byte array
-   *
-   * @param val value
-   * @return the byte array
-   */
-  public static byte[] toBytes(BigDecimal val) {
-    byte[] valueBytes = val.unscaledValue().toByteArray();
-    byte[] result = new byte[valueBytes.length + SIZEOF_INT];
-    int offset = putInt(result, 0, val.scale());
-    putBytes(result, offset, valueBytes, 0, valueBytes.length);
-    return result;
-  }
-
-
-  /**
-   * Converts a byte array to a BigDecimal
-   *
-   * @param bytes bytes array
-   * @return the char value
-   */
-  public static BigDecimal toBigDecimal(byte[] bytes) {
-    return toBigDecimal(bytes, 0, bytes.length);
-  }
-
-  /**
-   * Converts a byte array to a BigDecimal value
-   *
-   * @param bytes bytes array
-   * @param offset  offset
-   * @param length length
-   * @return the char value
-   */
-  public static BigDecimal toBigDecimal(byte[] bytes, int offset, final int length) {
-    if (bytes == null || length < SIZEOF_INT + 1 ||
-      (offset + length > bytes.length)) {
-      return null;
-    }
-
-    int scale = toInt(bytes, offset);
-    byte[] tcBytes = new byte[length - SIZEOF_INT];
-    System.arraycopy(bytes, offset + SIZEOF_INT, tcBytes, 0, length - SIZEOF_INT);
-    return new BigDecimal(new BigInteger(tcBytes), scale);
-  }
-
-  /**
-   * Put a BigDecimal value out to the specified byte array position.
-   *
-   * @param bytes  the byte array
-   * @param offset position in the array
-   * @param val    BigDecimal to write out
-   * @return incremented offset
-   */
-  public static int putBigDecimal(byte[] bytes, int offset, BigDecimal val) {
-    if (bytes == null) {
-      return offset;
-    }
-
-    byte[] valueBytes = val.unscaledValue().toByteArray();
-    byte[] result = new byte[valueBytes.length + SIZEOF_INT];
-    offset = putInt(result, offset, val.scale());
-    return putBytes(result, offset, valueBytes, 0, valueBytes.length);
-  }
-
-  /**
-   * @param a lower half
-   * @param b upper half
-   * @return New array that has a in lower half and b in upper half.
-   */
-  public static byte [] add(final byte [] a, final byte [] b) {
-    return add(a, b, EMPTY_BYTE_ARRAY);
-  }
-
-  /**
-   * @param a first third
-   * @param b second third
-   * @param c third third
-   * @return New array made from a, b and c
-   */
-  public static byte [] add(final byte [] a, final byte [] b, final byte [] c) {
-    byte [] result = new byte[a.length + b.length + c.length];
-    System.arraycopy(a, 0, result, 0, a.length);
-    System.arraycopy(b, 0, result, a.length, b.length);
-    System.arraycopy(c, 0, result, a.length + b.length, c.length);
-    return result;
-  }
-
-  /**
-   * @param a array
-   * @param length amount of bytes to grab
-   * @return First <code>length</code> bytes from <code>a</code>
-   */
-  public static byte [] head(final byte [] a, final int length) {
-    if (a.length < length) {
-      return null;
-    }
-    byte [] result = new byte[length];
-    System.arraycopy(a, 0, result, 0, length);
-    return result;
-  }
-
-  /**
-   * @param a array
-   * @param length amount of bytes to snarf
-   * @return Last <code>length</code> bytes from <code>a</code>
-   */
-  public static byte [] tail(final byte [] a, final int length) {
-    if (a.length < length) {
-      return null;
-    }
-    byte [] result = new byte[length];
-    System.arraycopy(a, a.length - length, result, 0, length);
-    return result;
-  }
-
-  /**
-   * @param a array
-   * @param length new array size
-   * @return Value in <code>a</code> plus <code>length</code> prepended 0 bytes
-   */
-  public static byte [] padHead(final byte [] a, final int length) {
-    byte[] padding = getPadding(length);
-    return add(padding,a);
-  }
-
-  private static byte[] getPadding(int length) {
-    byte[] padding = new byte[length];
-    for (int i = 0; i < length; i++) {
-      padding[i] = 0;
-    }
-    return padding;
-  }
-
-  /**
-   * @param a array
-   * @param length new array size
-   * @return Value in <code>a</code> plus <code>length</code> appended 0 bytes
-   */
-  public static byte [] padTail(final byte [] a, final int length) {
-    byte[] padding = getPadding(length);
-    return add(a,padding);
-  }
-
-
-
-  /**
-   * @param bytes array to hash
-   * @param offset offset to start from
-   * @param length length to hash
-   * @return hash code
-   * */
-  public static int hashCode(byte[] bytes, int offset, int length) {
-    int hash = 1;
-    for (int i = offset; i < offset + length; i++) {
-      hash = (31 * hash) + (int) bytes[i];
-    }
-    return hash;
-  }
-
-  /**
-   * @param t operands
-   * @return Array of byte arrays made from passed array of Text
-   */
-  public static byte [][] toByteArrays(final String [] t) {
-    byte [][] result = new byte[t.length][];
-    for (int i = 0; i < t.length; i++) {
-      result[i] = Bytes.toBytes(t[i]);
-    }
-    return result;
-  }
-
-  /**
-   * @param column operand
-   * @return A byte array of a byte array where first and only entry is
-   * <code>column</code>
-   */
-  public static byte [][] toByteArrays(final String column) {
-    return toByteArrays(toBytes(column));
-  }
-
-  /**
-   * @param column operand
-   * @return A byte array of a byte array where first and only entry is
-   * <code>column</code>
-   */
-  public static byte [][] toByteArrays(final byte [] column) {
-    byte [][] result = new byte[1][];
-    result[0] = column;
-    return result;
-  }
-
-
-}

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java

@@ -27,7 +27,6 @@ import org.apache.dolphinscheduler.common.process.HttpProperty;
 import org.apache.dolphinscheduler.common.process.Property;
 import org.apache.dolphinscheduler.common.task.AbstractParameters;
 import org.apache.dolphinscheduler.common.task.http.HttpParameters;
-import org.apache.dolphinscheduler.common.utils.Bytes;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.ParameterUtils;
 import org.apache.dolphinscheduler.common.utils.SpringApplicationContext;
@@ -50,6 +49,7 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -176,7 +176,7 @@ public class HttpTask extends AbstractTask {
         if (entity == null) {
             return null;
         }
-        String webPage = EntityUtils.toString(entity, Bytes.UTF8_ENCODING);
+        String webPage = EntityUtils.toString(entity, StandardCharsets.UTF_8.name());
         return webPage;
     }
 
@@ -264,7 +264,7 @@ public class HttpTask extends AbstractTask {
                 }
             }
             StringEntity postingString = new StringEntity(jsonParam.toString(), Charsets.UTF_8);
-            postingString.setContentEncoding(Bytes.UTF8_ENCODING);
+            postingString.setContentEncoding(StandardCharsets.UTF_8.name());
             postingString.setContentType(APPLICATION_JSON);
             builder.setEntity(postingString);
         }