(groovy) branch master updated: fix for `inSamePackage`

[emilles]

This is an automated email from the ASF dual-hosted git repository.

emilles 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 e7dc2e66d3 fix for `inSamePackage`
e7dc2e66d3 is described below

commit e7dc2e66d326055fefcfe7e4a1217fe2dda2e7ac
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Wed May 29 16:19:43 2024 -0500

    fix for `inSamePackage`
---
 .../java/org/codehaus/groovy/ast/tools/GeneralUtils.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java 
b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index e4b4838f7f..09ca3e6ef6 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -26,7 +26,6 @@ import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.FieldNode;
 import org.codehaus.groovy.ast.MethodNode;
-import org.codehaus.groovy.ast.PackageNode;
 import org.codehaus.groovy.ast.Parameter;
 import org.codehaus.groovy.ast.PropertyNode;
 import org.codehaus.groovy.ast.Variable;
@@ -84,6 +83,7 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -1117,17 +1117,13 @@ public class GeneralUtils {
     }
 
     public static boolean inSamePackage(final ClassNode first, final ClassNode 
second) {
-        PackageNode firstPackage = first.getPackage();
-        PackageNode secondPackage = second.getPackage();
-        return ((firstPackage == null && secondPackage == null)
-                || firstPackage != null && secondPackage != null && 
firstPackage.getName().equals(secondPackage.getName()));
+        return Objects.equals(first.getPackageName(), second.getPackageName());
     }
 
-    public static boolean inSamePackage(final Class<?> first, final Class<?> 
second) {
-        Package firstPackage = first.getPackage();
-        Package secondPackage = second.getPackage();
-        return ((firstPackage == null && secondPackage == null)
-                || firstPackage != null && secondPackage != null && 
firstPackage.getName().equals(secondPackage.getName()));
+    public static boolean inSamePackage(final Class<?>  first, final Class<?>  
second) {
+        Package firstPackage = first.getPackage(), secondPackage = 
second.getPackage();
+        return (firstPackage == secondPackage || (firstPackage != null && 
secondPackage != null
+                                                  && 
firstPackage.getName().equals(secondPackage.getName())));
     }
 
     public static boolean isDefaultVisibility(final int modifiers) {