Fixed bug with single lookup function and added deployed zip archive

jonathanargo · Jan 14, 2017 · f8e6594 · f8e6594
1 parent 100b031
commit f8e6594
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.jargo</groupId>
     <artifactId>GeoLookup</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <name>GeoLookup</name>
@@ -13,12 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mainClass>com.jargo.geolookup.GeoLookup</mainClass>
     </properties>
-
-    <organization>
-        <!-- Used as the 'Vendor' for JNLP generation -->
-        <name>Your Organisation</name>
-    </organization>
-
+
     <build>
         <plugins>
             <plugin>
@@ -102,6 +97,24 @@
                     </additionalClasspathElements>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <descriptors>
+                      <descriptor>src/assembly/bin.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencies>

diff --git a/settings.ini b/settings.ini
@@ -1,15 +1,15 @@
 [settings]
 key = 
 
-; Input fields
+; [Input fields]
 ; If your address input field is all in one cell, use the fullAddressField. Otherwise set the individual parts.
 fullAddressField = 
 streetField = street
 cityField = city
 stateField = state
 zipField = zip
 
-; Output fields
+; [Output fields]
 ; All of these are optional.
 fullLocationOutputField = full_location
 latOutputField = latitude

diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>settings.ini</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/java/com/jargo/geolookup/ApiResponse.java b/src/main/java/com/jargo/geolookup/ApiResponse.java
@@ -1,16 +1,8 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package com.jargo.geolookup;
 
 import java.util.List;
 
