Merge pull request #21 from LisaLeib/java-quickstart-sample

updated package paths and a few other related changes

Author: HeidiSteen

quickstart/pom.xml

@@ -30,7 +30,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>app.App</mainClass>
+                    <mainClass>main.java.app.App</mainClass>
                     <cleanupDaemonThreads>false</cleanupDaemonThreads>
                 </configuration>
             </plugin>
@@ -43,5 +43,4 @@
             <version>1.0.2</version>
         </dependency>
     </dependencies>
-
 </project>

quickstart/src/main/java/app/App.java

@@ -1,6 +1,6 @@
-package app;
+package main.java.app;
 
-import service.SearchServiceClient;
+import main.java.service.SearchServiceClient;
 import java.io.IOException;
 import java.util.Properties;
 
@@ -15,7 +15,7 @@ private static Properties loadPropertiesFromResource(String resourcePath) throws
 
     public static void main(String[] args) {
         try {
-            var config = loadPropertiesFromResource("config.properties");
+            var config = loadPropertiesFromResource("/app/config.properties");
             var client = new SearchServiceClient(
                     config.getProperty("SearchServiceName"),
                     config.getProperty("SearchServiceAdminKey"),
@@ -26,18 +26,18 @@ public static void main(String[] args) {
 
 
 //Uncomment the next 3 lines in the 1 - Create Index section of the quickstart
-            if (client.indexExists()) { client.deleteIndex();}
-            client.createIndex("index.json");
+            if(client.indexExists()){ client.deleteIndex();}
+            client.createIndex("/service/index.json");
             Thread.sleep(1000L); // wait a second to create the index
 
 //Uncomment the next 2 lines in the 2 - Load Documents section of the quickstart
-            client.uploadDocuments("hotels.json");
+            client.uploadDocuments("/service/hotels.json");
             Thread.sleep(2000L); // wait 2 seconds for data to upload
 
 //Uncomment the following 5 search queries in the 3 - Search an index section of the quickstart
             // Query 1
             client.logMessage("\n*QUERY 1****************************************************************");
-            client.logMessage("Search for: Atlanta");
+            client.logMessage("Search for: Atlanta'");
             client.logMessage("Return: All fields'");
             client.searchPlus("Atlanta");
 
@@ -84,4 +84,4 @@ public static void main(String[] args) {
             e.printStackTrace();
         }
     }
-}
+}

quickstart/src/main/java/service/SearchServiceClient.java

@@ -1,4 +1,4 @@
-package service;
+package main.java.service;
 
 import javax.json.Json;
 import javax.net.ssl.HttpsURLConnection;
@@ -13,8 +13,7 @@
 import java.util.Formatter;
 import java.util.function.Consumer;
 
-/**
- * This class is responsible for implementing HTTP operations for creating the index, uploading documents and searching the data*/
+/* This class is responsible for implementing HTTP operations for creating the index, uploading documents and searching the data*/
 public class SearchServiceClient {
     private final String _adminKey;
     private final String _queryKey;
@@ -130,14 +129,15 @@ public boolean createIndex(String indexDefinitionFile) throws IOException, Inter
                 "https://%s.search.windows.net/indexes/%s?api-version=%s",
                 _serviceName,_indexName,_apiVersion));
         //Read in index definition file
-        var inputStream = SearchServiceClient.class.getResourceAsStream("index.json");
+        var inputStream = SearchServiceClient.class.getResourceAsStream(indexDefinitionFile);
         var indexDef = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
         //Send HTTP PUT request to create the index in the search service
         var request = httpRequest(uri, _adminKey, "PUT", indexDef);
         var response = sendRequest(request);
         return isSuccessResponse(response);
     }
 
+
     public boolean uploadDocuments(String documentsFile) throws IOException, InterruptedException {
         logMessage("\n Uploading documents...");
         //Build the search service URL
@@ -153,6 +153,7 @@ public boolean uploadDocuments(String documentsFile) throws IOException, Interru
         return isSuccessResponse(response);
     }
 
+
     public SearchOptions createSearchOptions() { return new SearchOptions();}
 
     //Defines available search parameters that can be set
@@ -211,4 +212,6 @@ public void searchPlus(String queryString, SearchOptions options) {
         }
 
     }
+
+
 }