You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/07/07 03:53:09 UTC
[commons-compress] branch master updated (82398892 -> b46835ce)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
from 82398892 Fix formatting
new 3cb0b1ba Format tweak
new 9cffedd8 Format tweak
new 1a8890ab Use modern Map API
new 9e5c69e4 Use modern Map API
new b46835ce Use modern Map APIs
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../compress/archivers/sevenz/SevenZFile.java | 4 +---
.../compress/archivers/zip/ZipArchiveEntry.java | 4 ++++
.../archivers/zip/ZipArchiveOutputStream.java | 13 ++++++-------
.../commons/compress/archivers/zip/ZipFile.java | 4 +---
.../compress/harmony/pack200/ClassBands.java | 22 ++++++++--------------
.../commons/compress/harmony/pack200/CpBands.java | 3 +--
.../compress/harmony/unpack200/CpBands.java | 7 +------
7 files changed, 22 insertions(+), 35 deletions(-)
[commons-compress] 04/05: Use modern Map API
Posted by gg...@apache.org.
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-compress.git
commit 9e5c69e4c83bb23aa9ba1508f72ac9791284f996
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 6 22:55:45 2023 -0400
Use modern Map API
---
.../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index d42d0f2a..852ddf75 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -1605,7 +1605,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
if (isSplitZip) {
numberOfThisDisk = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex();
}
- final int numOfEntriesOnThisDisk = numberOfCDInDiskData.get(numberOfThisDisk) == null ? 0 : numberOfCDInDiskData.get(numberOfThisDisk);
+ final int numOfEntriesOnThisDisk = numberOfCDInDiskData.getOrDefault(numberOfThisDisk, 0);
return numberOfThisDisk >= ZipConstants.ZIP64_MAGIC_SHORT /* number of this disk */
|| cdDiskNumberStart >= ZipConstants.ZIP64_MAGIC_SHORT /* number of the disk with the start of the central directory */
|| numOfEntriesOnThisDisk >= ZipConstants.ZIP64_MAGIC_SHORT /* total number of entries in the central directory on this disk */
[commons-compress] 02/05: Format tweak
Posted by gg...@apache.org.
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-compress.git
commit 9cffedd8723946bb10083fb50ba8b83060cf7a89
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 6 22:53:56 2023 -0400
Format tweak
---
.../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index 9365eb6b..d42d0f2a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -1603,7 +1603,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
private boolean shouldUseZip64EOCD() {
int numberOfThisDisk = 0;
if (isSplitZip) {
- numberOfThisDisk = ((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex();
+ numberOfThisDisk = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex();
}
final int numOfEntriesOnThisDisk = numberOfCDInDiskData.get(numberOfThisDisk) == null ? 0 : numberOfCDInDiskData.get(numberOfThisDisk);
return numberOfThisDisk >= ZipConstants.ZIP64_MAGIC_SHORT /* number of this disk */
[commons-compress] 01/05: Format tweak
Posted by gg...@apache.org.
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-compress.git
commit 3cb0b1ba476f67a8b7a55a9094e1c626daf88801
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 6 22:53:19 2023 -0400
Format tweak
---
.../apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index 7380eab6..9365eb6b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -785,7 +785,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
if (isSplitZip) {
// calculate the disk number for every central file header,
// this will be used in writing End Of Central Directory and Zip64 End Of Central Directory
- final int currentSplitSegment = ((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex();
+ final int currentSplitSegment = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex();
if (numberOfCDInDiskData.get(currentSplitSegment) == null) {
numberOfCDInDiskData.put(currentSplitSegment, 1);
} else {
[commons-compress] 03/05: Use modern Map API
Posted by gg...@apache.org.
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-compress.git
commit 1a8890abc34c763d5d0ef54201e99827be5e19c6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 6 22:53:59 2023 -0400
Use modern Map API
---
.../java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index ddcb0d1c..6752014e 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -726,9 +726,7 @@ public class SevenZFile implements Closeable {
}
private void checkEntryIsInitialized(final Map<Integer, SevenZArchiveEntry> archiveEntries, final int index) {
- if (archiveEntries.get(index) == null) {
- archiveEntries.put(index, new SevenZArchiveEntry());
- }
+ archiveEntries.computeIfAbsent(index, i -> new SevenZArchiveEntry());
}
/**
[commons-compress] 05/05: Use modern Map APIs
Posted by gg...@apache.org.
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-compress.git
commit b46835ce195c77763b0c37e1e9203fb42dc0a91a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 6 23:53:04 2023 -0400
Use modern Map APIs
---
.../compress/archivers/zip/ZipArchiveEntry.java | 4 ++++
.../archivers/zip/ZipArchiveOutputStream.java | 7 +++----
.../commons/compress/archivers/zip/ZipFile.java | 4 +---
.../compress/harmony/pack200/ClassBands.java | 22 ++++++++--------------
.../commons/compress/harmony/pack200/CpBands.java | 3 +--
.../compress/harmony/unpack200/CpBands.java | 7 +------
6 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index 595d0420..62f93b9a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -26,6 +26,7 @@ import java.nio.file.attribute.FileTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
+import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Objects;
@@ -226,7 +227,10 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry implements ArchiveEn
*/
UNICODE_EXTRA_FIELD
}
+
static final ZipArchiveEntry[] EMPTY_ARRAY = {};
+ static LinkedList<ZipArchiveEntry> EMPTY_LINKED_LIST = new LinkedList<>();
+
public static final int PLATFORM_UNIX = 3;
public static final int PLATFORM_FAT = 0;
public static final int CRC_UNKNOWN = -1;
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index 852ddf75..7739efb8 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -1644,8 +1644,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
.NUMBER_OF_THE_DISK_OF_CENTRAL_DIRECTORY_TOO_BIG_MESSAGE);
}
- final int numOfEntriesOnThisDisk = numberOfCDInDiskData.get(numberOfThisDisk) == null
- ? 0 : numberOfCDInDiskData.get(numberOfThisDisk);
+ final int numOfEntriesOnThisDisk = numberOfCDInDiskData.getOrDefault(numberOfThisDisk, 0);
if (numOfEntriesOnThisDisk >= ZipConstants.ZIP64_MAGIC_SHORT) {
throw new Zip64RequiredException(Zip64RequiredException
.TOO_MANY_ENTRIES_ON_THIS_DISK_MESSAGE);
@@ -1762,7 +1761,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
// total number of entries in the central directory on this disk
final int numOfEntriesOnThisDisk = isSplitZip
- ? numberOfCDInDiskData.get(numberOfThisDisk) == null ? 0 : numberOfCDInDiskData.get(numberOfThisDisk)
+ ? numberOfCDInDiskData.getOrDefault(numberOfThisDisk, 0)
: numberOfEntries;
final byte[] numOfEntriesOnThisDiskData = ZipShort
.getBytes(Math.min(numOfEntriesOnThisDisk, ZipConstants.ZIP64_MAGIC_SHORT));
@@ -1984,7 +1983,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream {
// total number of entries in the central directory on this disk
final int numOfEntriesOnThisDisk = isSplitZip
- ? numberOfCDInDiskData.get(numberOfThisDisk) == null ? 0 : numberOfCDInDiskData.get(numberOfThisDisk)
+ ? numberOfCDInDiskData.getOrDefault(numberOfThisDisk, 0)
: entries.size();
final byte[] numOfEntriesOnThisDiskData = ZipEightByteInteger.getBytes(numOfEntriesOnThisDisk);
writeOut(numOfEntriesOnThisDiskData);
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index 47861753..81569c41 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -868,9 +868,7 @@ public class ZipFile implements Closeable {
* @since 1.6
*/
public Iterable<ZipArchiveEntry> getEntries(final String name) {
- final List<ZipArchiveEntry> entriesOfThatName = nameMap.get(name);
- return entriesOfThatName != null ? entriesOfThatName
- : Collections.emptyList();
+ return nameMap.getOrDefault(name, ZipArchiveEntry.EMPTY_LINKED_LIST);
}
/**
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
index 3fb42001..79ddb0d3 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
@@ -589,20 +589,14 @@ public class ClassBands extends BandSet {
}
}
- public void currentClassReferencesInnerClass(final CPClass inner) {
- if (!(index >= class_this.length)) {
- final CPClass currentClass = class_this[index];
- if (currentClass != null && !currentClass.equals(inner)
- && !isInnerClassOf(currentClass.toString(), inner)) {
- Set<CPClass> referencedInnerClasses = classReferencesInnerClass.get(currentClass);
- if (referencedInnerClasses == null) {
- referencedInnerClasses = new HashSet<>();
- classReferencesInnerClass.put(currentClass, referencedInnerClasses);
- }
- referencedInnerClasses.add(inner);
- }
- }
- }
+ public void currentClassReferencesInnerClass(final CPClass inner) {
+ if (!(index >= class_this.length)) {
+ final CPClass currentClass = class_this[index];
+ if (currentClass != null && !currentClass.equals(inner) && !isInnerClassOf(currentClass.toString(), inner)) {
+ classReferencesInnerClass.computeIfAbsent(currentClass, c -> new HashSet<>()).add(inner);
+ }
+ }
+ }
public void doBciRenumbering(final IntList bciRenumbering, final Map<Label, Integer> labelsToOffsets) {
renumberBci(codeLineNumberTableBciP, bciRenumbering, labelsToOffsets);
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
index bef2cfe1..7b8562ac 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
@@ -147,8 +147,7 @@ public class CpBands extends BandSet {
}
public boolean existsCpClass(final String className) {
- final CPClass cpClass = stringsToCpClass.get(className);
- return cpClass != null;
+ return stringsToCpClass.containsKey(className);
}
/**
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
index a31e97a0..ed11c3d4 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
@@ -107,12 +107,7 @@ public class CpBands extends BandSet {
final String string = cpClass[index];
final int utf8Index = cpClassInts[index];
final int globalIndex = classOffset + index;
- CPClass cpString = stringsToCPClass.get(string);
- if (cpString == null) {
- cpString = new CPClass(cpUTF8Value(utf8Index), globalIndex);
- stringsToCPClass.put(string, cpString);
- }
- return cpString;
+ return stringsToCPClass.computeIfAbsent(string, k -> new CPClass(cpUTF8Value(utf8Index), globalIndex));
}
public CPClass cpClassValue(final String string) {