Skip to content

Commit ffbe4ff

Browse files
sadovnikovsadovnikov
committed
Merge remote-tracking branch 'upstream/master'
Manually resolved Conflicts: src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
2 parents 732496b + 60bc201 commit ffbe4ff

File tree

69 files changed

+675
-6342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+675
-6342
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
<dependency>
5656
<groupId>org.codehaus.plexus</groupId>
5757
<artifactId>plexus-io</artifactId>
58-
<version>2.0.10</version>
58+
<version>2.0.12</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.apache.commons</groupId>
6262
<artifactId>commons-compress</artifactId>
63-
<version>1.5</version>
63+
<version>1.8.1</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>junit</groupId>

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

Lines changed: 19 additions & 25 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

@@ -250,7 +250,7 @@ public void setIncludeEmptyDirs( final boolean includeEmptyDirs )
250250
public void addDirectory( final File directory )
251251
throws ArchiverException
252252
{
253-
addDirectory( directory, "" );
253+
addDirectory(directory, "");
254254
}
255255

256256
public void addDirectory( final File directory, final String prefix )
@@ -262,7 +262,7 @@ public void addDirectory( final File directory, final String prefix )
262262
public void addDirectory( final File directory, final String[] includes, final String[] excludes )
263263
throws ArchiverException
264264
{
265-
addDirectory( directory, "", includes, excludes );
265+
addDirectory(directory, "", includes, excludes);
266266
}
267267

