GH-35 Cleanup configuration (Resolve #35)

src/main/java/org/panda_lang/nanomaven/NanoConfiguration.java

@@ -16,43 +16,40 @@
 
 package org.panda_lang.nanomaven;
 
+import java.io.Serializable;
 import java.util.List;
 
-public final class NanoConfiguration {
+public final class NanoConfiguration implements Serializable {
 
-    private int port;
     private String hostname;
-
+    private int port;
     private List<String> repositories;
-    private boolean repositoryPathEnabled;
-    private boolean indexingEnabled;
     private boolean deployEnabled;
+    private boolean rewritePathsEnabled;
+    private boolean fullAuthEnabled;
 
-    private boolean nestedMaven;
-    private String externalMaven;
-
-    public boolean isDeployEnabled() {
-        return deployEnabled;
+    public void setHostname(String hostname) {
+        this.hostname = hostname;
     }
 
-    public String getExternalMaven() {
-        return externalMaven;
+    public void setPort(int port) {
+        this.port = port;
     }
 
-    public boolean isNestedMaven() {
-        return nestedMaven;
+    public void setRepositories(List<String> repositories) {
+        this.repositories = repositories;
     }
 
-    public boolean isIndexingEnabled() {
-        return indexingEnabled;
+    public void setDeployEnabled(boolean deployEnabled) {
+        this.deployEnabled = deployEnabled;
     }
 
-    public boolean isRepositoryPathEnabled() {
-        return repositoryPathEnabled;
+    public void setRewritePathsEnabled(boolean rewritePathsEnabled) {
+        this.rewritePathsEnabled = rewritePathsEnabled;
     }
 
-    public List<? extends String> getRepositories() {
-        return repositories;
+    public void setFullAuthEnabled(boolean fullAuthEnabled) {
+        this.fullAuthEnabled = fullAuthEnabled;
     }
 
     public String getHostname() {
@@ -63,36 +60,20 @@ public int getPort() {
         return port;
     }
 
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    public void setRepositories(List<String> repositories) {
-        this.repositories = repositories;
-    }
-
-    public void setRepositoryPathEnabled(boolean repositoryPathEnabled) {
-        this.repositoryPathEnabled = repositoryPathEnabled;
-    }
-
-    public void setIndexingEnabled(boolean indexingEnabled) {
-        this.indexingEnabled = indexingEnabled;
+    public List<String> getRepositories() {
+        return repositories;
     }
 
-    public void setNestedMaven(boolean nestedMaven) {
-        this.nestedMaven = nestedMaven;
+    public boolean isDeployEnabled() {
+        return deployEnabled;
     }
 
-    public void setExternalMaven(String externalMaven) {
-        this.externalMaven = externalMaven;
+    public boolean isRewritePathsEnabled() {
+        return rewritePathsEnabled;
     }
 
-    public void setDeployEnabled(boolean deployEnabled) {
-        this.deployEnabled = deployEnabled;
+    public boolean isFullAuthEnabled() {
+        return fullAuthEnabled;
     }
 
 }

src/main/java/org/panda_lang/nanomaven/auth/Authenticator.java

@@ -27,7 +27,7 @@
 
 public final class Authenticator {
 
-    private TokenService tokenService;
+    private final TokenService tokenService;
 
     public Authenticator(TokenService tokenService) {
         this.tokenService = tokenService;

src/main/java/org/panda_lang/nanomaven/repository/DownloadController.java

@@ -133,7 +133,7 @@ private String normalizeUri(NanoConfiguration configuration, String uri) {
             return StringUtils.EMPTY;
         }
 
-        if (configuration.isRepositoryPathEnabled()) {
+        if (!configuration.isRewritePathsEnabled()) {
             return uri;
         }
 

src/main/resources/nanomaven.yml

@@ -2,29 +2,22 @@
 #       Nano Maven       #
 # ~~~~~~~~~~~~~~~~~~~~~~ #
 
-# General Repository Name
-repositoryName: NanoMaven Repository
-
 # Hostname
 hostname: ''
 # Port
 port: 80
 
-# Include a repository names in the path
-repositoryPathEnabled: false
-# Enable directory indexing
-indexingEnabled: true
-
-# Root directories of repositories.
+# List of supported Maven repositories.
 # First directory on the list is the main repository.
 repositories:
   - releases
   - snapshots
 
-# Nested Maven
-nestedMaven: true
-# External Maven directory (if 'nested-maven': false)
-externalMaven: /usr/local/share/java/maven33
-
 # Accept deployment connections
-deployEnabled: true
+deployEnabled: true
+# Allow to omit name of the main repository in request
+# e.g. /org/panda-lang/nanomaven will be redirected to /releases/org/panda-lang/nanomaven
+rewritePathsEnabled: true
+# Require authentication of all requests (download, head requests)
+# This option should be set to 'false', if you are hosting public repository
+fullAuthEnabled: false