Skip to content

Commit 00a4f5b

Browse files
krosenvoldkrosenvold
committed
Code analysis fixes
1 parent 4ad439e commit 00a4f5b

19 files changed

+201
-283
lines changed

‎src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public abstract class AbstractArchiver
7373
* of {@link ArchiveEntry} by {@link #getResources()}.
7474
* </ul>
7575
*/
76-
private final List resources = new ArrayList();
76+
private final List<Object> resources = new ArrayList<Object>();
7777

7878
private boolean includeEmptyDirs = true;
7979

@@ -459,6 +459,7 @@ public boolean hasNext()
459459
{
460460
nextEntry = (ArchiveEntry) o;
461461
}
462+
// TODO: Kr. Make iteartor handle commons compress archive entry. Maybe make
462463
else if ( o instanceof PlexusIoResourceCollection )
463464
{
464465
currentResourceCollection = (PlexusIoResourceCollection) o;
@@ -556,11 +557,11 @@ public void remove()
556557
};
557558
}
558559

559-
public Map getFiles()
560+
public Map<String,ArchiveEntry> getFiles()
560561
{
561562
try
562563
{
563-
final Map map = new HashMap();
564+
final Map<String,ArchiveEntry> map = new HashMap<String,ArchiveEntry>();
564565
for ( final ResourceIterator iter = getResources(); iter.hasNext(); )
565566
{
566567
final ArchiveEntry entry = iter.next();
@@ -877,12 +878,9 @@ protected void runArchiveFinalizers()
877878
{
878879
if ( finalizers != null )
879880
{
880-
for ( final Iterator it = finalizers.iterator(); it.hasNext(); )
881-
{
882-
final ArchiveFinalizer finalizer = (ArchiveFinalizer) it.next();
883-
884-
finalizer.finalizeArchiveCreation( this );
885-
}
881+
for (final ArchiveFinalizer finalizer : finalizers) {
882+
finalizer.finalizeArchiveCreation(this);
883+
}
886884
}
887885
}
888886

@@ -936,17 +934,13 @@ protected boolean hasVirtualFiles()
936934
{
937935
if ( finalizers != null )
938936
{
939-
for ( final Iterator it = finalizers.iterator(); it.hasNext(); )
940-
{
941-
final ArchiveFinalizer finalizer = (ArchiveFinalizer) it.next();
937+
for (final ArchiveFinalizer finalizer : finalizers) {
938+
final List virtualFiles = finalizer.getVirtualFiles();
942939

943-
final List virtualFiles = finalizer.getVirtualFiles();
944-
945-
if ( ( virtualFiles != null ) && !virtualFiles.isEmpty() )
946-
{
947-
return true;
948-
}
949-
}
940+
if ((virtualFiles != null) && !virtualFiles.isEmpty()) {
941+
return true;
942+
}
943+
}
950944
}
951945
return false;
952946
}

‎src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@ private final void runArchiveFinalizers()
154154
{
155155
if ( finalizers != null )
156156
{
157-
for ( final Iterator it = finalizers.iterator(); it.hasNext(); )
158-
{
159-
final ArchiveFinalizer finalizer = (ArchiveFinalizer) it.next();
157+
for (Object finalizer1 : finalizers) {
158+
final ArchiveFinalizer finalizer = (ArchiveFinalizer) finalizer1;
160159

161-
finalizer.finalizeArchiveExtraction( this );
162-
}
160+
finalizer.finalizeArchiveExtraction(this);
161+
}
163162
}
164163
}
165164

@@ -229,21 +228,16 @@ protected boolean isSelected( final String fileName, final PlexusIoResource file
229228
{
230229
if ( fileSelectors != null )
231230
{
232-
for ( int i = 0; i < fileSelectors.length; i++ )
233-
{
234-
try
235-
{
236-
if ( !fileSelectors[i].isSelected( fileInfo ) )
237-
{
238-
return false;
239-
}
240-
}
241-
catch ( final IOException e )
242-
{
243-
throw new ArchiverException( "Failed to check, whether " + fileInfo.getName() + " is selected: "
244-
+ e.getMessage(), e );
245-
}
246-
}
231+
for (FileSelector fileSelector : fileSelectors) {
232+
try {
233+
if (!fileSelector.isSelected(fileInfo)) {
234+
return false;
235+
}
236+
} catch (final IOException e) {
237+
throw new ArchiverException("Failed to check, whether " + fileInfo.getName() + " is selected: "
238+
+ e.getMessage(), e);
239+
}
240+
}
247241
}
248242
return true;
249243
}

‎src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public class ArchiveEntry
3838

3939
public static final int DIRECTORY = 2;
4040

41-
private PlexusIoResource resource;
41+
private final PlexusIoResource resource;
4242

43-
private String name;
43+
private final String name;
4444

45-
private int type;
45+
private final int type;
4646

47-
private int mode;
47+
private final int mode;
4848

4949
private PlexusIoResourceAttributes attributes;
5050

‎src/main/java/org/codehaus/plexus/archiver/Archiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ ResourceIterator getResources()
191191
/**
192192
* @deprecated Use {@link #getResources()}
193193
*/
194-
Map getFiles();
194+
Map<String,ArchiveEntry> getFiles();
195195

196196
/**
197197
* <p>

‎src/main/java/org/codehaus/plexus/archiver/DotDirectiveArchiveFinalizer.java

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
public class DotDirectiveArchiveFinalizer
2323
extends AbstractArchiveFinalizer
2424
{
25-
private static String DEFAULT_DOT_FILE_PREFIX = ".plxarc";
25+
private static final String DEFAULT_DOT_FILE_PREFIX = ".plxarc";
2626

27-
private File dotFileDirectory;
27+
private final File dotFileDirectory;
2828

29-
private String dotFilePrefix;
29+
private final String dotFilePrefix;
3030

3131
public DotDirectiveArchiveFinalizer( File dotFileDirectory )
3232
{
@@ -47,45 +47,37 @@ public void finalizeArchiveCreation( Archiver archiver )
4747
{
4848
List dotFiles = FileUtils.getFiles( dotFileDirectory, dotFilePrefix + "*", null );
4949

50-
for ( Iterator i = dotFiles.iterator(); i.hasNext(); )
51-
{
52-
File dotFile = (File) i.next();
50+
for (Object dotFile1 : dotFiles) {
51+
File dotFile = (File) dotFile1;
5352

54-
BufferedReader in = new BufferedReader( new FileReader( dotFile ) );
53+
BufferedReader in = new BufferedReader(new FileReader(dotFile));
5554

56-
String line;
55+
String line;
5756

58-
while ( ( line = in.readLine() ) != null )
59-
{
60-
String[] s = StringUtils.split( line, ":" );
57+
while ((line = in.readLine()) != null) {
58+
String[] s = StringUtils.split(line, ":");
6159

62-
if ( s.length == 1 )
63-
{
64-
File directory = new File( dotFileDirectory, s[0] );
60+
if (s.length == 1) {
61+
File directory = new File(dotFileDirectory, s[0]);
6562

66-
System.out.println( "adding directory = " + directory );
63+
System.out.println("adding directory = " + directory);
6764

68-
archiver.addDirectory( directory );
69-
}
70-
else
71-
{
72-
File directory = new File( dotFileDirectory, s[0] );
65+
archiver.addDirectory(directory);
66+
} else {
67+
File directory = new File(dotFileDirectory, s[0]);
7368

74-
System.out.println( "adding directory = " + directory + " to: " + s[1] );
69+
System.out.println("adding directory = " + directory + " to: " + s[1]);
7570

76-
if ( s[1].endsWith( "/" ) )
77-
{
78-
archiver.addDirectory( directory, s[1] );
79-
}
80-
else
81-
{
82-
archiver.addDirectory( directory, s[1] + "/" );
83-
}
84-
}
85-
}
71+
if (s[1].endsWith("/")) {
72+
archiver.addDirectory(directory, s[1]);
73+
} else {
74+
archiver.addDirectory(directory, s[1] + "/");
75+
}
76+
}
77+
}
8678

87-
in.close();
88-
}
79+
in.close();
80+
}
8981

9082
}
9183
catch ( IOException e )

‎src/main/java/org/codehaus/plexus/archiver/filters/JarSecurityFileFilter.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ public class JarSecurityFileFilter
1818
public boolean include( InputStream dataStream, String entryName )
1919
throws ArchiveFilterException
2020
{
21-
for ( int i = 0; i < SECURITY_FILE_PATTERNS.length; i++ )
22-
{
23-
String pattern = SECURITY_FILE_PATTERNS[i];
24-
25-
if ( SelectorUtils.match( pattern, entryName ) )
26-
{
27-
return false;
28-
}
29-
}
21+
for (String pattern : SECURITY_FILE_PATTERNS) {
22+
if (SelectorUtils.match(pattern, entryName)) {
23+
return false;
24+
}
25+
}
3026

3127
return true;
3228
}

‎src/main/java/org/codehaus/plexus/archiver/filters/JarSecurityFileSelector.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,11 @@ public boolean isSelected( FileInfo fileInfo )
4040
throws IOException
4141
{
4242
String name = fileInfo.getName();
43-
for ( int i = 0; i < SECURITY_FILE_PATTERNS.length; i++ )
44-
{
45-
String pattern = SECURITY_FILE_PATTERNS[i];
46-
47-
if ( SelectorUtils.match( pattern, name ) )
48-
{
49-
return false;
50-
}
51-
}
43+
for (String pattern : SECURITY_FILE_PATTERNS) {
44+
if (SelectorUtils.match(pattern, name)) {
45+
return false;
46+
}
47+
}
5248

5349
return true;
5450
}

‎src/main/java/org/codehaus/plexus/archiver/gzip/GZipArchiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class GZipArchiver
3131
extends AbstractArchiver
3232
{
33-
GZipCompressor compressor = new GZipCompressor();
33+
final GZipCompressor compressor = new GZipCompressor();
3434

3535
protected void execute()
3636
throws ArchiverException, IOException

‎src/main/java/org/codehaus/plexus/archiver/util/ArchiveEntryUtils.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@
1010
import java.io.File;
1111
import java.lang.reflect.Method;
1212

13+
@SuppressWarnings("JavaDoc")
1314
public final class ArchiveEntryUtils
1415
{
1516

16-
public static boolean jvmFilePermAvailable = false;
17+
public static boolean jvmFilePermAvailable;
1718

1819
static
1920
{
2021
try
2122
{
22-
jvmFilePermAvailable = File.class.getMethod( "setReadable", new Class[] { Boolean.TYPE } ) != null;
23+
jvmFilePermAvailable = File.class.getMethod( "setReadable", Boolean.TYPE) != null;
2324
}
2425
catch ( final Exception e )
2526
{
@@ -56,7 +57,7 @@ public static void chmod( final File file, final int mode, final Logger logger,
5657
useJvmChmod = false;
5758
}
5859

59-
if ( useJvmChmod && jvmFilePermAvailable )
60+
if (useJvmChmod)
6061
{
6162
applyPermissionsWithJvm( file, m, logger );
6263
return;
@@ -135,21 +136,21 @@ private static void applyPermissionsWithJvm( final File file, final String mode,
135136
Method method;
136137
try
137138
{
138-
method = File.class.getMethod( "setReadable", new Class[] { Boolean.TYPE, Boolean.TYPE } );
139+
method = File.class.getMethod( "setReadable", Boolean.TYPE, Boolean.TYPE);
139140

140141
method.invoke( file,
141-
new Object[] { Boolean.valueOf( filePermission.isReadable() ),
142-
Boolean.valueOf( filePermission.isOwnerOnlyReadable() ) } );
142+
filePermission.isReadable(),
143+
filePermission.isOwnerOnlyReadable());
143144

144-
method = File.class.getMethod( "setExecutable", new Class[] { Boolean.TYPE, Boolean.TYPE } );
145+
method = File.class.getMethod( "setExecutable", Boolean.TYPE, Boolean.TYPE);
145146
method.invoke( file,
146-
new Object[] { Boolean.valueOf( filePermission.isExecutable() ),
147-
Boolean.valueOf( filePermission.isOwnerOnlyExecutable() ) } );
147+
filePermission.isExecutable(),
148+
filePermission.isOwnerOnlyExecutable());
148149

149-
method = File.class.getMethod( "setWritable", new Class[] { Boolean.TYPE, Boolean.TYPE } );
150+
method = File.class.getMethod( "setWritable", Boolean.TYPE, Boolean.TYPE);
150151
method.invoke( file,
151-
new Object[] { Boolean.valueOf( filePermission.isWritable() ),
152-
Boolean.valueOf( filePermission.isOwnerOnlyWritable() ) } );
152+
filePermission.isWritable(),
153+
filePermission.isOwnerOnlyWritable());
153154
}
154155
catch ( final Exception e )
155156
{

‎src/main/java/org/codehaus/plexus/archiver/util/FilePermissionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static FilePermission getFilePermissionFromMode( String mode, Logger logg
6969
// handle user perm
7070
try
7171
{
72-
int userMode = Integer.valueOf( (String) modes.get( mode.length() == 4 ? 1 : 0 ) ).intValue();
72+
int userMode = Integer.valueOf((String) modes.get(mode.length() == 4 ? 1 : 0));
7373
switch ( userMode )
7474
{
7575
case 0 :
@@ -113,7 +113,7 @@ public static FilePermission getFilePermissionFromMode( String mode, Logger logg
113113
// handle all perm
114114
try
115115
{
116-
int allMode = Integer.valueOf( (String) modes.get( mode.length() == 4 ? 3 : 2 ) ).intValue();
116+
int allMode = Integer.valueOf((String) modes.get(mode.length() == 4 ? 3 : 2));
117117
switch ( allMode )
118118
{
119119
case 0 :

0 commit comments

Comments
 (0)