This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new d532d52d45 Trivial refactoring: Simplify `Optional` method calls
d532d52d45 is described below
commit d532d52d45dd8c49fc785444d787a0be434e5d3c
Author: Daniel Sun <[email protected]>
AuthorDate: Sat Dec 21 19:52:02 2024 +0900
Trivial refactoring: Simplify `Optional` method calls
---
.../groovy/classgen/asm/sc/StaticTypesLambdaWriter.java | 2 +-
.../org/codehaus/groovy/runtime/StreamGroovyMethods.java | 8 ++++----
.../groovy/vmplugin/v8/PluginDefaultGroovyMethods.java | 12 ++++++------
src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
index 916805755a..bfec3a618f 100644
---
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
+++
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
@@ -186,7 +186,7 @@ public class StaticTypesLambdaWriter extends LambdaWriter
implements AbstractFun
Optional<ConstructorNode> generatedConstructor =
lambdaClass.getDeclaredConstructors().stream()
.filter(ctor ->
Boolean.TRUE.equals(ctor.getNodeMetaData(IS_GENERATED_CONSTRUCTOR))).findFirst();
- if (!generatedConstructor.isPresent()) {
+ if (generatedConstructor.isEmpty()) {
throw new GroovyBugError("Failed to find the generated
constructor");
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
b/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
index c23687a6b1..38015c422e 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StreamGroovyMethods.java
@@ -485,7 +485,7 @@ public class StreamGroovyMethods {
* @since 3.0.0
*/
public static <T> Stream<T> stream(final Optional<T> self) {
- return self.map(Stream::of).orElseGet(Stream::empty);
+ return self.stream();
}
//
@@ -497,7 +497,7 @@ public class StreamGroovyMethods {
* @since 3.0.0
*/
public static IntStream stream(final OptionalInt self) {
- if (!self.isPresent()) {
+ if (self.isEmpty()) {
return IntStream.empty();
}
return IntStream.of(self.getAsInt());
@@ -510,7 +510,7 @@ public class StreamGroovyMethods {
* @since 3.0.0
*/
public static LongStream stream(final OptionalLong self) {
- if (!self.isPresent()) {
+ if (self.isEmpty()) {
return LongStream.empty();
}
return LongStream.of(self.getAsLong());
@@ -523,7 +523,7 @@ public class StreamGroovyMethods {
* @since 3.0.0
*/
public static DoubleStream stream(final OptionalDouble self) {
- if (!self.isPresent()) {
+ if (self.isEmpty()) {
return DoubleStream.empty();
}
return DoubleStream.of(self.getAsDouble());
diff --git
a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
index ff1c1b64eb..987684c1cd 100644
---
a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
+++
b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
@@ -429,7 +429,7 @@ public class PluginDefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 3.0.0
*/
public static OptionalInt filter(final OptionalInt self, final
IntPredicate test) {
- if (!self.isPresent() || !test.test(self.getAsInt())) {
+ if (self.isEmpty() || !test.test(self.getAsInt())) {
return OptionalInt.empty();
}
return self;
@@ -449,7 +449,7 @@ public class PluginDefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 3.0.0
*/
public static OptionalLong filter(final OptionalLong self, final
LongPredicate test) {
- if (!self.isPresent() || !test.test(self.getAsLong())) {
+ if (self.isEmpty() || !test.test(self.getAsLong())) {
return OptionalLong.empty();
}
return self;
@@ -469,7 +469,7 @@ public class PluginDefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 3.0.0
*/
public static OptionalDouble filter(final OptionalDouble self, final
DoublePredicate test) {
- if (!self.isPresent() || !test.test(self.getAsDouble())) {
+ if (self.isEmpty() || !test.test(self.getAsDouble())) {
return OptionalDouble.empty();
}
return self;
@@ -488,7 +488,7 @@ public class PluginDefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 3.0.0
*/
public static <T> Optional<T> mapToObj(final OptionalInt self, final
IntFunction<? extends T> mapper) {
- if (!self.isPresent()) {
+ if (self.isEmpty()) {
return Optional.empty();
}
return Optional.ofNullable(mapper.apply(self.getAsInt()));
@@ -507,7 +507,7 @@ public class PluginDefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 3.0.0
*/
public static <T> Optional<T> mapToObj(final OptionalLong self, final
LongFunction<? extends T> mapper) {
- if (!self.isPresent()) {
+ if (self.isEmpty()) {
return Optional.empty();
}
return Optional.ofNullable(mapper.apply(self.getAsLong()));
@@ -526,7 +526,7 @@ public class PluginDefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 3.0.0
*/
public static <T> Optional<T> mapToObj(final OptionalDouble self, final
DoubleFunction<? extends T> mapper) {
- if (!self.isPresent()) {
+ if (self.isEmpty()) {
return Optional.empty();
}
return Optional.ofNullable(mapper.apply(self.getAsDouble()));
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 9eb1a03d3c..b9d5d922f7 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -197,7 +197,7 @@ public class Java9 extends Java8 {
CachedMethod cachedMethod = (CachedMethod) metaMethod;
CachedClass declaringClass = metaMethod.getDeclaringClass();
Optional<CachedMethod> transformedMethod =
Optional.ofNullable(cachedMethod.getTransformedMethod());
- if (!transformedMethod.isPresent()
+ if (transformedMethod.isEmpty()
// if caller can access the method legally, there is no
need to transform the cached method
&& !checkAccessible(caller, declaringClass.getTheClass(),
metaMethod.getModifiers(), false)) {
Class<?> theClass = metaClass.getTheClass();
