Moved test-lib from src/test/resources to src/test.

Replaced while and if/else to stream.

Author: Vladimir.Shapkin

pom.xml

@@ -82,7 +82,8 @@ SOFTWARE.
     </site>
   </distributionManagement>
   <properties>
-    <additionalClasspathElements>${project.build.directory}/${project.artifactId}-test-lib-${project.version}.jar</additionalClasspathElements>
+    <testLibPath>src/test/test-lib</testLibPath>
+    <testLibJarPath>${project.build.directory}/${project.artifactId}-test-lib-${project.version}.jar</testLibJarPath>
   </properties>
   <dependencies>
     <dependency>
@@ -133,24 +134,6 @@ SOFTWARE.
     </dependency>
   </dependencies>
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/test/resources</directory>
-        <filtering>true</filtering>
-        <excludes>
-          <exclude>test-lib/**</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${basedir}/src/test/resources</directory>
-        <filtering>true</filtering>
-        <excludes>
-          <exclude>test-lib/**</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.pitest</groupId>
@@ -165,7 +148,9 @@ SOFTWARE.
               <threads>8</threads>
               <mutationThreshold>75</mutationThreshold>
               <timeoutConstant>500</timeoutConstant>
-              <additionalClasspathElements>${additionalClasspathElements}</additionalClasspathElements>
+              <additionalClasspathElements>
+                <additionalClasspathElement>${testLibJarPath}</additionalClasspathElement>
+              </additionalClasspathElements>
               <useClasspathJar>true</useClasspathJar>
             </configuration>
           </execution>
@@ -221,7 +206,7 @@ SOFTWARE.
             <configuration>
               <finalName>${project.artifactId}-test-lib-${project.version}</finalName>
               <descriptors>
-                <descriptor>${basedir}/src/test/resources/test-lib/assembly.xml</descriptor>
+                <descriptor>${testLibPath}/assembly.xml</descriptor>
               </descriptors>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
@@ -239,7 +224,7 @@ SOFTWARE.
               <goal>install-file</goal>
             </goals>
             <configuration>
-              <file>${additionalClasspathElements}</file>
+              <file>${testLibJarPath}</file>
               <groupId>org.cactoos</groupId>
               <artifactId>${project.artifactId}-test-lib</artifactId>
               <version>${project.version}</version>

src/main/java/org/cactoos/io/ResourceOf.java

@@ -28,9 +28,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
@@ -293,28 +290,21 @@ private static final class JarDirectoryFileNameStream {
          * @throws Exception If something goes wrong
          */
         public InputStream files() throws Exception {
-            final List<String> names = new ArrayList<>(2);
             try (JarFile jar = new JarFile(this.extract())) {
-                final Enumeration<JarEntry> entries = jar.entries();
-                while (entries.hasMoreElements()) {
-                    final JarEntry entry = entries.nextElement();
-                    final String name = entry.getName();
-                    if (this.path.equals(name)) {
-                        continue;
-                    } else if (name.lastIndexOf(this.path) >= 0) {
-                        names.add(name.substring(this.path.length()));
-                    }
-                }
+                return
+                    new InputStreamOf(
+                        jar
+                            .stream()
+                            .map(JarEntry::getName)
+                            .filter(
+                                name -> !this.path.equals(name)
+                                    && name.lastIndexOf(this.path) >= 0
+                            )
+                            .map(name -> name.substring(this.path.length()))
+                            .collect(Collectors.joining("\n"))
+                            .getBytes(StandardCharsets.UTF_8)
+                    );
             }
-            return
-                new InputStreamOf(
-                    names
-                        .stream()
-                        .collect(
-                            Collectors.joining("\n")
-                        )
-                        .getBytes(StandardCharsets.UTF_8)
-                );
         }
 
         /**

src/test/resources/test-lib/assembly.xml renamed to src/test/test-lib/assembly.xml

@@ -30,7 +30,7 @@ SOFTWARE.
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${project.basedir}/src/test/resources/test-lib</directory>
+      <directory>${project.basedir}/${testLibPath}</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
         <include>org/cactoos/io/small-text-file.txt</include>