You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/06/13 21:24:29 UTC
[wicket] branch master updated: Fix some javac compilation warnings
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new a78095e Fix some javac compilation warnings
a78095e is described below
commit a78095e6b874c8f5b4e71e5f7a04b5a3c4ccde5b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jun 14 00:23:47 2019 +0300
Fix some javac compilation warnings
---
.../testing/jstest/StartJavaScriptTests.java | 2 +-
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 1 +
.../wicket/ajax/AjaxSelfUpdatingTimerBehavior.java | 1 +
.../examples/spring/common/ContactGenerator.java | 2 +-
.../org/apache/wicket/examples/StartExamples.java | 2 +-
.../protocol/ws/javax/JavaxUpgradeHttpRequest.java | 2 +-
.../annot/SpringBeanWithGenericsTest.java | 25 ++++++++++------------
.../wicket/velocity/markup/html/VelocityPanel.java | 6 ------
8 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
index ee9ae3c..05e99d5 100644
--- a/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
+++ b/testing/wicket-js-tests/src/test/java/org/apache/wicket/testing/jstest/StartJavaScriptTests.java
@@ -74,7 +74,7 @@ public class StartJavaScriptTests
// use this certificate anywhere important as the passwords are
// available in the source.
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStoreResource(keystore);
sslContextFactory.setKeyStorePassword("wicket");
sslContextFactory.setKeyManagerPassword("wicket");
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
index 45a8f13..23d31fc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
@@ -58,6 +58,7 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
*
* @deprecated Since Wicket 9 this constructor is deprecated. It will be removed in Wicket 10. Use {@link AbstractAjaxTimerBehavior#AbstractAjaxTimerBehavior(Duration)} instead
*/
+ @Deprecated
public AbstractAjaxTimerBehavior(final org.apache.wicket.util.time.Duration updateInterval)
{
setUpdateInterval(updateInterval.toJavaDuration());
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
index 12edd2f..bb2aa0b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
@@ -41,6 +41,7 @@ public class AjaxSelfUpdatingTimerBehavior extends AbstractAjaxTimerBehavior
*
* @deprecated Since Wicket 9 this constructor is deprecated. It will be removed in Wicket 10. Use {@link AjaxSelfUpdatingTimerBehavior#AjaxSelfUpdatingTimerBehavior(Duration)} instead
*/
+ @Deprecated
public AjaxSelfUpdatingTimerBehavior(final org.apache.wicket.util.time.Duration updateInterval)
{
super(updateInterval);
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
index 1be0c41..249a8ba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java
@@ -82,7 +82,7 @@ public class ContactGenerator
* @param collection
* @param count
*/
- public void generate(Collection collection, int count)
+ public void generate(Collection<Contact> collection, int count)
{
for (int i = 0; i < count; i++)
{
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
index 9f08961..fecafda 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
@@ -75,7 +75,7 @@ public class StartExamples
// use this certificate anywhere important as the passwords are
// available in the source.
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStoreResource(keystore);
sslContextFactory.setKeyStorePassword("wicket");
sslContextFactory.setKeyManagerPassword("wicket");
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java
index bf22062..f1f58b9 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java
@@ -410,7 +410,7 @@ public class JavaxUpgradeHttpRequest implements HttpServletRequest
public Enumeration<String> getParameterNames()
{
final Iterator<String> iterator = parametersMap.keySet().iterator();
- return new Enumeration<String>()
+ return new Enumeration<>()
{
@Override
public boolean hasMoreElements()
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
index 3eea80b..653a93c 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java
@@ -39,16 +39,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* @author Andrea Del Bene
*
*/
-public class SpringBeanWithGenericsTest
+class SpringBeanWithGenericsTest
{
private WicketTester tester;
private AnnotationConfigApplicationContext ctx;
- /**
- * @throws Exception
- */
@BeforeEach
- public void before() throws Exception
+ void before()
{
tester = new WicketTester();
@@ -63,7 +60,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void genericAsQualifier() throws Exception
+ void genericAsQualifier()
{
AnnotatedBeanGenericQualifier page =
tester.startPage(new AnnotatedBeanGenericQualifier());
@@ -72,7 +69,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void listOfGenerics() throws Exception
+ void listOfGenerics()
{
AnnotatedListOfBeanGenericQualifier page =
tester.startPage(new AnnotatedListOfBeanGenericQualifier());
@@ -87,7 +84,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void listOfStringGenerics() throws Exception
+ void listOfStringGenerics()
{
AnnotatedListOfBeanStringGenericQualifier page =
tester.startPage(new AnnotatedListOfBeanStringGenericQualifier());
@@ -102,7 +99,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void mapOfGenerics() throws Exception
+ void mapOfGenerics()
{
AnnotatedMapOfBeanGenericQualifier page =
tester.startPage(new AnnotatedMapOfBeanGenericQualifier());
@@ -117,7 +114,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void setOfGenerics() throws Exception
+ void setOfGenerics()
{
AnnotatedSetOfBeanGenericQualifier page =
tester.startPage(new AnnotatedSetOfBeanGenericQualifier());
@@ -132,7 +129,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void listField() throws Exception
+ void listField()
{
AnnotatedListField page =
tester.startPage(new AnnotatedListField());
@@ -165,7 +162,7 @@ public class SpringBeanWithGenericsTest
}
@Test
- public void listOfTypedGenerics() throws Exception
+ void listOfTypedGenerics()
{
AnnotatedListOfBeanTypeQualifier page =
tester.startPage(new AnnotatedListOfBeanTypeQualifier());
@@ -299,7 +296,7 @@ public class SpringBeanWithGenericsTest
@Bean
public ArrayList<String> arrayListStrings()
{
- ArrayList<String> arrayList = new ArrayList();
+ ArrayList<String> arrayList = new ArrayList<>();
arrayList.add("one");
arrayList.add("two");
arrayList.add("three");
@@ -309,7 +306,7 @@ public class SpringBeanWithGenericsTest
@Bean
public ArrayList<Integer> arrayListIntegers()
{
- ArrayList<Integer> arrayList = new ArrayList();
+ ArrayList<Integer> arrayList = new ArrayList<>();
arrayList.add(1);
arrayList.add(2);
arrayList.add(3);
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
index 218bafb..1133f8e 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
@@ -97,8 +97,6 @@ public abstract class VelocityPanel extends Panel
*
* @param id
* Component id
- * @param templateResource
- * The velocity template as a string resource
* @param model
* Model with variables that can be substituted by Velocity.
*/
@@ -170,10 +168,6 @@ public abstract class VelocityPanel extends Panel
*
* @param exception
* the cause
- * @param markupStream
- * the markup stream
- * @param openTag
- * the open tag
*/
private void onException(final Exception exception)
{