From 4a62ea0cd35358124bac75b2850f9ff05011474e Mon Sep 17 00:00:00 2001 From: redkale Date: Thu, 29 Jun 2023 17:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4SerializedLambda?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/redkale/net/AsyncNioConnection.java | 2 +- .../java/org/redkale/util/LambdaSupplier.java | 4 +- .../org/redkale/util/SerializedLambda.java | 251 ------------------ 3 files changed, 3 insertions(+), 254 deletions(-) delete mode 100644 src/main/java/org/redkale/util/SerializedLambda.java diff --git a/src/main/java/org/redkale/net/AsyncNioConnection.java b/src/main/java/org/redkale/net/AsyncNioConnection.java index 9d8aef29a..13f641d1f 100644 --- a/src/main/java/org/redkale/net/AsyncNioConnection.java +++ b/src/main/java/org/redkale/net/AsyncNioConnection.java @@ -390,7 +390,7 @@ abstract class AsyncNioConnection extends AsyncConnection { //writeTotal = totalCount; continue; //要全部输出完才返回 } - break; + break; } else if (writeCount < 0) { if (totalCount == 0) { totalCount = writeCount; diff --git a/src/main/java/org/redkale/util/LambdaSupplier.java b/src/main/java/org/redkale/util/LambdaSupplier.java index a1d2045db..79aec9906 100644 --- a/src/main/java/org/redkale/util/LambdaSupplier.java +++ b/src/main/java/org/redkale/util/LambdaSupplier.java @@ -18,9 +18,9 @@ import java.util.function.Supplier; * @param 泛型 */ @FunctionalInterface -public interface LambdaSupplier extends Supplier, Serializable { +public interface LambdaSupplier extends Supplier, Serializable { - public static String readColumn(LambdaSupplier func) { + public static String readColumn(LambdaSupplier func) { return Utility.readFieldName(func); } } diff --git a/src/main/java/org/redkale/util/SerializedLambda.java b/src/main/java/org/redkale/util/SerializedLambda.java deleted file mode 100644 index 4bea620e2..000000000 --- a/src/main/java/org/redkale/util/SerializedLambda.java +++ /dev/null @@ -1,251 +0,0 @@ -/* - * - */ -package org.redkale.util; - -import java.io.Serializable; -import java.lang.invoke.MethodHandleInfo; -import java.util.Objects; - -/** - * 完全复制java.lang.invoke.SerializedLambda类源码，必须保持字段信息一样 - * - *

- * 详情见: https://redkale.org - * - * @author zhangjx - * @since 2.8.0 - * - */ -public class SerializedLambda implements Serializable { - - private static final long serialVersionUID = 8025925345765570181L; - - /** - * The capturing class. - */ - private final Class capturingClass; - - /** - * The functional interface class. - */ - private final String functionalInterfaceClass; - - /** - * The functional interface method name. - */ - private final String functionalInterfaceMethodName; - - /** - * The functional interface method signature. - */ - private final String functionalInterfaceMethodSignature; - - /** - * The implementation class. - */ - private final String implClass; - - /** - * The implementation method name. - */ - private final String implMethodName; - - /** - * The implementation method signature. - */ - private final String implMethodSignature; - - /** - * The implementation method kind. - */ - private final int implMethodKind; - - /** - * The instantiated method type. - */ - private final String instantiatedMethodType; - - /** - * The captured arguments. - */ - @SuppressWarnings("serial") // Not statically typed as Serializable - private final Object[] capturedArgs; - - /** - * Create a {@code SerializedLambda} from the low-level information present - * at the lambda factory site. - * - * @param capturingClass The class in which the lambda expression appears - * @param functionalInterfaceClass Name, in slash-delimited form, of static - * type of the returned lambda object - * @param functionalInterfaceMethodName Name of the functional interface - * method for the present at the - * lambda factory site - * @param functionalInterfaceMethodSignature Signature of the functional - * interface method present at - * the lambda factory site - * @param implMethodKind Method handle kind for the implementation method - * @param implClass Name, in slash-delimited form, for the class holding - * the implementation method - * @param implMethodName Name of the implementation method - * @param implMethodSignature Signature of the implementation method - * @param instantiatedMethodType The signature of the primary functional - * interface method after type variables - * are substituted with their instantiation - * from the capture site - * @param capturedArgs The dynamic arguments to the lambda factory site, - * which represent variables captured by - * the lambda - */ - public SerializedLambda(Class capturingClass, - String functionalInterfaceClass, - String functionalInterfaceMethodName, - String functionalInterfaceMethodSignature, - int implMethodKind, - String implClass, - String implMethodName, - String implMethodSignature, - String instantiatedMethodType, - Object[] capturedArgs) { - this.capturingClass = capturingClass; - this.functionalInterfaceClass = functionalInterfaceClass; - this.functionalInterfaceMethodName = functionalInterfaceMethodName; - this.functionalInterfaceMethodSignature = functionalInterfaceMethodSignature; - this.implMethodKind = implMethodKind; - this.implClass = implClass; - this.implMethodName = implMethodName; - this.implMethodSignature = implMethodSignature; - this.instantiatedMethodType = instantiatedMethodType; - this.capturedArgs = Objects.requireNonNull(capturedArgs).clone(); - } - - /** - * Get the name of the class that captured this lambda. - * - * @return the name of the class that captured this lambda - */ - public String getCapturingClass() { - return capturingClass.getName().replace('.', '/'); - } - - /** - * Get the name of the invoked type to which this - * lambda has been converted - * - * @return the name of the functional interface class to which - * this lambda has been converted - */ - public String getFunctionalInterfaceClass() { - return functionalInterfaceClass; - } - - /** - * Get the name of the primary method for the functional interface - * to which this lambda has been converted. - * - * @return the name of the primary methods of the functional interface - */ - public String getFunctionalInterfaceMethodName() { - return functionalInterfaceMethodName; - } - - /** - * Get the signature of the primary method for the functional - * interface to which this lambda has been converted. - * - * @return the signature of the primary method of the functional - * interface - */ - public String getFunctionalInterfaceMethodSignature() { - return functionalInterfaceMethodSignature; - } - - /** - * Get the name of the class containing the implementation - * method. - * - * @return the name of the class containing the implementation - * method - */ - public String getImplClass() { - return implClass; - } - - /** - * Get the name of the implementation method. - * - * @return the name of the implementation method - */ - public String getImplMethodName() { - return implMethodName; - } - - /** - * Get the signature of the implementation method. - * - * @return the signature of the implementation method - */ - public String getImplMethodSignature() { - return implMethodSignature; - } - - /** - * Get the method handle kind (see {@link MethodHandleInfo}) of - * the implementation method. - * - * @return the method handle kind of the implementation method - */ - public int getImplMethodKind() { - return implMethodKind; - } - - /** - * Get the signature of the primary functional interface method - * after type variables are substituted with their instantiation - * from the capture site. - * - * @return the signature of the primary functional interface method - * after type variable processing - */ - public final String getInstantiatedMethodType() { - return instantiatedMethodType; - } - - /** - * Get the count of dynamic arguments to the lambda capture site. - * - * @return the count of dynamic arguments to the lambda capture site - */ - public int getCapturedArgCount() { - return capturedArgs.length; - } - - /** - * Get a dynamic argument to the lambda capture site. - * - * @param i the argument to capture - * - * @return a dynamic argument to the lambda capture site - */ - public Object getCapturedArg(int i) { - return capturedArgs[i]; - } - - @Override - public String toString() { - String implKind = MethodHandleInfo.referenceKindToString(implMethodKind); - return String.format("SerializedLambda[%s=%s, %s=%s.%s:%s, " - + "%s=%s %s.%s:%s, %s=%s, %s=%d]", - "capturingClass", capturingClass, - "functionalInterfaceMethod", functionalInterfaceClass, - functionalInterfaceMethodName, - functionalInterfaceMethodSignature, - "implementation", - implKind, - implClass, implMethodName, implMethodSignature, - "instantiatedMethodType", instantiatedMethodType, - "numCaptured", capturedArgs.length); - } - -}