Fix reliability issues reported by Sonar

Author: daniellansun

src/main/java/groovy/concurrent/AwaitableAdapterRegistry.java

@@ -232,6 +232,9 @@ public <T> Awaitable<T> toAwaitable(Object source) {
                         cf.complete(future.get());
                     } catch (ExecutionException e) {
                         cf.completeExceptionally(e.getCause());
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        cf.completeExceptionally(e);
                     } catch (Throwable e) {
                         cf.completeExceptionally(e);
                     }

src/main/java/groovy/io/LineColumnReader.java

@@ -111,10 +111,10 @@ public int read() throws IOException {
                 newLineWasRead = true;
                 if (c == '\r') {
                     mark(1);
-                    c = (char)super.read();
+                    int nextChar = super.read();
                     // check if we have \r\n like on Windows
                     // if it's not \r\n we reset, otherwise, the \n is just consumed
-                    if (c != '\n') {
+                    if (nextChar != '\n') {
                         reset();
                     }
                 }

src/main/java/groovy/lang/NumberRange.java

@@ -544,7 +544,7 @@ void calcSize(Comparable from, Comparable to, Number stepSize) {
 
     private boolean isIntegral(Number stepSize) {
         BigDecimal tempStepSize = NumberMath.toBigDecimal(stepSize);
-        return tempStepSize.equals(new BigDecimal(tempStepSize.toBigInteger()));
+        return tempStepSize.compareTo(new BigDecimal(tempStepSize.toBigInteger())) == 0;
     }
 
     /**

src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java

@@ -5484,7 +5484,7 @@ public List<DeclarationExpression> getDeclarationExpressions() {
     // GROOVY-10355: a cast whose operand is the binary-only keyword identifier "in" or "as"
     private static final String CAST_OF_BINARY_KEYWORD = "_CAST_OF_BINARY_KEYWORD";
 
-    private static final Pattern BARE_NAME_PATTERN = Pattern.compile("[A-Za-z_$][A-Za-z0-9_$]*(\\.[A-Za-z_$][A-Za-z0-9_$]*)*");
+    private static final Pattern BARE_NAME_PATTERN = Pattern.compile("[A-Za-z_$][A-Za-z0-9_$]*(?:\\.[A-Za-z_$][A-Za-z0-9_$]*)*");
 
     private static final String CLASS_NAME = "_CLASS_NAME";
     private static final String INSIDE_PARENTHESES_LEVEL = "_INSIDE_PARENTHESES_LEVEL";

src/main/java/org/codehaus/groovy/ast/FieldNode.java

@@ -252,6 +252,11 @@ public boolean equals(Object obj) {
         return super.equals(obj);
     }
 
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
     /**
      * Returns the original declared type of this field before any transformations.
      * Useful for preserving type information through compilation phases that may modify types.

src/main/java/org/codehaus/groovy/classgen/asm/ClosureWriter.java

@@ -1557,7 +1557,7 @@ private static long hash(String str) {
         }
         final byte[] hashBytes = md.digest(str.getBytes(StandardCharsets.UTF_8));
         long hash = 0;
-        for (int i = Math.min(hashBytes.length, 7); i >= 0; i--) {
+        for (int i = Math.min(hashBytes.length - 1, 7); i >= 0; i--) {
             hash = (hash << 8) | (hashBytes[i] & 0xFF);
         }
         return hash;

src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java

@@ -561,7 +561,7 @@ private MethodNode chooseMethodRefMethod(final List<MethodNode> methods, final E
                 score += 9;
             }
             return score;
-        }).thenComparing(StaticTypesMethodReferenceExpressionWriter::isExtensionMethod)).get();
+        }).thenComparing(StaticTypesMethodReferenceExpressionWriter::isExtensionMethod)).orElse(null);
     }
 
     private List<MethodNode> findVisibleMethods(final String name, final ClassNode type) {

src/main/java/org/codehaus/groovy/runtime/MetaClassHelper.java

@@ -1024,12 +1024,12 @@ public static void unwrap(Object[] arguments) {
      */
     public static Object normalizeBoxedReturn(final Object value, final Class<?> returnType) {
         if (value == null || !returnType.isPrimitive()) return value; // null includes void
-        if (returnType == int.class) return Integer.valueOf((Integer) value);
-        if (returnType == boolean.class) return Boolean.valueOf((Boolean) value);
-        if (returnType == long.class) return Long.valueOf((Long) value);
-        if (returnType == char.class) return Character.valueOf((Character) value);
-        if (returnType == byte.class) return Byte.valueOf((Byte) value);
-        if (returnType == short.class) return Short.valueOf((Short) value);
+        if (returnType == int.class) return Integer.valueOf(((Integer) value).intValue());
+        if (returnType == boolean.class) return Boolean.valueOf(((Boolean) value).booleanValue());
+        if (returnType == long.class) return Long.valueOf(((Long) value).longValue());
+        if (returnType == char.class) return Character.valueOf(((Character) value).charValue());
+        if (returnType == byte.class) return Byte.valueOf(((Byte) value).byteValue());
+        if (returnType == short.class) return Short.valueOf(((Short) value).shortValue());
         return value; // float/double: valueOf does not cache on any path
     }
 

src/test/groovy/org/codehaus/groovy/runtime/memoize/CacheCleanupTest.groovy

@@ -57,7 +57,7 @@ public class CacheCleanupTest {
         cache.put('key2', new SoftReference(ANCHOR))
         assert cache.@map.size() == 2
         for (i in (3..1000)) {
-            cache.put("key${i}", new SoftReference(null))  //Simulating evicted objects
+            cache.put('key' + i, new SoftReference(null))  //Simulating evicted objects
             cache.get('key1')  //touch the non-null cache entries to keep them hot to prevent a potential LRU algorithm from evicting them
             cache.get('key2')
         }

src/test/groovy/org/codehaus/groovy/util/ManagedConcurrentValueMapTest.groovy

@@ -28,7 +28,7 @@ final class ManagedConcurrentValueMapTest {
     @Test
     void testEntriesRemoveSelfFromMapWhenFinalized() {
         for (int i = 0; i < 5; i++) {
-            map.put("Key${i}", new Object())
+            map.put('Key' + i, new Object())
         }
 
         assert map.@internalMap.size() == 5