This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-fury.git
The following commit(s) were added to refs/heads/main by this push:
new e6646154 chore(java): move ignore method into Exception util (#1584)
e6646154 is described below
commit e6646154a9df32eee83473410ab10cdf2636791f
Author: Shawn Yang <[email protected]>
AuthorDate: Sat Apr 27 12:11:01 2024 +0800
chore(java): move ignore method into Exception util (#1584)
## What does this PR do?
move exception ignore method into Exception util
## Related issues
<!--
Is there any related issue? Please attach here.
- #xxxx0
- #xxxx1
- #xxxx2
-->
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/incubator-fury/issues/new/choose)
describing the need to do so and update the document if necessary.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
-->
---
.../main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java | 4 ++--
.../java/org/apache/fury/serializer/ObjectStreamSerializer.java | 4 ++--
.../src/main/java/org/apache/fury/serializer/Serializers.java | 6 +++---
.../src/main/java/org/apache/fury/serializer/StructSerializer.java | 4 ++--
.../apache/fury/serializer/collection/SynchronizedSerializers.java | 4 ++--
.../apache/fury/serializer/collection/UnmodifiableSerializers.java | 4 ++--
.../src/main/java/org/apache/fury/util/ExceptionUtils.java | 2 ++
java/fury-core/src/main/java/org/apache/fury/util/Utils.java | 5 +----
.../src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java | 4 ++--
9 files changed, 18 insertions(+), 19 deletions(-)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java
b/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java
index 8879f567..074c7c2c 100644
---
a/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java
+++
b/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java
@@ -40,9 +40,9 @@ import org.apache.fury.serializer.Serializer;
import org.apache.fury.serializer.Serializers;
import org.apache.fury.type.Descriptor;
import org.apache.fury.type.DescriptorGrouper;
+import org.apache.fury.util.ExceptionUtils;
import org.apache.fury.util.Preconditions;
import org.apache.fury.util.StringUtils;
-import org.apache.fury.util.Utils;
import org.apache.fury.util.record.RecordComponent;
import org.apache.fury.util.record.RecordUtils;
@@ -174,7 +174,7 @@ public class MetaSharedCodecBuilder extends
ObjectCodecBuilder {
// Note that the field value shouldn't be an inlined value, otherwise
field value read may
// be ignored.
// Add an ignored call here to make expression type to void.
- return new Expression.StaticInvoke(Utils.class, "ignore", value);
+ return new Expression.StaticInvoke(ExceptionUtils.class, "ignore",
value);
}
return super.setFieldValue(bean, descriptor, value);
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java
index 65a1c268..137d3c94 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java
@@ -59,8 +59,8 @@ import org.apache.fury.resolver.ClassInfo;
import org.apache.fury.resolver.ClassResolver;
import org.apache.fury.resolver.FieldResolver;
import org.apache.fury.resolver.FieldResolver.ClassField;
+import org.apache.fury.util.ExceptionUtils;
import org.apache.fury.util.Preconditions;
-import org.apache.fury.util.Utils;
import org.apache.fury.util.unsafe._JDKAccess;
/**
@@ -296,7 +296,7 @@ public class ObjectStreamSerializer extends Serializer {
_JDKAccess.makeJDKConsumer(lookup,
lookup.unreflect(readObjectNoData));
}
} catch (Exception e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
}
this.writeObjectFunc = writeObjectFunc;
this.readObjectFunc = readObjectFunc;
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java
index e0b84f31..7e1bab63 100644
--- a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java
+++ b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java
@@ -49,9 +49,9 @@ import org.apache.fury.memory.Platform;
import org.apache.fury.reflect.ReflectionUtils;
import org.apache.fury.resolver.ClassResolver;
import org.apache.fury.type.Type;
+import org.apache.fury.util.ExceptionUtils;
import org.apache.fury.util.GraalvmSupport;
import org.apache.fury.util.Preconditions;
-import org.apache.fury.util.Utils;
import org.apache.fury.util.unsafe._JDKAccess;
/** Serialization utils and common serializers. */
@@ -128,14 +128,14 @@ public class Serializers {
CTR_MAP.put(serializerClass, Tuple2.of(SIG1, ctr));
return (Serializer<T>) ctr.invoke(fury, type);
} catch (NoSuchMethodException e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
}
try {
MethodHandle ctr = lookup.findConstructor(serializerClass, SIG2);
CTR_MAP.put(serializerClass, Tuple2.of(SIG2, ctr));
return (Serializer<T>) ctr.invoke(fury);
} catch (NoSuchMethodException e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
}
try {
MethodHandle ctr = lookup.findConstructor(serializerClass, SIG3);
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java
index c269dfa4..e37d203b 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java
@@ -41,8 +41,8 @@ import org.apache.fury.type.GenericType;
import org.apache.fury.type.Generics;
import org.apache.fury.type.Type;
import org.apache.fury.type.TypeUtils;
+import org.apache.fury.util.ExceptionUtils;
import org.apache.fury.util.Preconditions;
-import org.apache.fury.util.Utils;
/**
* A serializer used for cross-language serialization for custom objects.
@@ -73,7 +73,7 @@ public class StructSerializer<T> extends Serializer<T> {
ctr.setAccessible(true);
}
} catch (Exception e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
}
this.constructor = ctr;
fieldAccessors =
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java
index ac90be89..82d5bc4e 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java
@@ -41,7 +41,7 @@ import org.apache.fury.logging.LoggerFactory;
import org.apache.fury.memory.MemoryBuffer;
import org.apache.fury.memory.Platform;
import org.apache.fury.serializer.Serializer;
-import org.apache.fury.util.Utils;
+import org.apache.fury.util.ExceptionUtils;
/** Serializer for synchronized Collections and Maps created via Collections.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -203,7 +203,7 @@ public class SynchronizedSerializers {
fury.registerSerializer(factory.f0, createSerializer(fury, factory));
}
} catch (Throwable e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
}
}
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java
index 193ba1c7..3f54860a 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java
@@ -40,8 +40,8 @@ import org.apache.fury.logging.LoggerFactory;
import org.apache.fury.memory.MemoryBuffer;
import org.apache.fury.memory.Platform;
import org.apache.fury.serializer.Serializer;
+import org.apache.fury.util.ExceptionUtils;
import org.apache.fury.util.Preconditions;
-import org.apache.fury.util.Utils;
/** Serializer for unmodifiable Collections and Maps created via Collections.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -201,7 +201,7 @@ public class UnmodifiableSerializers {
fury.registerSerializer(factory.f0, createSerializer(fury, factory));
}
} catch (Throwable e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
}
}
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/util/ExceptionUtils.java
b/java/fury-core/src/main/java/org/apache/fury/util/ExceptionUtils.java
index d32d1e33..be72de10 100644
--- a/java/fury-core/src/main/java/org/apache/fury/util/ExceptionUtils.java
+++ b/java/fury-core/src/main/java/org/apache/fury/util/ExceptionUtils.java
@@ -47,4 +47,6 @@ public class ExceptionUtils {
return null;
}
}
+
+ public static void ignore(Object... args) {}
}
diff --git a/java/fury-core/src/main/java/org/apache/fury/util/Utils.java
b/java/fury-core/src/main/java/org/apache/fury/util/Utils.java
index 5e7127ee..5dc2578c 100644
--- a/java/fury-core/src/main/java/org/apache/fury/util/Utils.java
+++ b/java/fury-core/src/main/java/org/apache/fury/util/Utils.java
@@ -20,7 +20,4 @@
package org.apache.fury.util;
/** Misc common utils. */
-public class Utils {
-
- public static void ignore(Object... args) {}
-}
+public class Utils {}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java
b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java
index f6d1b80f..11e11af1 100644
--- a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java
+++ b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java
@@ -40,9 +40,9 @@ import java.util.function.ToLongFunction;
import org.apache.fury.collection.Tuple2;
import org.apache.fury.memory.Platform;
import org.apache.fury.type.TypeUtils;
+import org.apache.fury.util.ExceptionUtils;
import org.apache.fury.util.GraalvmSupport;
import org.apache.fury.util.Preconditions;
-import org.apache.fury.util.Utils;
import org.apache.fury.util.function.ToByteFunction;
import org.apache.fury.util.function.ToCharFunction;
import org.apache.fury.util.function.ToFloatFunction;
@@ -116,7 +116,7 @@ public class _JDKAccess {
try {
return makeFunction(lookup, handle, functionInterface);
} catch (Throwable e) {
- Utils.ignore(e);
+ ExceptionUtils.ignore(e);
throw new IllegalStateException();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
