You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/02/08 05:15:22 UTC
[groovy] branch master updated (724cc0d -> b076a36)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 724cc0d remove Xlint warnings
new 18e725c fix typo
new d3e69a6 adopt Gradle recommended value for maxParallelForks
new b076a36 remove Xlint warnings
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gradle/test.gradle | 2 +-
.../src/main/java/groovy/servlet/GroovyServlet.java | 3 +--
.../src/main/java/groovy/servlet/ServletBinding.java | 8 +++++++-
.../java/org/apache/groovy/swing/extensions/SwingExtensions.java | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
[groovy] 03/03: remove Xlint warnings
Posted by pa...@apache.org.
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
commit b076a3693ba7f4b249d6d0b8ac8407c3055dfa88
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Feb 8 15:15:10 2020 +1000
remove Xlint warnings
---
.../src/main/java/groovy/servlet/GroovyServlet.java | 3 +--
.../src/main/java/groovy/servlet/ServletBinding.java | 8 +++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
index ea0ac9a..7ce2f7a 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
@@ -110,8 +110,7 @@ public class GroovyServlet extends AbstractHttpServlet {
// Run the script
try {
- Closure closure = new Closure(gse) {
-
+ Closure<?> closure = new Closure<Object>(gse) {
public Object call() {
try {
return ((GroovyScriptEngine) getDelegate()).run(scriptUri, binding);
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
index b626969..3660460 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
@@ -303,8 +303,9 @@ public class ServletBinding extends Binding {
super.setVariable("html", builder);
try {
+ // load using reflection to avoid needing a hard requirement on groovy-json for those not needing JSON support
Class jsonBuilderClass = this.getClass().getClassLoader().loadClass("groovy.json.StreamingJsonBuilder");
- Constructor writerConstructor = jsonBuilderClass.getConstructor(Writer.class);
+ Constructor writerConstructor = getWriterConstructor(jsonBuilderClass);
super.setVariable("json", writerConstructor.newInstance(output.getWriter()));
} catch (Throwable t) {
t.printStackTrace();
@@ -323,6 +324,11 @@ public class ServletBinding extends Binding {
super.setVariable("redirect", c);
}
+ @SuppressWarnings("unchecked")
+ private Constructor getWriterConstructor(Class jsonBuilderClass) throws NoSuchMethodException {
+ return jsonBuilderClass.getConstructor(Writer.class);
+ }
+
private static void validateArgs(String name, String message) {
if (name == null) {
throw new IllegalArgumentException(message + " null key.");
[groovy] 02/03: adopt Gradle recommended value for maxParallelForks
Posted by pa...@apache.org.
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
commit d3e69a611759dd655a1edf1ac419fe1ffec1f8f8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Feb 8 15:14:42 2020 +1000
adopt Gradle recommended value for maxParallelForks
---
gradle/test.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 4d3d282..0069905 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -37,7 +37,7 @@ allprojects {
systemProperties 'apple.awt.UIElement': 'true', 'javadocAssertion.src.dir': './src/main'
forkEvery = 50
- maxParallelForks = isRunningOnCI() ? 1 : Runtime.runtime.availableProcessors()
+ maxParallelForks = isRunningOnCI() ? 1 : Runtime.runtime.availableProcessors().intdiv(2) ?: 1
scanForTestClasses = true
ignoreFailures = false
testLogging {
[groovy] 01/03: fix typo
Posted by pa...@apache.org.
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
commit 18e725c8fc6808b2fe70e52fb29a76a01928cfc5
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Feb 8 15:12:50 2020 +1000
fix typo
---
.../main/java/org/apache/groovy/swing/extensions/SwingExtensions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 18a1a4c..c7a8523 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
@@ -198,7 +198,7 @@ public class SwingExtensions {
}
public void remove() {
- throw new UnsupportedOperationException("LisModel is immutable.");
+ throw new UnsupportedOperationException("ListModel is immutable.");
}
};
}