Modified the way maven packages up the JAR so we can get a JAR that i…

…ncludes all of the unpacked dependency .class files. This makes it work with Android Studio. Also optimized us_street/Client.assignCandidatesToLookups()

Makefile

@@ -2,6 +2,9 @@
 
 SOURCE_VERSION := 1.0
 
+clean:
+	mvn clean
+
 build:
 	mvn compile
 

pom.xml

@@ -123,6 +123,22 @@
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptorRefs>
+                       <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/smartystreets/api/us_street/Client.java

@@ -68,13 +68,8 @@ private void populateQueryString(Lookup address, Request request) {
             request.putParameter("candidates", Integer.toString(address.getMaxCandidates()));
     }
 
-     private void assignCandidatesToLookups(Batch batch, Candidate[] candidates) {
-        for (int i = 0; i < batch.size(); i++) {
-            for (Candidate candidate : candidates) {
-                if (candidate.getInputIndex() == i) {
-                    batch.get(i).addToResult(candidate);
-                }
-            }
-        }
+    private void assignCandidatesToLookups(Batch batch, Candidate[] candidates) {
+        for (Candidate candidate : candidates)
+            batch.get(candidate.getInputIndex()).addToResult(candidate);
     }
 }