Skip to content

Commit 8b69c1f

Browse files
slawekjaranowskislawekjaranowski
committed
Cleanups of using deprecated methods
1 parent 6f0ad55 commit 8b69c1f

33 files changed

+162
-102
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,17 +284,20 @@ public void setIncludeEmptyDirs(final boolean includeEmptyDirs) {
284284
}
285285

286286
@Override
287+
@Deprecated
287288
public void addDirectory(@Nonnull final File directory) throws ArchiverException {
288289
addFileSet(fileSet(directory).prefixed("").includeExclude(null, null).includeEmptyDirs(includeEmptyDirs));
289290
}
290291

291292
@Override
293+
@Deprecated
292294
public void addDirectory(@Nonnull final File directory, final String prefix) throws ArchiverException {
293295
addFileSet(
294296
fileSet(directory).prefixed(prefix).includeExclude(null, null).includeEmptyDirs(includeEmptyDirs));
295297
}
296298

297299
@Override
300+
@Deprecated
298301
public void addDirectory(@Nonnull final File directory, final String[] includes, final String[] excludes)
299302
throws ArchiverException {
300303
addFileSet(fileSet(directory)
@@ -304,6 +307,7 @@ public void addDirectory(@Nonnull final File directory, final String[] includes,
304307
}
305308

306309
@Override
310+
@Deprecated
307311
public void addDirectory(
308312
@Nonnull final File directory, final String prefix, final String[] includes, final String[] excludes)
309313
throws ArchiverException {
@@ -613,6 +617,7 @@ private static void closeQuietlyIfCloseable(Object resource) {
613617
}
614618

615619
@Override
620+
@Deprecated
616621
public Map<String, ArchiveEntry> getFiles() {
617622
try {
618623
final Map<String, ArchiveEntry> map = new HashMap<>();
@@ -719,6 +724,7 @@ public void addArchivedFileSet(final ArchivedFileSet fileSet, Charset charset) t
719724
* @since 1.0-alpha-7
720725
*/
721726
@Override
727+
@Deprecated
722728
public void addArchivedFileSet(
723729
@Nonnull final File archiveFile, final String prefix, final String[] includes, final String[] excludes)
724730
throws ArchiverException {
@@ -732,6 +738,7 @@ public void addArchivedFileSet(
732738
* @since 1.0-alpha-7
733739
*/
734740
@Override
741+
@Deprecated
735742
public void addArchivedFileSet(@Nonnull final File archiveFile, final String prefix) throws ArchiverException {
736743
addArchivedFileSet(archivedFileSet(archiveFile).prefixed(prefix).includeEmptyDirs(includeEmptyDirs));
737744
}
@@ -740,6 +747,7 @@ public void addArchivedFileSet(@Nonnull final File archiveFile, final String pre
740747
* @since 1.0-alpha-7
741748
*/
742749
@Override
750+
@Deprecated
743751
public void addArchivedFileSet(@Nonnull final File archiveFile, final String[] includes, final String[] excludes)
744752
throws ArchiverException {
745753
addArchivedFileSet(
@@ -750,6 +758,7 @@ public void addArchivedFileSet(@Nonnull final File archiveFile, final String[] i
750758
* @since 1.0-alpha-7
751759
*/
752760
@Override
761+
@Deprecated
753762
public void addArchivedFileSet(@Nonnull final File archiveFile) throws ArchiverException {
754763
addArchivedFileSet(archivedFileSet(archiveFile).includeEmptyDirs(includeEmptyDirs));
755764
}
@@ -960,6 +969,7 @@ protected void cleanUp() throws IOException {
960969
* @since 1.1
961970
*/
962971
@Override
972+
@Deprecated
963973
public boolean isUseJvmChmod() {
964974
return useJvmChmod;
965975
}
@@ -968,6 +978,7 @@ public boolean isUseJvmChmod() {
968978
* @since 1.1
969979
*/
970980
@Override
981+
@Deprecated
971982
public void setUseJvmChmod(final boolean useJvmChmod) {
972983
this.useJvmChmod = useJvmChmod;
973984
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ protected boolean isSelected(final String fileName, final PlexusIoResource fileI
241241
* @since 1.1
242242
*/
243243
@Override
244+
@Deprecated
244245
public boolean isUseJvmChmod() {
245246
return useJvmChmod;
246247
}
@@ -251,6 +252,7 @@ public boolean isUseJvmChmod() {
251252
* @since 1.1
252253
*/
253254
@Override
255+
@Deprecated
254256
public void setUseJvmChmod(final boolean useJvmChmod) {
255257
this.useJvmChmod = useJvmChmod;
256258
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ void addDirectory(@Nonnull File directory, String prefix, String[] includes, Str
128128
*
129129
* @deprecated Will go away in next major version
130130
*/
131+
@Deprecated
131132
void addArchivedFileSet(@Nonnull File archiveFile) throws ArchiverException;
132133

133134
/**
@@ -261,6 +262,7 @@ void addArchivedFileSet(@Nonnull File archiveFile, String prefix, String[] inclu
261262
/**
262263
* @deprecated Use {@link #getResources()}
263264
*/
265+
@Deprecated
264266
Map<String, ArchiveEntry> getFiles();
265267

266268
/**

‎src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.io.File;
88
import java.io.IOException;
99
import java.io.InputStream;
10-
import java.util.HashMap;
1110

1211
import org.codehaus.plexus.components.io.attributes.FileAttributes;
1312
import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
@@ -31,7 +30,7 @@ public class PlexusIoBzip2ResourceCollection extends PlexusIoCompressedFileResou
3130

3231
@Override
3332
protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
34-
return new FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
33+
return new FileAttributes(file);
3534
}
3635

3736
@Override

‎src/main/java/org/codehaus/plexus/archiver/diags/DelgatingArchiver.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ public ResourceIterator getResources() throws ArchiverException {
222222
}
223223

224224
@Override
225+
@Deprecated
225226
public Map<String, ArchiveEntry> getFiles() {
226227
return target.getFiles();
227228
}

‎src/main/java/org/codehaus/plexus/archiver/diags/DryRunArchiver.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ private void debug(final String message) {
6464
* {@inheritDoc}
6565
*/
6666
@Override
67+
@Deprecated
6768
public void addArchivedFileSet(final @Nonnull File archiveFile, final String prefix) throws ArchiverException {
6869
debug("DRY RUN: Skipping delegated call to: " + getMethodName());
6970
}
@@ -115,6 +116,7 @@ public void addSymlink(String symlinkName, int permissions, String symlinkDestin
115116
* {@inheritDoc}
116117
*/
117118
@Override
119+
@Deprecated
118120
public void addDirectory(final @Nonnull File directory, final String prefix) throws ArchiverException {
119121
debug("DRY RUN: Skipping delegated call to: " + getMethodName());
120122
}
@@ -123,6 +125,7 @@ public void addDirectory(final @Nonnull File directory, final String prefix) thr
123125
* {@inheritDoc}
124126
*/
125127
@Override
128+
@Deprecated
126129
public void addDirectory(final @Nonnull File directory, final String[] includes, final String[] excludes)
127130
throws ArchiverException {
128131
debug("DRY RUN: Skipping delegated call to: " + getMethodName());
@@ -132,6 +135,7 @@ public void addDirectory(final @Nonnull File directory, final String[] includes,
132135
* {@inheritDoc}
133136
*/
134137
@Override
138+
@Deprecated
135139
public void addDirectory(final @Nonnull File directory) throws ArchiverException {
136140
debug("DRY RUN: Skipping delegated call to: " + getMethodName());
137141
}

‎src/main/java/org/codehaus/plexus/archiver/diags/NoOpArchiver.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ public void addDirectory(@Nonnull File directory) throws ArchiverException {}
5555
public void addDirectory(@Nonnull File directory, String prefix) throws ArchiverException {}
5656

5757
@Override
58+
@Deprecated
5859
public void addDirectory(@Nonnull File directory, String[] includes, String[] excludes) throws ArchiverException {}
5960

6061
@Override
62+
@Deprecated
6163
public void addDirectory(@Nonnull File directory, String prefix, String[] includes, String[] excludes)
6264
throws ArchiverException {}
6365

@@ -78,15 +80,18 @@ public void addFile(@Nonnull File inputFile, @Nonnull String destFileName, int p
7880
throws ArchiverException {}
7981

8082
@Override
83+
@Deprecated
8184
public void addArchivedFileSet(@Nonnull File archiveFile) throws ArchiverException {}
8285

8386
@Override
87+
@Deprecated
8488
public void addArchivedFileSet(@Nonnull File archiveFile, String prefix) throws ArchiverException {}
8589

8690
@Override
8791
public void addArchivedFileSet(File archiveFile, String[] includes, String[] excludes) throws ArchiverException {}
8892

8993
@Override
94+
@Deprecated
9095
public void addArchivedFileSet(@Nonnull File archiveFile, String prefix, String[] includes, String[] excludes)
9196
throws ArchiverException {}
9297

@@ -186,6 +191,7 @@ public void remove() {
186191
}
187192

188193
@Override
194+
@Deprecated
189195
public Map<String, ArchiveEntry> getFiles() {
190196
return Collections.emptyMap();
191197
}
@@ -212,11 +218,13 @@ public String getDuplicateBehavior() {
212218
public void setDuplicateBehavior(String duplicate) {}
213219

214220
@Override
221+
@Deprecated
215222
public void setUseJvmChmod(boolean useJvmChmod) {
216223
this.useJvmChmod = useJvmChmod;
217224
}
218225

219226
@Override
227+
@Deprecated
220228
public boolean isUseJvmChmod() {
221229
return useJvmChmod;
222230
}

‎src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,20 @@ public void addDirectory(final @Nonnull File directory) throws ArchiverException
6868
}
6969

7070
@Override
71+
@Deprecated
7172
public void addDirectory(final @Nonnull File directory, final String prefix) throws ArchiverException {
7273
added.add(new Addition(directory, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE));
7374
}
7475

7576
@Override
77+
@Deprecated
7678
public void addDirectory(final @Nonnull File directory, final String[] includes, final String[] excludes)
7779
throws ArchiverException {
7880
added.add(new Addition(directory, null, includes, excludes, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE));
7981
}
8082

8183
@Override
84+
@Deprecated
8285
public void addDirectory(
8386
final @Nonnull File directory, final String prefix, final String[] includes, final String[] excludes)
8487
throws ArchiverException {
@@ -107,6 +110,7 @@ public void addArchivedFileSet(final @Nonnull File archiveFile) throws ArchiverE
107110
}
108111

109112
@Override
113+
@Deprecated
110114
public void addArchivedFileSet(final @Nonnull File archiveFile, final String prefix) throws ArchiverException {
111115
added.add(new Addition(archiveFile, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE));
112116
}
@@ -122,12 +126,14 @@ public void addSymlink(String s, int i, String s2) throws ArchiverException {
122126
}
123127

124128
@Override
129+
@Deprecated
125130
public void addArchivedFileSet(final File archiveFile, final String[] includes, final String[] excludes)
126131
throws ArchiverException {
127132
added.add(new Addition(archiveFile, null, includes, excludes, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE));
128133
}
129134

130135
@Override
136+
@Deprecated
131137
public void addArchivedFileSet(
132138
final @Nonnull File archiveFile, final String prefix, final String[] includes, final String[] excludes)
133139
throws ArchiverException {
@@ -223,6 +229,7 @@ public void setDotFileDirectory(final File dotFileDirectory) {}
223229
}
224230

225231
@Override
232+
@Deprecated
226233
public Map<String, ArchiveEntry> getFiles() {
227234
return new HashMap<>();
228235
}
@@ -306,11 +313,13 @@ public Addition(
306313
}
307314

308315
@Override
316+
@Deprecated
309317
public boolean isUseJvmChmod() {
310318
return useJvmChmod;
311319
}
312320

313321
@Override
322+
@Deprecated
314323
public void setUseJvmChmod(final boolean useJvmChmod) {
315324
this.useJvmChmod = useJvmChmod;
316325
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.io.File;
77
import java.io.IOException;
88
import java.io.InputStream;
9-
import java.util.HashMap;
109
import java.util.zip.GZIPInputStream;
1110

1211
import org.codehaus.plexus.components.io.attributes.FileAttributes;
@@ -36,6 +35,6 @@ protected InputStream getInputStream(File file) throws IOException {
3635

3736
@Override
3837
protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
39-
return new FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
38+
return new FileAttributes(file);
4039
}
4140
}

‎src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,10 @@ private void grabFilesAndDirs(String file, List<String> dirs, List<String> files
672672
} else if (zipFile.isDirectory()) {
673673
getLogger().info("JarArchiver skipping indexJar " + zipFile + " because it is not a jar");
674674
} else {
675-
try (ZipFile zf = new ZipFile(file, "utf-8")) {
675+
try (ZipFile zf = ZipFile.builder()
676+
.setFile(file)
677+
.setCharset(StandardCharsets.UTF_8)
678+
.get()) {
676679
Enumeration<ZipArchiveEntry> entries = zf.getEntries();
677680
HashSet<String> dirSet = new HashSet<>();
678681
while (entries.hasMoreElements()) {

0 commit comments

Comments
 (0)