You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/05/15 16:59:20 UTC
[commons-configuration] 03/03: Remove unnecessary @SuppressWarnings("unchecked") and in-line single-use local variable.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit f11ef63eecca75a0fa0c4ceb6dbb253725b99e48
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 15 12:58:59 2022 -0400
Remove unnecessary @SuppressWarnings("unchecked") and in-line single-use
local variable.
---
.../org/apache/commons/configuration2/TestConfigurationUtils.java | 1 -
.../configuration2/builder/TestBasicConfigurationBuilder.java | 4 +---
.../builder/TestBuilderConfigurationWrapperFactory.java | 1 -
.../builder/combined/TestCombinedBuilderParametersImpl.java | 4 +---
.../builder/combined/TestCombinedConfigurationBuilder.java | 3 ---
.../builder/combined/TestMultiFileConfigurationBuilder.java | 1 -
.../commons/configuration2/builder/fluent/TestParameters.java | 4 +---
.../commons/configuration2/event/TestEventListenerList.java | 1 -
.../configuration2/reloading/TestPeriodicReloadingTrigger.java | 4 +---
.../commons/configuration2/reloading/TestReloadingController.java | 4 +---
.../apache/commons/configuration2/tree/NodeStructureHelper.java | 4 +---
.../apache/commons/configuration2/tree/TestInMemoryNodeModel.java | 4 +---
.../apache/commons/configuration2/tree/TestNodeTreeWalker.java | 8 ++------
.../commons/configuration2/tree/TestTrackedNodeHandler.java | 4 +---
.../apache/commons/configuration2/tree/TestTrackedNodeModel.java | 2 --
15 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java b/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
index e8c976cc..7a685d3f 100644
--- a/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
+++ b/src/test/java/org/apache/commons/configuration2/TestConfigurationUtils.java
@@ -155,7 +155,6 @@ public class TestConfigurationUtils {
*/
@Test
public void testAsEventSourceUnsupportedMock() {
- @SuppressWarnings("unchecked")
final EventListener<ConfigurationEvent> cl = EasyMock.createMock(EventListener.class);
EasyMock.replay(cl);
final EventSource source = ConfigurationUtils.asEventSource(this, true);
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java
index bc167d2c..0cfacf89 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestBasicConfigurationBuilder.java
@@ -152,9 +152,7 @@ public class TestBasicConfigurationBuilder {
* @return the event listener mock
*/
private static EventListener<ConfigurationEvent> createEventListener() {
- @SuppressWarnings("unchecked")
- final EventListener<ConfigurationEvent> listener = EasyMock.createMock(EventListener.class);
- return listener;
+ return EasyMock.createMock(EventListener.class);
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java b/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java
index f55833b5..809182b0 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestBuilderConfigurationWrapperFactory.java
@@ -49,7 +49,6 @@ public class TestBuilderConfigurationWrapperFactory {
* @return the mock builder
*/
private ConfigurationBuilder<BaseHierarchicalConfiguration> createBuilderMock(final BaseHierarchicalConfiguration conf) {
- @SuppressWarnings("unchecked")
final ConfigurationBuilder<BaseHierarchicalConfiguration> builder = EasyMock.createMock(ConfigurationBuilder.class);
try {
EasyMock.expect(builder.getConfiguration()).andReturn(conf).anyTimes();
diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
index c21afffb..4f459337 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
@@ -52,9 +52,7 @@ public class TestCombinedBuilderParametersImpl {
* @return the handler mock
*/
private static DefaultParametersHandler<BuilderParameters> createDefaultsHandlerMock() {
- @SuppressWarnings("unchecked")
- final DefaultParametersHandler<BuilderParameters> mock = EasyMock.createMock(DefaultParametersHandler.class);
- return mock;
+ return EasyMock.createMock(DefaultParametersHandler.class);
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
index d0977543..40ab13c3 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
@@ -362,7 +362,6 @@ public class TestCombinedConfigurationBuilder {
private void checkFileSystem(final File fsFile) throws ConfigurationException {
builder.configure(createParameters().setFile(fsFile));
builder.getConfiguration();
- @SuppressWarnings("unchecked") // this is the minimum bound for type arguments
final FileBasedConfigurationBuilder<? extends Configuration> xmlBuilder = (FileBasedConfigurationBuilder<? extends Configuration>) builder
.getNamedBuilder("xml");
assertTrue("Wrong file system: " + xmlBuilder.getFileHandler().getFileSystem(),
@@ -632,9 +631,7 @@ public class TestCombinedConfigurationBuilder {
*/
@Test
public void testConfigurationBuilderProviderInheritEventListeners() throws ConfigurationException {
- @SuppressWarnings("unchecked")
final EventListener<Event> l1 = EasyMock.createNiceMock(EventListener.class);
- @SuppressWarnings("unchecked")
final EventListener<ConfigurationEvent> l2 = EasyMock.createNiceMock(EventListener.class);
EasyMock.replay(l1, l2);
final File testFile = ConfigurationAssert.getTestFile("testCCCombinedChildBuilder.xml");
diff --git a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
index aed64900..95c77f49 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java
@@ -98,7 +98,6 @@ public class TestMultiFileConfigurationBuilder extends AbstractMultiFileConfigur
@Test
public void testAddConfigurationListener() throws ConfigurationException {
final EventListener<ConfigurationEvent> l1 = new EventListenerTestImpl(null);
- @SuppressWarnings("unchecked")
final EventListener<Event> l2 = EasyMock.createMock(EventListener.class);
EasyMock.replay(l2);
final MultiFileConfigurationBuilder<XMLConfiguration> builder = createTestBuilder(null);
diff --git a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
index fc53df44..c7ca2b31 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
@@ -92,9 +92,7 @@ public class TestParameters {
* @return the mock object
*/
private static DefaultParametersHandler<XMLBuilderParameters> createHandlerMock() {
- @SuppressWarnings("unchecked")
- final DefaultParametersHandler<XMLBuilderParameters> handler = EasyMock.createMock(DefaultParametersHandler.class);
- return handler;
+ return EasyMock.createMock(DefaultParametersHandler.class);
}
@BeforeClass
diff --git a/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java b/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
index 99fbd1bf..44862370 100644
--- a/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
+++ b/src/test/java/org/apache/commons/configuration2/event/TestEventListenerList.java
@@ -253,7 +253,6 @@ public class TestEventListenerList {
public void testGetEventListenerRegistrationsForSuperType() {
final ListenerTestImpl l1 = new ListenerTestImpl();
final ListenerTestImpl l2 = new ListenerTestImpl();
- @SuppressWarnings("unchecked")
final EventListener<Event> l3 = EasyMock.createMock(EventListener.class);
list.addEventListener(typeSub1, l1);
list.addEventListener(Event.ANY, l3);
diff --git a/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java b/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java
index a6bab473..4e89ddd3 100644
--- a/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java
+++ b/src/test/java/org/apache/commons/configuration2/reloading/TestPeriodicReloadingTrigger.java
@@ -49,9 +49,7 @@ public class TestPeriodicReloadingTrigger {
* @return the mock
*/
private static ScheduledFuture<Void> createFutureMock() {
- @SuppressWarnings("unchecked")
- final ScheduledFuture<Void> mock = EasyMock.createMock(ScheduledFuture.class);
- return mock;
+ return EasyMock.createMock(ScheduledFuture.class);
}
/** A mock for the executor service. */
diff --git a/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java b/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
index db124ab2..2e6eac4b 100644
--- a/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
+++ b/src/test/java/org/apache/commons/configuration2/reloading/TestReloadingController.java
@@ -39,9 +39,7 @@ public class TestReloadingController {
* @return the mock listener
*/
private static EventListener<ReloadingEvent> createListenerMock() {
- @SuppressWarnings("unchecked")
- final EventListener<ReloadingEvent> listener = EasyMock.createMock(EventListener.class);
- return listener;
+ return EasyMock.createMock(EventListener.class);
}
/** A mock for the detector. */
diff --git a/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java b/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
index 38e32bf1..56632488 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/NodeStructureHelper.java
@@ -190,9 +190,7 @@ public class NodeStructureHelper {
* @return the resolver mock
*/
public static NodeKeyResolver<ImmutableNode> createResolverMock() {
- @SuppressWarnings("unchecked")
- final NodeKeyResolver<ImmutableNode> mock = EasyMock.createMock(NodeKeyResolver.class);
- return mock;
+ return EasyMock.createMock(NodeKeyResolver.class);
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
index e8832998..94c4b847 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModel.java
@@ -76,9 +76,7 @@ public class TestInMemoryNodeModel {
* @return the mock for the resolver
*/
private static NodeKeyResolver<ImmutableNode> createResolver() {
- @SuppressWarnings("unchecked")
- final NodeKeyResolver<ImmutableNode> resolver = EasyMock.createMock(NodeKeyResolver.class);
- return resolver;
+ return EasyMock.createMock(NodeKeyResolver.class);
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java b/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
index c13ed088..bc415a0c 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestNodeTreeWalker.java
@@ -98,9 +98,7 @@ public class TestNodeTreeWalker {
* @return the handler mock
*/
private static NodeHandler<ImmutableNode> handlerMock() {
- @SuppressWarnings("unchecked")
- final NodeHandler<ImmutableNode> handler = EasyMock.createMock(NodeHandler.class);
- return handler;
+ return EasyMock.createMock(NodeHandler.class);
}
/**
@@ -119,9 +117,7 @@ public class TestNodeTreeWalker {
* @return the visitor mock
*/
private static ConfigurationNodeVisitor<ImmutableNode> visitorMock() {
- @SuppressWarnings("unchecked")
- final ConfigurationNodeVisitor<ImmutableNode> visitor = EasyMock.createMock(ConfigurationNodeVisitor.class);
- return visitor;
+ return EasyMock.createMock(ConfigurationNodeVisitor.class);
}
/**
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.java b/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.java
index 8ad0add5..02e91e72 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeHandler.java
@@ -44,9 +44,7 @@ public class TestTrackedNodeHandler {
@Before
public void setUp() throws Exception {
- @SuppressWarnings("unchecked")
- final NodeHandler<ImmutableNode> h = EasyMock.createMock(NodeHandler.class);
- parentHandler = h;
+ parentHandler = EasyMock.createMock(NodeHandler.class);
handler = new TrackedNodeHandler(root, parentHandler);
}
diff --git a/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java b/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java
index b976d123..a1a0094e 100644
--- a/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java
+++ b/src/test/java/org/apache/commons/configuration2/tree/TestTrackedNodeModel.java
@@ -44,7 +44,6 @@ public class TestTrackedNodeModel {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
selector = new NodeSelector("someKey");
- @SuppressWarnings("unchecked")
final NodeKeyResolver<ImmutableNode> resolverMock = EasyMock.createMock(NodeKeyResolver.class);
EasyMock.replay(resolverMock);
resolver = resolverMock;
@@ -62,7 +61,6 @@ public class TestTrackedNodeModel {
* @return the mock for the node handler
*/
private NodeHandler<ImmutableNode> expectGetNodeHandler() {
- @SuppressWarnings("unchecked")
final NodeHandler<ImmutableNode> handler = EasyMock.createMock(NodeHandler.class);
EasyMock.expect(parentModel.getTrackedNodeHandler(selector)).andReturn(handler);
return handler;