creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1462720 - in /creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles: Configuration.java Main.java
Date Sat, 30 Mar 2013 09:02:14 GMT
Author: rdonkin
Date: Sat Mar 30 09:02:14 2013
New Revision: 1462720

URL: http://svn.apache.org/r1462720
Log:
Start to factor out transformation of arguments into configuration

Added:
    creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Configuration.java
  (with props)
Modified:
    creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java

Added: creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Configuration.java
URL: http://svn.apache.org/viewvc/creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Configuration.java?rev=1462720&view=auto
==============================================================================
--- creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Configuration.java
(added)
+++ creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Configuration.java
Sat Mar 30 09:02:14 2013
@@ -0,0 +1,48 @@
+/**
+ * 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 org.apache.creadur.tentacles;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class Configuration {
+
+    private static final int ARGUMENT_INDEX_FOR_URI_CONFIGURATION = 0;
+
+    private static URI toURI(final String arg) throws URISyntaxException {
+        final URI uri = new URI(arg);
+        if (arg.startsWith("file:")) {
+            return new File(uri).getAbsoluteFile().toURI();
+        }
+        return uri;
+    }
+
+
+    private final URI staging;
+
+    public Configuration(final String... args) throws URISyntaxException {
+        this.staging = toURI(args[ARGUMENT_INDEX_FOR_URI_CONFIGURATION]);
+    }
+
+    public URI getStaging() {
+        return staging;
+    }
+
+}

Propchange: creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Configuration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java
URL: http://svn.apache.org/viewvc/creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java?rev=1462720&r1=1462719&r2=1462720&view=diff
==============================================================================
--- creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java (original)
+++ creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java Sat Mar 30
09:02:14 2013
@@ -63,10 +63,13 @@ public class Main {
     private String filter;
     private final NexusClient client = new NexusClient();
 
+    private final Configuration configuration;
 
-    public Main(String... args) throws Exception {
+    public Main(final String... args) throws Exception {
 
-        this.staging = getURI(args[0]);
+        configuration = new Configuration(args);
+
+        this.staging = configuration.getStaging();
 
         this.local = new File(rootDirectoryForLocalOutput(args));
 
@@ -102,15 +105,6 @@ public class Main {
         return rootDirectoryForLocal;
     }
 
-    private URI getURI(String arg) throws URISyntaxException {
-        final URI uri = new URI(arg);
-        if (arg.startsWith("file:")) {
-            File file = new File(uri);
-            file = file.getAbsoluteFile();
-            return file.toURI();
-        }
-        return uri;
-    }
 
     private void licenses(String s) throws IOException {
         URL aslURL = this.getClass().getClassLoader().getResource("licenses/" + s + ".txt");



Mime
View raw message