Author: painter
Date: Mon Oct 8 13:40:55 2018
New Revision: 1843141
URL: http://svn.apache.org/viewvc?rev=1843141&view=rev
Log:
Addressing issues from findbug report
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java?rev=1843141&r1=1843140&r2=1843141&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
Mon Oct 8 13:40:55 2018
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.torque.generator.configuration.paths.ProjectPaths;
@@ -125,7 +126,7 @@ extends AbstractConfigurationProvider
{
File file = getFile(name, directory, description);
- InputStream inputStream;
+ InputStream inputStream = null;
try
{
inputStream = new FileInputStream(file);
@@ -154,7 +155,7 @@ extends AbstractConfigurationProvider
projectPaths.getConfigurationPath(),
configurationPaths.getOutletDirectory());
- List<String> result = new ArrayList<>();
+ ArrayList<String> result = new ArrayList<>();
if (!outletConfigDir.isDirectory())
{
log.info(
@@ -168,14 +169,14 @@ extends AbstractConfigurationProvider
}
File[] sourceFiles = outletConfigDir.listFiles();
- for (int fileNr = 0; fileNr < sourceFiles.length; ++fileNr)
+ if ( sourceFiles != null )
{
- if (!sourceFiles[fileNr].isDirectory()
- && sourceFiles[fileNr].getPath().endsWith("xml"))
- {
- String name = sourceFiles[fileNr].getName();
- result.add(name);
- }
+ for ( File srcFile : sourceFiles ) {
+ if (!srcFile.isDirectory() &&
srcFile.getPath().endsWith("xml"))
+ {
+ result.add(srcFile.getName());
+ }
+ }
}
return result;
}
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java?rev=1843141&r1=1843140&r2=1843141&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
Mon Oct 8 13:40:55 2018
@@ -287,9 +287,12 @@ public class Fileset
File[] dirsInDir = currentBaseDir.listFiles(
new WildcardFilter("*", true, false));
- for (File dir : dirsInDir)
+ if ( dirsInDir != null )
{
- getAllFiles(dir, toAddTo);
+ for (File dir : dirsInDir)
+ {
+ getAllFiles(dir, toAddTo);
+ }
}
}
@@ -344,9 +347,12 @@ public class Fileset
File[] matchingDirs = currentBaseDir.listFiles(
new WildcardFilter(includeToProcess, true, false));
List<File> result = new ArrayList<>();
- for (File dir : matchingDirs)
+ if ( matchingDirs != null )
{
- result.addAll(getFiles(dir, partsCopy));
+ for (File dir : matchingDirs)
+ {
+ result.addAll(getFiles(dir, partsCopy));
+ }
}
return result;
}
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java?rev=1843141&r1=1843140&r2=1843141&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
Mon Oct 8 13:40:55 2018
@@ -46,7 +46,7 @@ implements Map<QualifiedName, T>, Serial
* The backing hashMap. Must not contain a mapping for the key null,
* because null as a qualified name does not make sense.
*/
- private HashMap<QualifiedName, T> map;
+ private transient HashMap<QualifiedName, T> map;
/**
* Constructs an empty QualifiedNameMap.
Modified:
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java?rev=1843141&r1=1843140&r2=1843141&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/model/PropertyAccessTest.java
Mon Oct 8 13:40:55 2018
@@ -977,8 +977,6 @@ public class PropertyAccessTest
public static class TestClass extends TestBaseClass
{
- private int privateIntField;
-
protected int protectedIntField;
int intField;
@@ -1010,11 +1008,6 @@ public class PropertyAccessTest
return 0;
}
- private void setPrivateIntSetter(final int value)
- {
- privateIntField = value;
- }
-
protected void setProtectedIntSetter(final int value)
{
protectedIntField = value;
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