-/**
- *
- * @author jonat
- */
 public class ApiResponse {
     private String status;
     private List<ApiResponseResult> results;

diff --git a/src/main/java/com/jargo/geolookup/ApiResponseBuilder.java b/src/main/java/com/jargo/geolookup/ApiResponseBuilder.java
@@ -5,16 +5,21 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import javafx.scene.control.Alert.AlertType;
 
 public class ApiResponseBuilder {
     public static ApiResponse buildApiResponse(LookupConnector lookupConnector) {
 
-        InputStream in = lookupConnector.makeRequest();
-        String rawResponse = readRawResponse(in);        
+        ApiResponse apiResponse = null;
 
-        Gson gson = new Gson();
-        ApiResponse apiResponse = gson.fromJson(rawResponse, ApiResponse.class);
-        apiResponse.setRawResponse(rawResponse);
+        try (InputStream in = lookupConnector.makeRequest()) {
+            String rawResponse = readRawResponse(in);
+            Gson gson = new Gson();
+            apiResponse = gson.fromJson(rawResponse, ApiResponse.class);
+            apiResponse.setRawResponse(rawResponse);
+        } catch (IOException ex) {
+            Output.handle("Failed to read response.", AlertType.ERROR);
+        }
 
         return apiResponse;
     }
@@ -32,7 +37,7 @@ protected static String readRawResponse(InputStream in) {
             }
 
         } catch (IOException ex) {
-            System.out.println("Failed to read raw response data: " + ex.getMessage());
+            Output.handle("Failed to read raw response data.", AlertType.ERROR);
             rawResponse = null;
         }
 

diff --git a/src/main/java/com/jargo/geolookup/GeoLookup.java b/src/main/java/com/jargo/geolookup/GeoLookup.java
@@ -6,10 +6,6 @@
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-/**
- *
- * @author jargo
- */
 public class GeoLookup extends Application {
 
     @Override

diff --git a/src/main/java/com/jargo/geolookup/GeoLookupController.java b/src/main/java/com/jargo/geolookup/GeoLookupController.java
@@ -343,28 +343,28 @@ protected File selectSpreadsheetFile(FileChooserType type, String title) {
         }
 
         return result;
-
     }
 
     protected String getKey() {
         String returnVal = "";
 
         String key = options.get("settings", "key");
         if (key.isEmpty()) {
-            try {
-                FileReader fReader = new FileReader("key.txt");
-                BufferedReader bReader = new BufferedReader(fReader);
-                String line;
-                while ((line = bReader.readLine()) != null) {
-                    returnVal += line;
+            File keyFile = new File("key.txt");
+            if (keyFile.canRead()) {
+                try {
+                    FileReader fReader = new FileReader("key.txt");
+                    BufferedReader bReader = new BufferedReader(fReader);
+                    String line;
+                    while ((line = bReader.readLine()) != null) {
+                        returnVal += line;
+                    }
+                } catch (FileNotFoundException ex) {
+                    Output.handle("Could not find file 'key.txt'", AlertType.ERROR);
+                } catch (IOException ex) {
+                    Output.handle("An error occurred while reading the key file: " + ex.getMessage(), AlertType.ERROR);
                 }
-
-            } catch (FileNotFoundException ex) {
-                Output.handle("Could not find file.", AlertType.ERROR);
-
-            } catch (IOException ex) {
-                Output.handle("An error occurred while reading the key file: "+ex.getMessage(), AlertType.ERROR);
-            }
+            }            
         } else {
             returnVal = key;
         }

diff --git a/src/main/java/com/jargo/geolookup/LookupConnector.java b/src/main/java/com/jargo/geolookup/LookupConnector.java
@@ -6,12 +6,9 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
+import javafx.scene.control.Alert.AlertType;
 import org.apache.http.client.utils.URIBuilder;
 
-/**
- *
- * @author jargo
- */
 public class LookupConnector {
 
     private String _address;
@@ -47,13 +44,11 @@ public InputStream makeRequest() {
             return connection.getInputStream();
 
         } catch (MalformedURLException ex) {
-            System.out.println("Bad URL detected.");
-
+            Output.handle("Bad URL detected.", AlertType.ERROR);
         } catch (IOException ex) {
-            System.out.println("Unable to establish connection to API.");
-
+            Output.handle("Unable to establish connection to API.", AlertType.ERROR);            
         } catch (URISyntaxException ex) {
-            System.out.println("Bad URI syntax.");
+            Output.handle("Bad URI syntax.", AlertType.ERROR);
         }
 
         return null;

diff --git a/src/main/resources/fxml/GeoLookup.fxml b/src/main/resources/fxml/GeoLookup.fxml
@@ -15,12 +15,12 @@
           <children>
             <Label text="Single Address:" GridPane.columnIndex="1" GridPane.rowIndex="0" />
             <TextField fx:id="singleAddressField" disable="false" editable="true" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="0" />
-            <RadioButton fx:id="singleAddressRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="true" text="" GridPane.columnIndex="0" GridPane.rowIndex="0">
+            <RadioButton fx:id="singleAddressRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="false" text="" GridPane.columnIndex="0" GridPane.rowIndex="0">
               <toggleGroup>
                 <ToggleGroup fx:id="lookupType" />
               </toggleGroup>
             </RadioButton>
-            <RadioButton fx:id="fileImportRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="false" text="" toggleGroup="$lookupType" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+            <RadioButton fx:id="fileImportRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="true" text="" toggleGroup="$lookupType" GridPane.columnIndex="0" GridPane.rowIndex="1" />
             <Label text="File Import:" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="1" GridPane.valignment="CENTER">
               <children>

diff --git a/target/GeoLookup-1.0.1-bin.zip b/target/GeoLookup-1.0.1-bin.zip
diff --git a/target/classes/fxml/GeoLookup.fxml b/target/classes/fxml/GeoLookup.fxml
@@ -15,12 +15,12 @@
           <children>
             <Label text="Single Address:" GridPane.columnIndex="1" GridPane.rowIndex="0" />
             <TextField fx:id="singleAddressField" disable="false" editable="true" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="0" />
-            <RadioButton fx:id="singleAddressRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="true" text="" GridPane.columnIndex="0" GridPane.rowIndex="0">
+            <RadioButton fx:id="singleAddressRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="false" text="" GridPane.columnIndex="0" GridPane.rowIndex="0">
               <toggleGroup>
                 <ToggleGroup fx:id="lookupType" />
               </toggleGroup>
             </RadioButton>
-            <RadioButton fx:id="fileImportRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="false" text="" toggleGroup="$lookupType" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+            <RadioButton fx:id="fileImportRadioButton" mnemonicParsing="false" onAction="#handleInputTypeChange" selected="true" text="" toggleGroup="$lookupType" GridPane.columnIndex="0" GridPane.rowIndex="1" />
             <Label text="File Import:" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="1" GridPane.valignment="CENTER">
               <children>

diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Sat Jan 14 01:03:35 EST 2017
-version=1.0-SNAPSHOT
+#Sat Jan 14 14:30:48 EST 2017
+version=1.0.1
 groupId=com.jargo
 artifactId=GeoLookup