This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 77b4a2c97e50cc57789088251dcb1b29154889ae Author: Eric Milles <[email protected]> AuthorDate: Tue Jan 21 14:18:22 2020 -0600 fix for build warnings (cherry picked from commit a85fe87dcb222c8ce6e48c567388759cc882c1d0) --- src/test/org/apache/groovy/util/ArraysTest.java | 5 +++-- .../groovy-swing/src/test/groovy/groovy/swing/DummyBean.java | 8 ++++---- .../src/test/groovy/groovy/text/CustomBaseTemplate.java | 9 ++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/org/apache/groovy/util/ArraysTest.java b/src/test/org/apache/groovy/util/ArraysTest.java index f6e15d3..d3cda7c 100644 --- a/src/test/org/apache/groovy/util/ArraysTest.java +++ b/src/test/org/apache/groovy/util/ArraysTest.java @@ -21,11 +21,12 @@ package org.apache.groovy.util; import org.junit.Assert; import org.junit.Test; -public class ArraysTest { +public final class ArraysTest { + @Test public void testConcat0() { Assert.assertNull(Arrays.concat()); - Assert.assertNull(Arrays.concat(null)); + Assert.assertNull(Arrays.concat((Object[][]) null)); } @Test diff --git a/subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java b/subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java index 9ab11a2..2031b46 100644 --- a/subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java +++ b/subprojects/groovy-swing/src/test/groovy/groovy/swing/DummyBean.java @@ -25,12 +25,13 @@ import java.util.HashMap; import java.util.Map; /** - * A bean used by the test cases + * A bean used by the test cases. */ public class DummyBean { + private String name = "James"; - private Integer i = 123; - private Map dynamicProperties = new HashMap(); + private Integer i = Integer.valueOf(123); + private Map<String, Object> dynamicProperties = new HashMap<>(); private Point point; private PropertyChangeSupport changeSupport = new PropertyChangeSupport(this); @@ -101,5 +102,4 @@ public class DummyBean { public void setPoint(Point point) { changeSupport.firePropertyChange("point", this.point, this.point = point); } - } diff --git a/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java b/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java index ba257ff..8209d93 100644 --- a/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java +++ b/subprojects/groovy-templates/src/test/groovy/groovy/text/CustomBaseTemplate.java @@ -25,15 +25,14 @@ import groovy.text.markup.TemplateConfiguration; import java.util.Map; public abstract class CustomBaseTemplate extends BaseTemplate { - private String version; - public CustomBaseTemplate( - final MarkupTemplateEngine templateEngine, - final Map model, - final Map modelTypes, final TemplateConfiguration configuration) { + public CustomBaseTemplate(final MarkupTemplateEngine templateEngine, + final Map model, final Map<String, String> modelTypes, final TemplateConfiguration configuration) { super(templateEngine, model, modelTypes, configuration); } + private String version; + public String getVersion() { return version; }
