Merge tag 'v1.1.0'

[maven-release-plugin] copy for tag v1.1.0

Author: sparkoo

.gitignore

@@ -21,4 +21,7 @@ build/
 nbbuild/
 dist/
 nbdist/
-.nb-gradle/
+.nb-gradle/
+
+application.properties
+test_repository/

.travis.yml

@@ -0,0 +1,5 @@
+language: java
+jdk:
+  - oraclejdk8
+sudo: false
+script: ./mvnw clean verify

README.md

@@ -79,4 +79,4 @@ Configuration can be provided by `application.properties` file on classpath
 box.home=/tmp/test_repository
 box.prefix=sftp://my_box_server:
 ```
-, or as command line arguments `java -jar -Dbox.home=/tmp/test_repository target/boxsitory-${version}.jar`
+or as command line arguments `java -jar -Dbox.home=/tmp/test_repository target/boxsitory-${version}.jar`

pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cz.sparko.boxitory</groupId>
     <artifactId>boxitory</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>boxitory</name>
@@ -15,9 +14,29 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.3.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
+    <issueManagement>
+        <url>https://github.com/sparkoo/boxitory/issues</url>
+        <system>GitHub Issues</system>
+    </issueManagement>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>http://www.opensource.org/licenses/mit-license.php</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <scm>
+        <url>https://github.com/sparkoo/boxitory</url>
+        <connection>scm:git:git://github.com/sparkoo/boxitory.git</connection>
+        <developerConnection>scm:git:[email protected]:sparkoo/boxitory.git</developerConnection>
+      <tag>v1.1.0</tag>
+  </scm>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -50,7 +69,15 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>6.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.5</version>
+            <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -59,6 +86,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.3</version>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/cz/sparko/boxitory/conf/AppProperties.java

@@ -8,6 +8,7 @@
 public class AppProperties {
     private String home = ".";
     private String host_prefix = "";
+    private boolean sort_desc = false;
 
     public String getHome() {
         return home;
@@ -17,6 +18,14 @@ public String getHost_prefix() {
         return host_prefix;
     }
 
+    public boolean isSort_desc() {
+        return sort_desc;
+    }
+
+    public void setSort_desc(boolean sort_desc) {
+        this.sort_desc = sort_desc;
+    }
+
     public void setHome(String home) {
         this.home = home;
     }

src/main/java/cz/sparko/boxitory/domain/BoxVersion.java

@@ -24,9 +24,9 @@ public String toString() {
     public boolean equals(Object o) {
         if (this == o) { return true; }
         if (o == null || getClass() != o.getClass()) { return false; }
-        BoxVersion that = (BoxVersion) o;
-        return Objects.equals(version, that.version) &&
-                Objects.equals(providers, that.providers);
+        BoxVersion thatVersion = (BoxVersion) o;
+        return Objects.equals(this.version, thatVersion.version) &&
+                providers.containsAll(thatVersion.getProviders()) && thatVersion.getProviders().containsAll(providers);
     }
 
     @Override

src/main/java/cz/sparko/boxitory/service/FilesystemBoxRepository.java

@@ -6,35 +6,37 @@
 import cz.sparko.boxitory.domain.BoxVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import static java.util.Collections.singletonList;
+import static java.lang.Integer.compare;
+import static java.lang.Integer.parseInt;
+import static java.util.Comparator.comparingInt;
 
 public class FilesystemBoxRepository implements BoxRepository {
     private static final Logger LOG = LoggerFactory.getLogger(FilesystemBoxRepository.class);
 
     private final String hostPrefix;
     private final File boxHome;
+    private final boolean sortDesc;
 
-    @Autowired
     public FilesystemBoxRepository(AppProperties appProperties) {
         this.boxHome = new File(appProperties.getHome());
         this.hostPrefix = appProperties.getHost_prefix();
+        this.sortDesc = appProperties.isSort_desc();
         LOG.info("setting BOX_HOME as [{}] and HOST_PREFIX as [{}]", boxHome.getAbsolutePath(), hostPrefix);
     }
 
     @Override
     public Optional<Box> getBox(String boxName) {
-        List<BoxVersion> boxVersions = new ArrayList<>();
+        Map<String, List<File>> groupedBoxFiles = new HashMap<>();
         getBoxDir(boxName)
-                .ifPresent(d -> boxVersions.addAll(getBoxVersionsFromBoxDir(d)));
+                .ifPresent(d -> groupedBoxFiles.putAll(groupBoxFilesByVersion(d)));
+
+        List<BoxVersion> boxVersions = createBoxVersionsFromGroupedFiles(groupedBoxFiles);
         if (boxVersions.isEmpty()) {
             LOG.debug("no box versions found for [{}]", boxName);
             return Optional.empty();
@@ -55,15 +57,16 @@ private Optional<File> getBoxDir(String boxName) {
                 .findFirst();
     }
 
-    private List<BoxVersion> getBoxVersionsFromBoxDir(File boxDir) {
+    private Map<String, List<File>> groupBoxFilesByVersion(File boxDir) {
         File[] boxFiles = Optional.ofNullable(boxDir.listFiles())
                 .orElse(new File[0]);
         return Arrays.stream(boxFiles)
                 .filter(File::isFile)
                 .filter(f -> f.getName().endsWith(".box"))
                 .filter(this::validateFilename)
-                .map(this::parseBoxFile)
-                .collect(Collectors.toList());
+                .collect(Collectors.groupingBy(
+                        this::getBoxVersionFromFileName
+                ));
     }
 
     private boolean validateFilename(File boxFile) {
@@ -76,16 +79,40 @@ private boolean validateFilename(File boxFile) {
         return true;
     }
 
-    private BoxVersion parseBoxFile(File file) {
+    private String getBoxVersionFromFileName(File file) {
         String filename = file.getName();
         List<String> parsedFilename = Arrays.asList(filename.split("_"));
+        return parsedFilename.get(1);
+    }
+
+    private List<BoxVersion> createBoxVersionsFromGroupedFiles(Map<String, List<File>> groupedFiles) {
+        List<BoxVersion> boxVersions = new ArrayList<>();
+        groupedFiles.forEach(
+                (key, value) -> boxVersions.add(createBoxVersion(key, value))
+        );
+        Comparator<BoxVersion> versionComparator = Comparator.comparingInt(o -> Integer.parseInt(o.getVersion()));
+        if (sortDesc) {
+            boxVersions.sort(versionComparator.reversed());
+        } else {
+            boxVersions.sort(versionComparator);
+        }
+        return boxVersions;
+    }
+
+    private BoxVersion createBoxVersion(String version, List<File> fileList) {
+        return new BoxVersion(
+                version,
+                fileList.stream().map(this::createBoxProviderFromFile).collect(Collectors.toList())
+        );
+    }
 
-        String name = parsedFilename.get(0);
-        String version = parsedFilename.get(1);
+    private BoxProvider createBoxProviderFromFile(File file) {
+        String filename = file.getName();
+        List<String> parsedFilename = Arrays.asList(filename.split("_"));
         String provider = parsedFilename.get(2);
         if (provider.endsWith(".box")) {
             provider = provider.substring(0, provider.length() - 4);
         }
-        return new BoxVersion(version, singletonList(new BoxProvider(hostPrefix + file.getAbsolutePath(), provider)));
+        return new BoxProvider(hostPrefix + file.getAbsolutePath(), provider);
     }
 }

src/main/resources/application.properties

@@ -1,3 +1,4 @@
 box.home=.
 box.host_prefix=
-server.port=8083
+server.port=8083
+box.sort_desc=false