This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit 373030d8b69ce1d3303520d9dde3e3e1c6f5ba07 Author: Gary Gregory <[email protected]> AuthorDate: Fri Jul 31 10:30:49 2026 -0400 Sort members --- .../compress/archivers/lha/LhaArchiveEntry.java | 352 ++++++++++----------- 1 file changed, 176 insertions(+), 176 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/lha/LhaArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/lha/LhaArchiveEntry.java index df3221f49..4bf60582b 100644 --- a/src/main/java/org/apache/commons/compress/archivers/lha/LhaArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/lha/LhaArchiveEntry.java @@ -30,6 +30,120 @@ * @since 1.29.0 */ public class LhaArchiveEntry implements ArchiveEntry { + static class Builder { + private String filename; + private String directoryName; + private boolean directory; + private long size; + private Date lastModifiedDate; + private long compressedSize; + private String compressionMethod; + private int crcValue; + private Integer osId; + private Integer unixPermissionMode; + private Integer unixUserId; + private Integer unixGroupId; + private Integer msdosFileAttributes; + private Integer headerCrc; + + Builder() { + } + + LhaArchiveEntry get() { + final String name = new StringBuilder() + .append(directoryName == null ? "" : directoryName) + .append(filename == null ? "" : filename) + .toString(); + + return new LhaArchiveEntry( + name, + directory, + size, + lastModifiedDate, + compressedSize, + compressionMethod, + crcValue, + osId, + unixPermissionMode, + unixUserId, + unixGroupId, + msdosFileAttributes, + headerCrc); + } + + Builder setCompressedSize(long compressedSize) { + this.compressedSize = compressedSize; + return this; + } + + Builder setCompressionMethod(String compressionMethod) { + this.compressionMethod = compressionMethod; + return this; + } + + Builder setCrcValue(int crcValue) { + this.crcValue = crcValue; + return this; + } + + Builder setDirectory(boolean directory) { + this.directory = directory; + return this; + } + + Builder setDirectoryName(String directoryName) { + this.directoryName = directoryName; + return this; + } + + Builder setFilename(String fileName) { + this.filename = fileName; + return this; + } + + Builder setHeaderCrc(Integer headerCrc) { + this.headerCrc = headerCrc; + return this; + } + + Builder setLastModifiedDate(Date lastModifiedDate) { + this.lastModifiedDate = lastModifiedDate; + return this; + } + + Builder setMsdosFileAttributes(Integer msdosFileAttributes) { + this.msdosFileAttributes = msdosFileAttributes; + return this; + } + + Builder setOsId(Integer osId) { + this.osId = osId; + return this; + } + + Builder setSize(long size) { + this.size = size; + return this; + } + + Builder setUnixGroupId(Integer unixGroupId) { + this.unixGroupId = unixGroupId; + return this; + } + + Builder setUnixPermissionMode(Integer unixPermissionMode) { + this.unixPermissionMode = unixPermissionMode; + return this; + } + + Builder setUnixUserId(Integer unixUserId) { + this.unixUserId = unixUserId; + return this; + } + } + static Builder builder() { + return new Builder(); + } private final String name; private final boolean directory; private final long size; @@ -41,7 +155,9 @@ public class LhaArchiveEntry implements ArchiveEntry { private final Integer unixPermissionMode; private final Integer unixUserId; private final Integer unixGroupId; + private final Integer msdosFileAttributes; + private final Integer headerCrc; LhaArchiveEntry(String name, boolean directory, long size, Date lastModifiedDate, @@ -63,55 +179,6 @@ public class LhaArchiveEntry implements ArchiveEntry { this.headerCrc = headerCrc; } - @Override - public String toString() { - final StringBuffer sb = new StringBuffer().append("LhaArchiveEntry[") - .append("name=").append(name) - .append(",directory=").append(directory) - .append(",size=").append(size) - .append(",lastModifiedDate=").append(lastModifiedDate == null ? "" : lastModifiedDate.toInstant().atZone(ZoneOffset.UTC).toString()) - .append(",compressedSize=").append(compressedSize) - .append(",compressionMethod=").append(compressionMethod) - .append(",crcValue=").append(String.format("0x%04x", crcValue)); - - if (osId != null) { - sb.append(",osId=").append(osId); - } - - if (unixPermissionMode != null) { - sb.append(",unixPermissionMode=").append(String.format("%03o", unixPermissionMode)); - } - - if (msdosFileAttributes != null) { - sb.append(",msdosFileAttributes=").append(String.format("%04x", msdosFileAttributes)); - } - - if (headerCrc != null) { - sb.append(",headerCrc=").append(String.format("0x%04x", headerCrc)); - } - - return sb.append("]").toString(); - } - - static Builder builder() { - return new Builder(); - } - - @Override - public String getName() { - return name; - } - - @Override - public long getSize() { - return size; - } - - @Override - public Date getLastModifiedDate() { - return lastModifiedDate; - } - /** * Gets the compressed size of this entry. * @@ -121,11 +188,6 @@ public long getCompressedSize() { return compressedSize; } - @Override - public boolean isDirectory() { - return directory; - } - /** * Gets the compression method of this entry. * @@ -145,30 +207,47 @@ public int getCrcValue() { } /** - * Gets the operating system id if available for this entry. + * Gets the header CRC if available for this entry. * - * @return operating system id or null if not available + * This method is package private, as it is of no interest to most users. + * + * @return header CRC or null if not available */ - public Integer getOsId() { - return osId; + Integer getHeaderCrc() { + return headerCrc; + } + + @Override + public Date getLastModifiedDate() { + return lastModifiedDate; } /** - * Gets the Unix permission mode if available for this entry. + * Gets the MS-DOS file attributes if available for this entry. * - * @return Unix permission mode or null if not available + * @return MS-DOS file attributes or null if not available */ - public Integer getUnixPermissionMode() { - return unixPermissionMode; + public Integer getMsdosFileAttributes() { + return msdosFileAttributes; + } + + @Override + public String getName() { + return name; } /** - * Gets the Unix user id if available for this entry. + * Gets the operating system id if available for this entry. * - * @return Unix user id or null if not available + * @return operating system id or null if not available */ - public Integer getUnixUserId() { - return unixUserId; + public Integer getOsId() { + return osId; + } + + @Override + public long getSize() { + return size; } /** @@ -181,134 +260,55 @@ public Integer getUnixGroupId() { } /** - * Gets the MS-DOS file attributes if available for this entry. + * Gets the Unix permission mode if available for this entry. * - * @return MS-DOS file attributes or null if not available + * @return Unix permission mode or null if not available */ - public Integer getMsdosFileAttributes() { - return msdosFileAttributes; + public Integer getUnixPermissionMode() { + return unixPermissionMode; } /** - * Gets the header CRC if available for this entry. - * - * This method is package private, as it is of no interest to most users. + * Gets the Unix user id if available for this entry. * - * @return header CRC or null if not available + * @return Unix user id or null if not available */ - Integer getHeaderCrc() { - return headerCrc; + public Integer getUnixUserId() { + return unixUserId; } - static class Builder { - private String filename; - private String directoryName; - private boolean directory; - private long size; - private Date lastModifiedDate; - private long compressedSize; - private String compressionMethod; - private int crcValue; - private Integer osId; - private Integer unixPermissionMode; - private Integer unixUserId; - private Integer unixGroupId; - private Integer msdosFileAttributes; - private Integer headerCrc; - - Builder() { - } - - LhaArchiveEntry get() { - final String name = new StringBuilder() - .append(directoryName == null ? "" : directoryName) - .append(filename == null ? "" : filename) - .toString(); - - return new LhaArchiveEntry( - name, - directory, - size, - lastModifiedDate, - compressedSize, - compressionMethod, - crcValue, - osId, - unixPermissionMode, - unixUserId, - unixGroupId, - msdosFileAttributes, - headerCrc); - } - - Builder setFilename(String fileName) { - this.filename = fileName; - return this; - } - - Builder setDirectoryName(String directoryName) { - this.directoryName = directoryName; - return this; - } - - Builder setDirectory(boolean directory) { - this.directory = directory; - return this; - } - - Builder setSize(long size) { - this.size = size; - return this; - } - - Builder setLastModifiedDate(Date lastModifiedDate) { - this.lastModifiedDate = lastModifiedDate; - return this; - } - - Builder setCompressedSize(long compressedSize) { - this.compressedSize = compressedSize; - return this; - } - - Builder setCompressionMethod(String compressionMethod) { - this.compressionMethod = compressionMethod; - return this; - } - - Builder setCrcValue(int crcValue) { - this.crcValue = crcValue; - return this; - } + @Override + public boolean isDirectory() { + return directory; + } - Builder setOsId(Integer osId) { - this.osId = osId; - return this; - } + @Override + public String toString() { + final StringBuffer sb = new StringBuffer().append("LhaArchiveEntry[") + .append("name=").append(name) + .append(",directory=").append(directory) + .append(",size=").append(size) + .append(",lastModifiedDate=").append(lastModifiedDate == null ? "" : lastModifiedDate.toInstant().atZone(ZoneOffset.UTC).toString()) + .append(",compressedSize=").append(compressedSize) + .append(",compressionMethod=").append(compressionMethod) + .append(",crcValue=").append(String.format("0x%04x", crcValue)); - Builder setUnixPermissionMode(Integer unixPermissionMode) { - this.unixPermissionMode = unixPermissionMode; - return this; + if (osId != null) { + sb.append(",osId=").append(osId); } - Builder setUnixUserId(Integer unixUserId) { - this.unixUserId = unixUserId; - return this; + if (unixPermissionMode != null) { + sb.append(",unixPermissionMode=").append(String.format("%03o", unixPermissionMode)); } - Builder setUnixGroupId(Integer unixGroupId) { - this.unixGroupId = unixGroupId; - return this; + if (msdosFileAttributes != null) { + sb.append(",msdosFileAttributes=").append(String.format("%04x", msdosFileAttributes)); } - Builder setMsdosFileAttributes(Integer msdosFileAttributes) { - this.msdosFileAttributes = msdosFileAttributes; - return this; + if (headerCrc != null) { + sb.append(",headerCrc=").append(String.format("0x%04x", headerCrc)); } - Builder setHeaderCrc(Integer headerCrc) { - this.headerCrc = headerCrc; - return this; - } + return sb.append("]").toString(); } }
