This is an automated email from the ASF dual-hosted git repository.
paulk 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 116c24a29e minor refactor: fix/suppress some unchecked/rawtypes
warnings
116c24a29e is described below
commit 116c24a29ed28a8f55396388345e898c1b61e273
Author: Paul King <[email protected]>
AuthorDate: Mon Apr 6 10:48:20 2026 +1000
minor refactor: fix/suppress some unchecked/rawtypes warnings
---
.../concurrentlinkedhashmap/ConcurrentLinkedHashMap.java | 2 ++
.../ginq/provider/collection/runtime/Partition.java | 3 ++-
.../ginq/provider/collection/runtime/Queryable.java | 6 +++++-
.../provider/collection/runtime/QueryableCollection.java | 16 +++++++++++++---
.../groovy/ginq/transform/GinqASTTransformation.java | 1 +
.../src/main/java/groovy/json/DefaultJsonGenerator.java | 1 +
.../src/main/java/groovy/json/JsonSlurper.java | 4 ++++
.../src/main/java/groovy/json/JsonSlurperClassic.java | 14 ++++++++++----
.../src/main/java/groovy/json/StreamingJsonBuilder.java | 7 +++++++
.../apache/groovy/json/internal/CharSequenceValue.java | 1 +
.../org/apache/groovy/json/internal/JsonFastParser.java | 3 ++-
.../apache/groovy/json/internal/JsonParserCharArray.java | 4 ++--
.../org/apache/groovy/json/internal/JsonParserLax.java | 3 ++-
.../json/internal/JsonParserUsingCharacterSource.java | 4 ++--
.../java/org/apache/groovy/json/internal/LazyMap.java | 3 +++
.../groovy/swing/binding/AbstractSyntheticBinding.java | 3 ++-
.../groovy/groovy/swing/binding/JComboBoxProperties.java | 3 +++
.../groovy/groovy/swing/factory/ComboBoxFactory.groovy | 1 +
.../groovy/groovy/swing/factory/TableModelFactory.groovy | 2 ++
.../main/groovy/groovy/swing/impl/ClosureRenderer.java | 1 +
.../groovy/groovy/swing/impl/ListWrapperListModel.java | 1 +
.../main/java/groovy/swing/model/DefaultTableModel.java | 6 ++++++
.../src/main/java/groovy/swing/table/TableMap.java | 1 +
.../src/main/java/groovy/swing/table/TableSorter.java | 1 +
.../groovy/swing/binding/ClosureTriggerBinding.java | 4 ++--
.../apache/groovy/swing/extensions/SwingExtensions.java | 2 ++
26 files changed, 79 insertions(+), 18 deletions(-)
diff --git
a/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
b/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
index 63bb6326c8..c8b81bfbfb 100644
---
a/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
+++
b/src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
@@ -351,6 +351,7 @@ public final class ConcurrentLinkedHashMap<K, V> extends
AbstractMap<K, V>
}
/** Returns the index to the read buffer to record into. */
+ @SuppressWarnings("deprecation")
static int readBufferIndex() {
// A buffer is chosen by the thread's id so that tasks are distributed in a
// pseudo evenly manner. This helps avoid hot entries causing contention
@@ -432,6 +433,7 @@ public final class ConcurrentLinkedHashMap<K, V> extends
AbstractMap<K, V>
/** Drains the read buffers, each up to an amortized threshold. */
@GuardedBy("evictionLock")
+ @SuppressWarnings("deprecation")
void drainReadBuffers() {
final int start = (int) Thread.currentThread().getId();
final int end = start + NUMBER_OF_READ_BUFFERS;
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
index 0da6ed6092..ec13fa5578 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
+++
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Partition.java
@@ -34,7 +34,7 @@ public interface Partition<T> extends Queryable<T> {
* Represents the empty Partition instance
* @since 4.0.0
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({"rawtypes", "unchecked"})
Partition EMPTY_PARTITION = new PartitionImpl(Collections.emptyList());
/**
@@ -56,6 +56,7 @@ public interface Partition<T> extends Queryable<T> {
* @return the empty Partition instance
* @since 4.0.0
*/
+ @SuppressWarnings("unchecked")
static <T> Partition<T> emptyPartition() {
return (Partition<T>) EMPTY_PARTITION;
}
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Queryable.java
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Queryable.java
index a9940dd93c..703d0d9364 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Queryable.java
+++
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/Queryable.java
@@ -49,7 +49,7 @@ public interface Queryable<T> {
* Represents the empty Queryable instance
* @since 4.0.0
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({"rawtypes", "unchecked"})
Queryable EMPTY_QUERYABLE = from(new Object[0]);
/**
@@ -59,6 +59,7 @@ public interface Queryable<T> {
* @return the empty Queryable instance
* @since 4.0.0
*/
+ @SuppressWarnings("unchecked")
static <T> Queryable<T> emptyQueryable() {
return (Queryable<T>) EMPTY_QUERYABLE;
}
@@ -252,6 +253,7 @@ public interface Queryable<T> {
* @return the result of order by
* @since 4.0.0
*/
+ @SuppressWarnings("unchecked")
<U extends Comparable<? super U>> Queryable<T> orderBy(Order<? super T, ?
extends U>... orders);
/**
@@ -262,6 +264,7 @@ public interface Queryable<T> {
* @return the result of order by
* @since 4.0.0
*/
+ @SuppressWarnings("unchecked")
default <U extends Comparable<? super U>> Queryable<T> orderBy(List<?
extends Order<? super T, ? extends U>> orders) {
return orderBy(orders.toArray(Order.EMPTY_ARRAY));
}
@@ -520,6 +523,7 @@ public interface Queryable<T> {
* @since 4.0.0
*/
class Order<T, U extends Comparable<? super U>> {
+ @SuppressWarnings("rawtypes")
public static final Order[] EMPTY_ARRAY = new Order[0];
private final Function<? super T, ? extends U> keyExtractor;
private final boolean asc;
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
index c0968dea08..fcfe7111bb 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
+++
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
@@ -262,8 +262,9 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
return Group.of(stream);
}
+ @SafeVarargs
@Override
- public <U extends Comparable<? super U>> Queryable<T> orderBy(Order<?
super T, ? extends U>... orders) {
+ public final <U extends Comparable<? super U>> Queryable<T>
orderBy(Order<? super T, ? extends U>... orders) {
Comparator<T> comparator = makeComparator(orders);
if (null == comparator) {
return this;
@@ -272,10 +273,12 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
return from(this.stream().sorted(comparator));
}
+ @SuppressWarnings("unchecked")
protected static <T, U extends Comparable<? super U>> Comparator<T>
makeComparator(List<? extends Order<? super T, ? extends U>> orders) {
return makeComparator(orders.toArray(Order.EMPTY_ARRAY));
}
+ @SafeVarargs
protected static <T, U extends Comparable<? super U>> Comparator<T>
makeComparator(Order<? super T, ? extends U>... orders) {
if (null == orders || 0 == orders.length) {
return null;
@@ -300,6 +303,7 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
return from(stream);
}
+ @SuppressWarnings("unchecked")
@Override
public <U> Queryable<U> select(BiFunction<? super T, ? super Queryable<?
extends T>, ? extends U> mapper) {
final String originalParallel = QueryableHelper.getVar(PARALLEL);
@@ -325,7 +329,9 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
stream =
stream.collect(Collectors.toList()).parallelStream().map((U u) -> {
boolean interrupted = false;
try {
- return (U) ((CompletableFuture) u).get();
+ @SuppressWarnings("unchecked")
+ U result = (U) ((CompletableFuture) u).get();
+ return result;
} catch (InterruptedException | ExecutionException ex) {
if (ex instanceof InterruptedException) interrupted =
true;
throw new GroovyRuntimeException(ex);
@@ -575,7 +581,9 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
writeLock.lock();
try {
if (sourceIterable instanceof List) {
- return (List<T>) sourceIterable;
+ @SuppressWarnings("unchecked")
+ List<T> list = (List<T>) sourceIterable;
+ return list;
}
final List<T> result = stream().collect(Collectors.toList());
@@ -612,6 +620,7 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
@Override
public <U extends Comparable<? super U>> Window<T> over(Tuple2<T, Long>
currentRecord, WindowDefinition<T, U> windowDefinition) {
+ @SuppressWarnings("unchecked")
final Tuple3<String, String, String> idTuple = (Tuple3<String, String,
String>) windowDefinition.getId(); // (partitionId, orderId, windowDefinitionId)
final String partitionId = idTuple.getV1();
@@ -681,6 +690,7 @@ class QueryableCollection<T> implements Queryable<T>,
Serializable {
this.orderId = orderId;
}
+ @SuppressWarnings("rawtypes")
@Override
public boolean equals(Object o) {
if (this == o) return true;
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/transform/GinqASTTransformation.java
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/transform/GinqASTTransformation.java
index e6b333e6b0..7087ffb9e4 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/transform/GinqASTTransformation.java
+++
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/transform/GinqASTTransformation.java
@@ -114,6 +114,7 @@ public class GinqASTTransformation extends
AbstractASTTransformation {
.collect(Collectors.toList()));
}
+ @SuppressWarnings("unchecked")
private static Object getDefaultOptionValue(String optionName) {
try {
return
GQ_CLASS_NODE.getTypeClass().getMethod(optionName).getDefaultValue();
diff --git
a/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
b/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
index 66ae17f37a..80ba74cade 100644
---
a/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
+++
b/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
@@ -171,6 +171,7 @@ public class DefaultJsonGenerator implements JsonGenerator {
/**
* Serializes object and writes it into specified buffer.
*/
+ @SuppressWarnings("unchecked")
protected void writeObject(String key, Object object, CharBuf buffer) {
if (isExcludingValues(object)) {
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
index 58a62d1ec8..b3633753fa 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
@@ -398,6 +398,7 @@ public class JsonSlurper {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(URL url, Map params) {
return parseURL(url, params);
}
@@ -469,6 +470,7 @@ public class JsonSlurper {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(URL url, Map params, String charset) {
return parseURL(url, params, charset);
}
@@ -482,10 +484,12 @@ public class JsonSlurper {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(Map params, URL url, String charset) {
return parseURL(url, params, charset);
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
private Object parseURL(URL url, Map params, String charset) {
Reader reader = null;
try {
diff --git
a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
index 2e92714a08..e976c26bf0 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurperClassic.java
@@ -165,6 +165,7 @@ public class JsonSlurperClassic {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(URL url, Map params) {
return parseURL(url, params);
}
@@ -177,10 +178,12 @@ public class JsonSlurperClassic {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(Map params, URL url) {
return parseURL(url, params);
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
private Object parseURL(URL url, Map params) {
Reader reader = null;
try {
@@ -220,6 +223,7 @@ public class JsonSlurperClassic {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(URL url, Map params, String charset) {
return parseURL(url, params, charset);
}
@@ -233,10 +237,12 @@ public class JsonSlurperClassic {
* @return a data structure of lists and maps
* @since 2.2.0
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public Object parse(Map params, URL url, String charset) {
return parseURL(url, params, charset);
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
private Object parseURL(URL url, Map params, String charset) {
Reader reader = null;
try {
@@ -261,8 +267,8 @@ public class JsonSlurperClassic {
* @param lexer the lexer
* @return a list of JSON values
*/
- private List parseArray(JsonLexer lexer) {
- List content = new ArrayList();
+ private List<Object> parseArray(JsonLexer lexer) {
+ List<Object> content = new ArrayList<>();
JsonToken currentToken;
@@ -329,8 +335,8 @@ public class JsonSlurperClassic {
* @param lexer the lexer
* @return a Map representing a JSON object
*/
- private Map parseObject(JsonLexer lexer) {
- Map content = new HashMap();
+ private Map<String, Object> parseObject(JsonLexer lexer) {
+ Map<String, Object> content = new HashMap<>();
JsonToken previousToken = null;
JsonToken currentToken = null;
diff --git
a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
index 380ad48630..8622824889 100644
---
a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
+++
b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
@@ -244,6 +244,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
/**
* Delegates to {@link #call(Iterable, Closure)}
*/
+ @SuppressWarnings("unchecked")
public Object call(Collection coll, @DelegatesTo(value =
StreamingJsonDelegate.class, strategy = Closure.DELEGATE_FIRST) Closure c)
throws IOException {
return call((Iterable) coll, c);
}
@@ -335,6 +336,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
/**
* Delegates to {@link #call(String, Iterable, Closure)}
*/
+ @SuppressWarnings("unchecked")
public void call(String name, Collection coll, @DelegatesTo(value =
StreamingJsonDelegate.class, strategy = Closure.DELEGATE_FIRST) Closure c)
throws IOException {
call(name, (Iterable) coll, c);
}
@@ -361,6 +363,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
* @param callable Additional attributes of the JSON object represented by
the closure
* @throws IOException
*/
+ @SuppressWarnings("unchecked")
public void call(String name, Map map, @DelegatesTo(value =
StreamingJsonDelegate.class, strategy = Closure.DELEGATE_FIRST) Closure
callable) throws IOException {
writer.write(JsonOutput.OPEN_BRACE);
writer.write(generator.toJson(name));
@@ -452,6 +455,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
* @param name the single key
* @param args the value associated with the key
*/
+ @SuppressWarnings("unchecked")
@Override
public Object invokeMethod(String name, Object args) {
boolean notExpectedArgs = false;
@@ -539,6 +543,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
return writer;
}
+ @SuppressWarnings("unchecked")
@Override
public Object invokeMethod(String name, Object args) {
if (args != null &&
Object[].class.isAssignableFrom(args.getClass())) {
@@ -654,6 +659,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
/**
* Delegates to {@link #call(String, Iterable, Closure)}
*/
+ @SuppressWarnings("unchecked")
public void call(String name, Collection coll, @DelegatesTo(value =
StreamingJsonDelegate.class, strategy = Closure.DELEGATE_FIRST) Closure c)
throws IOException {
call(name, (Iterable)coll, c);
}
@@ -791,6 +797,7 @@ public class StreamingJsonBuilder extends
GroovyObjectSupport {
return args.length == 2 && args[0] instanceof Iterable && args[1]
instanceof Closure;
}
+ @SuppressWarnings("unchecked")
public static Object writeCollectionWithClosure(Writer writer,
Collection coll, @DelegatesTo(value = StreamingJsonDelegate.class, strategy =
Closure.DELEGATE_FIRST) Closure closure) throws IOException {
return writeCollectionWithClosure(writer, (Iterable) coll,
closure, JsonOutput.DEFAULT_GENERATOR);
}
diff --git
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
index 49289e7887..670e472668 100644
---
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
+++
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharSequenceValue.java
@@ -93,6 +93,7 @@ public class CharSequenceValue implements Value, CharSequence
{
return null;
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static <T extends Enum> T toEnum(Class<T> cls, String value) {
try {
return (T) Enum.valueOf(cls, value);
diff --git
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
index 82cc91bd8a..38f3f50523 100644
---
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
+++
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonFastParser.java
@@ -55,6 +55,7 @@ public class JsonFastParser extends JsonParserCharArray {
this.checkDates = checkDates;
}
+ @SuppressWarnings("unchecked")
protected final Value decodeJsonObjectLazyFinalParse() {
char[] array = charArray;
@@ -236,7 +237,7 @@ public class JsonFastParser extends JsonParserCharArray {
/* the list might be empty */
if (__currentChar == ']') {
__index++;
- return new ValueContainer(new ArrayList());
+ return new ValueContainer(new ArrayList<>());
}
List<Object> list;
diff --git
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
index d053eed545..268a4d5bb8 100644
---
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
+++
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserCharArray.java
@@ -294,10 +294,10 @@ public class JsonParserCharArray extends BaseJsonParser {
/* the list might be empty */
if (__currentChar == ']') {
__index++;
- return new ArrayList();
+ return new ArrayList<>();
}
- list = new ArrayList();
+ list = new ArrayList<>();
while (this.hasMore()) {
Object arrayItem = decodeValueInternal();
diff --git
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
index c05ae554df..54d8c14f4c 100644
---
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
+++
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserLax.java
@@ -51,6 +51,7 @@ public class JsonParserLax extends JsonParserCharArray {
this.defaultCheckDates = defaultCheckDates;
}
+ @SuppressWarnings("unchecked")
private Value decodeJsonObjectLax() {
if (__currentChar == '{')
this.nextChar();
@@ -597,7 +598,7 @@ public class JsonParserLax extends JsonParserCharArray {
if (__currentChar == ']') {
__index++;
- return new ValueContainer(new ArrayList());
+ return new ValueContainer(new ArrayList<>());
}
List<Object> list;
diff --git
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
index ebe71d56a4..e23bc3b64b 100644
---
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
+++
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/JsonParserUsingCharacterSource.java
@@ -206,10 +206,10 @@ public class JsonParserUsingCharacterSource extends
BaseJsonParser {
/* the list might be empty */
if (this.characterSource.currentChar() == ']') {
characterSource.nextChar();
- return new ArrayList();
+ return new ArrayList<>();
}
- list = new ArrayList();
+ list = new ArrayList<>();
do {
characterSource.skipWhiteSpace();
diff --git
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
index d2004f0b97..724c6033df 100644
---
a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
+++
b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/LazyMap.java
@@ -145,6 +145,7 @@ public class LazyMap extends AbstractMap<String, Object> {
}
@Override
+ @SuppressWarnings("unchecked")
public void putAll(Map m) {
buildIfNeeded();
map.putAll(m);
@@ -190,6 +191,7 @@ public class LazyMap extends AbstractMap<String, Object> {
}
@Override
+ @SuppressWarnings({"rawtypes", "unchecked"})
protected Object clone() throws CloneNotSupportedException {
if (map == null) {
return null;
@@ -211,6 +213,7 @@ public class LazyMap extends AbstractMap<String, Object> {
return map;
}
+ @SuppressWarnings("unchecked")
public static <V> V[] grow(V[] array) {
Object newArray =
Array.newInstance(array.getClass().getComponentType(), array.length * 2);
System.arraycopy(array, 0, newArray, 0, array.length);
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
index 10c717a515..c1090541e2 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractSyntheticBinding.java
@@ -26,8 +26,9 @@ import org.apache.groovy.swing.binding.TargetBinding;
public abstract class AbstractSyntheticBinding extends AbstractFullBinding {
boolean bound;
String propertyName;
- Class klass;
+ Class<?> klass;
+ @SuppressWarnings("rawtypes")
public AbstractSyntheticBinding(PropertyBinding source, TargetBinding
target, Class klass, String propertyName) {
this.propertyName = propertyName;
this.klass = klass;
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
index 334c50ece8..c9d83219d5 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
@@ -55,6 +55,7 @@ public class JComboBoxProperties {
}
+@SuppressWarnings("rawtypes")
class JComboBoxSelectedElementBinding extends AbstractSyntheticBinding
implements PropertyChangeListener, ItemListener {
JComboBox boundComboBox;
@@ -93,6 +94,7 @@ class JComboBoxSelectedElementBinding extends
AbstractSyntheticBinding implement
}
+@SuppressWarnings("rawtypes")
class JComboBoxSelectedIndexBinding extends AbstractSyntheticBinding
implements PropertyChangeListener, ItemListener {
JComboBox boundComboBox;
@@ -131,6 +133,7 @@ class JComboBoxSelectedIndexBinding extends
AbstractSyntheticBinding implements
}
+@SuppressWarnings({"rawtypes", "unchecked"})
class JComboBoxElementsBinding extends AbstractSyntheticBinding implements
ListDataListener, PropertyChangeListener {
JComboBox boundComboBox;
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
index e8ad6f7c72..b4dbbb885a 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
@@ -24,6 +24,7 @@ import javax.swing.*
public class ComboBoxFactory extends AbstractFactory {
+ @SuppressWarnings("unchecked")
public Object newInstance(FactoryBuilderSupport builder, Object name,
Object value, Map attributes) throws InstantiationException,
IllegalAccessException {
FactoryBuilderSupport.checkValueIsType(value, name, JComboBox)
//TODO expand to allow the value arg to be items
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
index 90d3ce02ff..fa0e9e3284 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
@@ -69,6 +69,7 @@ class TableModelFactory extends AbstractFactory {
class PropertyColumnFactory extends AbstractFactory {
+ @SuppressWarnings("unchecked")
Object newInstance(FactoryBuilderSupport builder, Object name, Object
value, Map attributes) throws InstantiationException, IllegalAccessException {
FactoryBuilderSupport.checkValueIsNull(value, name)
Object current = builder.getCurrent()
@@ -99,6 +100,7 @@ class PropertyColumnFactory extends AbstractFactory {
class ClosureColumnFactory extends AbstractFactory {
+ @SuppressWarnings("unchecked")
Object newInstance(FactoryBuilderSupport builder, Object name, Object
value, Map attributes) throws InstantiationException, IllegalAccessException {
FactoryBuilderSupport.checkValueIsNull(value, name)
Object current = builder.getCurrent()
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
index d5a2deeb1a..f8a9eedc11 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureRenderer.java
@@ -28,6 +28,7 @@ import java.awt.*;
import java.util.ArrayList;
import java.util.List;
+@SuppressWarnings({"rawtypes", "unchecked"})
public class ClosureRenderer implements ListCellRenderer, TableCellRenderer,
TreeCellRenderer {
Closure update;
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
index ba3539b66a..ca403c27f6 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ListWrapperListModel.java
@@ -27,6 +27,7 @@ import java.util.ListIterator;
/**
* A {@code ListModel} implementation that's backed by a live {@code List}.
*/
+@SuppressWarnings("rawtypes")
public class ListWrapperListModel<E> extends AbstractListModel {
private final List<E> delegate;
diff --git
a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
index de696c7b6d..81c3e1af1a 100644
---
a/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
+++
b/subprojects/groovy-swing/src/main/java/groovy/swing/model/DefaultTableModel.java
@@ -49,6 +49,7 @@ public class DefaultTableModel extends AbstractTableModel {
/**
* @return the column definitions.
*/
+ @SuppressWarnings("rawtypes")
public List getColumnList() {
return columnModel.getColumnList();
}
@@ -126,6 +127,7 @@ public class DefaultTableModel extends AbstractTableModel {
return answer;
}
+ @SuppressWarnings("rawtypes")
@Override
public Class getColumnClass(int columnIndex) {
return getColumnModel(columnIndex).getType();
@@ -136,6 +138,7 @@ public class DefaultTableModel extends AbstractTableModel {
return getColumnModel(columnIndex).isEditable();
}
+ @SuppressWarnings("rawtypes")
@Override
public Object getValueAt(int rowIndex, int columnIndex) {
List rows = getRows();
@@ -155,6 +158,7 @@ public class DefaultTableModel extends AbstractTableModel {
return column.getValue(row, rowIndex, columnIndex);
}
+ @SuppressWarnings("rawtypes")
@Override
public void setValueAt(Object value, int rowIndex, int columnIndex) {
List rows = getRows();
@@ -178,6 +182,7 @@ public class DefaultTableModel extends AbstractTableModel {
return column.getValueModel();
}
+ @SuppressWarnings("rawtypes")
protected List getRows() {
Object value = rowsModel.getValue();
if (value == null) {
@@ -187,6 +192,7 @@ public class DefaultTableModel extends AbstractTableModel {
}
protected static class MyTableColumnModel extends DefaultTableColumnModel {
+ @SuppressWarnings("rawtypes")
public List getColumnList() {
return tableColumns;
}
diff --git
a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
index 10276d0e1b..00426ad680 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableMap.java
@@ -72,6 +72,7 @@ public class TableMap extends AbstractTableModel implements
TableModelListener {
return model.getColumnName(aColumn);
}
+ @SuppressWarnings("rawtypes")
@Override
public Class getColumnClass(int aColumn) {
return model.getColumnClass(aColumn);
diff --git
a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
index 84cd20c6fe..ae27e1a5cb 100644
--- a/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
+++ b/subprojects/groovy-swing/src/main/java/groovy/swing/table/TableSorter.java
@@ -157,6 +157,7 @@ public class TableSorter extends TableMap {
return Double.compare(d1, d2);
}
+ @SuppressWarnings("unchecked")
public int compare(int row1, int row2) {
for (int level = 0; level < sortingColumns.size(); level++) {
Integer column = (Integer) sortingColumns.elementAt(level);
diff --git
a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
index c753a4fdb5..c5edbedd51 100644
---
a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
+++
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/binding/ClosureTriggerBinding.java
@@ -68,10 +68,10 @@ public class ClosureTriggerBinding implements
TriggerBinding, SourceBinding {
final BindPathSnooper delegate = new BindPathSnooper();
try {
// create our own local copy of the closure
- final Class closureClass = closure.getClass();
+ final Class<?> closureClass = closure.getClass();
// assume closures have only 1 constructor, of the form (Object,
Reference*)
- Constructor constructor = closureClass.getConstructors()[0];
+ Constructor<?> constructor = closureClass.getConstructors()[0];
int paramCount = constructor.getParameterTypes().length;
Object[] args = new Object[paramCount];
args[0] = delegate;
diff --git
a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
index 17e21e095c..95878ae389 100644
---
a/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
+++
b/subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java
@@ -281,6 +281,7 @@ public class SwingExtensions {
* @return the item count of the comboBox
* @since 1.6.4
*/
+ @SuppressWarnings("rawtypes")
public static int size(JComboBox self) {
return self.getItemCount();
}
@@ -293,6 +294,7 @@ public class SwingExtensions {
* @return the tem at the given index
* @since 1.6.4
*/
+ @SuppressWarnings("rawtypes")
public static Object getAt(JComboBox self, int index) {
return self.getItemAt(index);
}