268268
public void addDirectory( final File directory, final String prefix, final String[] includes,
@@ -323,7 +323,7 @@ public void addFile( final File inputFile, final String destFileName )
323323
{
324324
final int fileMode = getOverrideFileMode();
325325

326-
addFile( inputFile, destFileName, fileMode );
326+
addFile(inputFile, destFileName, fileMode);
327327
}
328328

329329
protected ArchiveEntry asArchiveEntry( final PlexusIoResource resource, final String destFileName,
@@ -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();
@@ -686,7 +687,7 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
686687
public void addResources( final PlexusIoResourceCollection collection )
687688
throws ArchiverException
688689
{
689-
resources.add( collection );
690+
resources.add(collection);
690691
}
691692

692693
public void addArchivedFileSet( final ArchivedFileSet fileSet )
@@ -727,7 +728,7 @@ public void addArchivedFileSet( final File archiveFile, final String prefix )
727728
public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
728729
throws ArchiverException
729730
{
730-
addArchivedFileSet( archiveFile, null, includes, excludes );
731+
addArchivedFileSet(archiveFile, null, includes, excludes);
731732
}
732733

733734
/**
@@ -768,7 +769,7 @@ public void setForced( final boolean forced )
768769
this.forced = forced;
769770
}
770771

771-
public void setArchiveFilters( final List filters )
772+
public void setArchiveFilters(final List filters)
772773
{
773774
filterSupport = new FilterSupport( filters, getLogger() );
774775
}
@@ -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: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
import org.codehaus.plexus.util.FileUtils;
2626
import org.codehaus.plexus.util.IOUtil;
2727

28-
import java.io.*;
28+
import java.io.File;
29+
import java.io.FileNotFoundException;
30+
import java.io.FileOutputStream;
31+
import java.io.IOException;
32+
import java.io.InputStream;
33+
import java.io.OutputStream;
2934
import java.util.ArrayList;
3035
import java.util.Date;
3136
import java.util.Iterator;
@@ -131,7 +136,7 @@ public final void extract( final String path, final File outputDirectory )
131136
runArchiveFinalizers();
132137
}
133138

134-
public void setArchiveFilters( final List filters )
139+
public void setArchiveFilters(final List filters)
135140
{
136141
filterSupport = new FilterSupport( filters, getLogger() );
137142
}
@@ -156,12 +161,11 @@ private final void runArchiveFinalizers()
156161
{
157162
if ( finalizers != null )
158163
{
159-
for ( final Iterator it = finalizers.iterator(); it.hasNext(); )
160-
{
161-
final ArchiveFinalizer finalizer = (ArchiveFinalizer) it.next();
164+
for (Object finalizer1 : finalizers) {
165+
final ArchiveFinalizer finalizer = (ArchiveFinalizer) finalizer1;
162166

163-
finalizer.finalizeArchiveExtraction( this );
164-
}
167+
finalizer.finalizeArchiveExtraction(this);
168+
}
165169
}
166170
}
167171

@@ -231,21 +235,16 @@ protected boolean isSelected( final String fileName, final PlexusIoResource file
231235
{
232236
if ( fileSelectors != null )
233237
{
234-
for ( int i = 0; i < fileSelectors.length; i++ )
235-
{
236-
try
237-
{
238-
if ( !fileSelectors[i].isSelected( fileInfo ) )
239-
{
240-
return false;
241-
}
242-
}
243-
catch ( final IOException e )
244-
{
245-
throw new ArchiverException( "Failed to check, whether " + fileInfo.getName() + " is selected: "
246-
+ e.getMessage(), e );
247-
}
248-
}
238+
for (FileSelector fileSelector : fileSelectors) {
239+
try {
240+
if (!fileSelector.isSelected(fileInfo)) {
241+
return false;
242+
}
243+
} catch (final IOException e) {
244+
throw new ArchiverException("Failed to check, whether " + fileInfo.getName() + " is selected: "
245+
+ e.getMessage(), e);
246+
}
247+
}
249248
}
250249
return true;
251250
}
@@ -292,9 +291,9 @@ public void setIgnorePermissions( final boolean ignorePermissions )
292291
protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
293292
final String entryName, final Date entryDate, final boolean isDirectory,
294293
final Integer mode )
295-
throws IOException, ArchiverException
294+
throws IOException, ArchiverException
296295
{
297-
final File f = FileUtils.resolveFile(dir, entryName);
296+
final File f = FileUtils.resolveFile( dir, entryName );
298297

299298
try
300299
{
@@ -321,7 +320,7 @@ protected void extractFile( final File srcF, final File dir, final InputStream c
321320
{
322321
out = new FileOutputStream( f );
323322

324-
IOUtil.copy(compressedInputStream, out);
323+
IOUtil.copy( compressedInputStream, out );
325324
}
326325
finally
327326
{
@@ -333,7 +332,7 @@ protected void extractFile( final File srcF, final File dir, final InputStream c
333332

334333
if ( !isIgnorePermissions() && mode != null && !isDirectory)
335334
{
336-
ArchiveEntryUtils.chmod(f, mode, getLogger(), isUseJvmChmod());
335+
ArchiveEntryUtils.chmod( f, mode, getLogger(), isUseJvmChmod() );
337336
}
338337
}
339338
catch ( final FileNotFoundException ex )

‎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/ArchiveFile.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ public interface Entry
4242
/**
4343
* Returns an enumeration with the archive files entries.
4444
* Any element returned by the enumeration is an instance
45-
* of {@link Entry}.
45+
* of {@link org.apache.commons.compress.archivers.ArchiveEntry}.
4646
*/
47-
public Enumeration getEntries()
47+
public Enumeration<? extends org.apache.commons.compress.archivers.ArchiveEntry> getEntries()
4848
throws IOException;
4949

5050
/**
5151
* Returns an {@link InputStream} with the given entries contents.
52+
* org.apache.commons.compress.archivers.ArchiveEntry
5253
*/
53-
InputStream getInputStream( Entry entry )
54+
InputStream getInputStream(org.apache.commons.compress.archivers.ArchiveEntry entry )
5455
throws IOException;
5556
}

‎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/FilterEnabled.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
public interface FilterEnabled
1010
{
1111

12-
void setArchiveFilters( List filters );
12+
void setArchiveFilters(List filters);
1313

1414
}

0 commit comments

Comments
 (0)