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
The following commit(s) were added to refs/heads/master by this push:
new 891a675 CONFIGURATION-804 - Redundant local variable (#113)
891a675 is described below
commit 891a6756d1551677fbb685f2af6d41c46b98fdcc
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sat Jun 26 17:29:52 2021 +0200
CONFIGURATION-804 - Redundant local variable (#113)
---
.../combined/BaseConfigurationBuilderProvider.java | 3 +--
.../reloading/FileHandlerReloadingDetector.java | 5 +----
.../reloading/VFSFileHandlerReloadingDetector.java | 6 ++----
.../combined/TestBaseConfigurationBuilderProvider.java | 18 ++++++++----------
.../TestFileExtensionConfigurationBuilderProvider.java | 8 +++-----
5 files changed, 15 insertions(+), 25 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
b/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
index 51bc0c2..5fa8649 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
@@ -373,8 +373,7 @@ public class BaseConfigurationBuilderProvider implements
throws Exception
{
final Class<?> cls = ConfigurationUtils.loadClass(paramcls);
- final BuilderParameters p = (BuilderParameters) cls.newInstance();
- return p;
+ return (BuilderParameters) cls.newInstance();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
index f416b62..9166131 100644
---
a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
+++
b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
@@ -164,10 +164,7 @@ public class FileHandlerReloadingDetector implements
ReloadingDetector
}
else
{
- if (modifiedMillis != lastModifiedMillis)
- {
- return true;
- }
+ return modifiedMillis != lastModifiedMillis;
}
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java
b/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java
index 3583ab0..57964a6 100644
---
a/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java
+++
b/src/main/java/org/apache/commons/configuration2/reloading/VFSFileHandlerReloadingDetector.java
@@ -147,9 +147,7 @@ public class VFSFileHandlerReloadingDetector extends
FileHandlerReloadingDetecto
protected String resolveFileURI()
{
final FileSystem fs = getFileHandler().getFileSystem();
- final String uri =
- fs.getPath(null, getFileHandler().getURL(), getFileHandler()
- .getBasePath(), getFileHandler().getFileName());
- return uri;
+ return fs.getPath(null, getFileHandler().getURL(), getFileHandler()
+ .getBasePath(), getFileHandler().getFileName());
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java
index b300212..2d09c58 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java
@@ -91,16 +91,14 @@ public class TestBaseConfigurationBuilderProvider
}
}
};
- final ConfigurationDeclaration decl =
- new ConfigurationDeclaration(parentBuilder, declConfig)
- {
- @Override
- protected Object interpolate(final Object value)
- {
- return value;
- }
- };
- return decl;
+ return new ConfigurationDeclaration(parentBuilder, declConfig)
+ {
+ @Override
+ protected Object interpolate(final Object value)
+ {
+ return value;
+ }
+ };
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
index 55a0bde..8a80ae3 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
@@ -56,11 +56,9 @@ public class TestFileExtensionConfigurationBuilderProvider
*/
private static FileExtensionConfigurationBuilderProvider setUpProvider()
{
- final FileExtensionConfigurationBuilderProvider provider =
- new FileExtensionConfigurationBuilderProvider(
- BasicConfigurationBuilder.class.getName(), null,
- MATCH_CLASS, DEF_CLASS, EXT, null);
- return provider;
+ return new FileExtensionConfigurationBuilderProvider(
+ BasicConfigurationBuilder.class.getName(), null,
+ MATCH_CLASS, DEF_CLASS, EXT, null);
}
/**
