#103 Avoid array when ECD

src/main/java/ru/olegcherednik/zip4jvm/crypto/aes/AesCentralDirectoryDecoder.java

@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package ru.olegcherednik.zip4jvm.crypto.aes;
 
 import ru.olegcherednik.zip4jvm.crypto.Decoder;

src/main/java/ru/olegcherednik/zip4jvm/crypto/aes/AesDecoder.java

@@ -23,7 +23,6 @@
 import ru.olegcherednik.zip4jvm.exception.Zip4jvmException;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
 import ru.olegcherednik.zip4jvm.model.entry.ZipEntry;
-import ru.olegcherednik.zip4jvm.utils.quitely.Quietly;
 
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/ru/olegcherednik/zip4jvm/crypto/aes/AesStrongEngine.java

@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package ru.olegcherednik.zip4jvm.crypto.aes;
 
 import ru.olegcherednik.zip4jvm.crypto.Engine;

src/main/java/ru/olegcherednik/zip4jvm/io/in/buf/ByteArrayDataInput.java

@@ -47,7 +47,7 @@ public class ByteArrayDataInput extends BaseRandomAccessDataInput {
     private int available;
     private int offs;
 
-    @SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
+    @SuppressWarnings({ "AssignmentOrReturnOfFieldWithMutableType", "PMD.ArrayIsStoredDirectly" })
     public ByteArrayDataInput(byte[] buf, int offs, int len, ByteOrder byteOrder) {
         this.buf = buf;
         this.byteOrder = byteOrder;

src/main/java/ru/olegcherednik/zip4jvm/io/in/data/compressed/CompressedDataInput.java

@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package ru.olegcherednik.zip4jvm.io.in.data.compressed;
 
 import ru.olegcherednik.zip4jvm.io.in.data.BaseDataInput;

src/main/java/ru/olegcherednik/zip4jvm/io/in/ecd/EncryptedCentralDirectoryDataInput.java

@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package ru.olegcherednik.zip4jvm.io.in.ecd;
 
 import ru.olegcherednik.zip4jvm.crypto.Decoder;

src/main/java/ru/olegcherednik/zip4jvm/io/readers/EncryptedCentralDirectoryReader.java

@@ -77,10 +77,10 @@ public CentralDirectory read(DataInput in) throws IOException {
 
         Compression compression = Compression.parseCompressionMethod(extensibleDataSector.getCompressionMethod());
 
-        DataInput in2 = EncryptedCentralDirectoryDataInput.create(decoder, compressedSize, in);
-        in2 = compression.addCompressionDecorator(in2);
+        in = EncryptedCentralDirectoryDataInput.create(decoder, compressedSize, in);
+        in = compression.addCompressionDecorator(in);
 
-        CentralDirectory centralDirectory = super.read(in2);
+        CentralDirectory centralDirectory = super.read(in);
         centralDirectory.setDecryptionHeader(decryptionHeader);
         return centralDirectory;
     }

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/BlockDataDescriptorReader.java

@@ -18,8 +18,8 @@
  */
 package ru.olegcherednik.zip4jvm.io.readers.block;
 
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.DataDescriptorReader;
 import ru.olegcherednik.zip4jvm.model.DataDescriptor;
 import ru.olegcherednik.zip4jvm.model.block.Block;

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/BlockEncryptedCentralDirectoryReader.java

@@ -81,12 +81,12 @@ protected DecryptionHeaderReader getDecryptionHeaderReader() {
     //        return new BlockByteArrayReader((int) size, block.getEcdBlock());
     //    }
 
-//    @Override
-//    protected byte[] decompress(CompressedEcdDataInput in) throws IOException {
-//        byte[] buf = super.decompress(in);
-//        block.setDecryptedCentralDirectory(block.getDecompressedCentralDirectory());
-//        block.setDecompressedCentralDirectory(Arrays.copyOf(buf, buf.length));
-//        return buf;
-//    }
+    //    @Override
+    //    protected byte[] decompress(CompressedEcdDataInput in) throws IOException {
+    //        byte[] buf = super.decompress(in);
+    //        block.setDecryptedCentralDirectory(block.getDecompressedCentralDirectory());
+    //        block.setDecompressedCentralDirectory(Arrays.copyOf(buf, buf.length));
+    //        return buf;
+    //    }
 
 }

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/BlockEndCentralDirectoryReader.java

@@ -18,8 +18,8 @@
  */
 package ru.olegcherednik.zip4jvm.io.readers.block;
 
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.EndCentralDirectoryReader;
 import ru.olegcherednik.zip4jvm.model.EndCentralDirectory;
 import ru.olegcherednik.zip4jvm.model.block.Block;

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/crypto/strong/BlockDecryptionHeaderReader.java

@@ -20,8 +20,8 @@
 
 import ru.olegcherednik.zip4jvm.crypto.strong.DecryptionHeader;
 import ru.olegcherednik.zip4jvm.crypto.strong.Recipient;
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.crypto.strong.DecryptionHeaderReader;
 import ru.olegcherednik.zip4jvm.model.block.crypto.strong.DecryptionHeaderBlock;
 

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/zip64/BlockEndCentralDirectoryLocatorReader.java

@@ -18,8 +18,8 @@
  */
 package ru.olegcherednik.zip4jvm.io.readers.block.zip64;
 
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.zip64.EndCentralDirectoryLocatorReader;
 import ru.olegcherednik.zip4jvm.model.Zip64;
 import ru.olegcherednik.zip4jvm.model.block.Block;

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/zip64/BlockEndCentralDirectoryReader.java

@@ -18,8 +18,8 @@
  */
 package ru.olegcherednik.zip4jvm.io.readers.block.zip64;
 
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.zip64.EndCentralDirectoryReader;
 import ru.olegcherednik.zip4jvm.model.Zip64;
 import ru.olegcherednik.zip4jvm.model.block.Block;

src/main/java/ru/olegcherednik/zip4jvm/io/readers/block/zip64/BlockExtensibleDataSectorReader.java

@@ -18,8 +18,8 @@
  */
 package ru.olegcherednik.zip4jvm.io.readers.block.zip64;
 
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.zip64.ExtensibleDataSectorReader;
 import ru.olegcherednik.zip4jvm.model.Zip64;
 import ru.olegcherednik.zip4jvm.model.block.Block;

src/main/java/ru/olegcherednik/zip4jvm/io/readers/extrafiled/ExtraFieldReader.java

@@ -19,7 +19,6 @@
 package ru.olegcherednik.zip4jvm.io.readers.extrafiled;
 
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
-import ru.olegcherednik.zip4jvm.io.in.data.OffsDataInput;
 import ru.olegcherednik.zip4jvm.io.readers.ExtraFieldRecordReader;
 import ru.olegcherednik.zip4jvm.io.readers.zip64.ExtendedInfoReader;
 import ru.olegcherednik.zip4jvm.model.CentralDirectory;

src/main/java/ru/olegcherednik/zip4jvm/model/block/Block.java

@@ -21,9 +21,9 @@
 import ru.olegcherednik.zip4jvm.decompose.Utils;
 import ru.olegcherednik.zip4jvm.engine.UnzipEngine;
 import ru.olegcherednik.zip4jvm.io.in.buf.DiskByteArrayDataInput;
-import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.DataInput;
 import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessDataInput;
+import ru.olegcherednik.zip4jvm.io.in.data.RandomAccessFileBaseDataInput;
 import ru.olegcherednik.zip4jvm.model.ZipModel;
 import ru.olegcherednik.zip4jvm.model.src.SrcZip;
 import ru.olegcherednik.zip4jvm.utils.function.LocalSupplier;

src/test/java/ru/olegcherednik/zip4jvm/TestData.java

@@ -225,6 +225,8 @@ private static String getSymlinkName(String fileName, String prefix) {
         return StringUtils.isEmpty(ext) ? name : name + '.' + ext;
     }
 
+
+    @SuppressWarnings({ "unused", "PMD.UnusedPrivateMethod" })
     private static Path createTempDirectory(String prefix) {
         try {
             return Files.createTempDirectory(prefix);

src/test/java/ru/olegcherednik/zip4jvm/crypto/aes/AesDecoderTest.java

@@ -24,7 +24,6 @@
 import ru.olegcherednik.zip4jvm.utils.ReflectionUtils;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.io.IOException;

src/test/java/ru/olegcherednik/zip4jvm/encryption/EncryptedCentralDirectoryTest.java

@@ -20,7 +20,6 @@
 
 import ru.olegcherednik.zip4jvm.UnzipIt;
 import ru.olegcherednik.zip4jvm.Zip4jvmSuite;
-import ru.olegcherednik.zip4jvm.ZipInfo;
 import ru.olegcherednik.zip4jvm.exception.EncryptionNotSupportedException;
 import ru.olegcherednik.zip4jvm.exception.IncorrectCentralDirectoryPasswordException;
 import ru.olegcherednik.zip4jvm.model.password.PasswordProvider;
@@ -68,7 +67,7 @@ public void shouldUnzipWhenStoreSolidAes() throws IOException {
 
         UnzipSettings settings = UnzipSettings.builder().password(password).build();
         UnzipIt.zip(zip).destDir(destDir).settings(settings).extract();
-//        ZipInfo.zip(zip).password(password).decompose(destDir.resolve("-----"));
+        //        ZipInfo.zip(zip).password(password).decompose(destDir.resolve("-----"));
         //        assertThatDirectory(destDir).matches(rootAssert);
     }