fixed for real

FultonBrowne · Sep 30, 2019 · 73f88f8 · 73f88f8
1 parent 78ca12d
commit 73f88f8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/bin/jar/Ara-Server.jar b/bin/jar/Ara-Server.jar
diff --git a/src/main/java/com/andromeda/araserver/apiStart.java b/src/main/java/com/andromeda/araserver/apiStart.java
@@ -76,11 +76,11 @@ private String ParseApi(String search) {
 
             assert term != null;
             if (search.startsWith(sqlModel.description)) {
-                linkval = sqlModel.link +"/"+ search.replace(sqlModel.description, "");
+                linkval = sqlModel.link + "/" + search.replace(sqlModel.description, "");
                 break;
             }
             if (term.endsWith(sqlModel.title) && !sqlModel.title.equals("")) {
-                linkval = sqlModel.link  + "/"+ search.replace(sqlModel.title, "");
+                linkval = sqlModel.link + "/" + search.replace(sqlModel.title, "");
 
                 break;
             }

diff --git a/src/main/java/com/andromeda/araserver/getUrl.kt b/src/main/java/com/andromeda/araserver/getUrl.kt
@@ -1,6 +1,6 @@
 package com.andromeda.araserver
 
 object getUrl {
-    fun getUrl1(){}
+    fun getUrl1() {}
 
 }
diff --git a/src/main/java/com/andromeda/araserver/locdec.java b/src/main/java/com/andromeda/araserver/locdec.java
@@ -1,12 +1,13 @@
 package com.andromeda.araserver;
 
 import com.google.gson.*;
-import okhttp3.*;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Objects;
 
 
 public class locdec {
@@ -26,58 +27,56 @@ String main(String search) {
                 lat = pair.replace("lat=", "");
             } else term = pair.replace("/yelpclient/", "");
         }
-        //place holder text for testing
-        ArrayList<OutputModel> mainout = new ArrayList<>();
-        mainout.add(new OutputModel(search, "this is a test", "", "", "", ""));
-        mainout.add(new OutputModel(log, lat, "", "", "", ""));
-        //return new gson value
+        //return new gson value from the yelpsearch() function
         return new Gson().toJson(yelpSearch());
     }
-    ArrayList<OutputModel> yelpSearch(){
+
+    ArrayList<OutputModel> yelpSearch() {
+        //new array list for out put
         ArrayList<OutputModel> returedval = new ArrayList<>();
+        // http client
         OkHttpClient client2 = new OkHttpClient();
-        System.out.println("https://api.yelp.com/v3/businesses/search?term=" + term + "&latitude=" + lat + "&longitude="+ log +"&limit=25&sort_by=rating");
+        //swo url in logs or on console
+        System.out.println("https://api.yelp.com/v3/businesses/search?term=" + term + "&latitude=" + lat + "&longitude=" + log + "&limit=25&sort_by=rating");
+        //new http request
         Request request2 = new Request.Builder()
-                .url("https://api.yelp.com/v3/businesses/search?term=" + term + "&latitude=" + lat + "&longitude="+ log +"&limit=25&sort_by=rating")
+                .url("https://api.yelp.com/v3/businesses/search?term=" + term + "&latitude=" + lat + "&longitude=" + log + "&limit=25&sort_by=rating")
                 .get()
                 .addHeader("Authorization", "Bearer cflXv51tAXEtctkOgrdD3CIUculH7ieskJc6fKTguo4XXYx")
                 .addHeader("cache-control", "no-cache")
 
                 .build();
 
+
         try {
+            //get response
             Response response2 = client2.newCall(request2).execute();
-           // System.out.println(response2.body().string());
+            //parse the json
             JsonElement jelement = new JsonParser().parse(response2.body().string());
-            JsonObject  jobject = jelement.getAsJsonObject();
+            JsonObject jobject = jelement.getAsJsonObject();
             System.out.println(jobject);
-           JsonArray jsonArray = jobject.getAsJsonArray("businesses");
-           System.out.println(jsonArray.size());
-           OutputModel outputModel;
+            JsonArray jsonArray = jobject.getAsJsonArray("businesses");
+            System.out.println(jsonArray.size());
+            OutputModel outputModel;
+            //keep parsing
             for (int i = 0; i < jsonArray.size(); i++) {
                 jobject = jsonArray.get(i).getAsJsonObject();
                 System.out.println(jobject.get("name").getAsString());
                 jobject.get("name").getAsString();
-                outputModel = new OutputModel(jobject.get("name").getAsString(), jobject.get("display_phone").getAsString(),jobject.get("url").getAsString(),"","", "" );
+                //add to list
+                outputModel = new OutputModel(jobject.get("name").getAsString(), jobject.get("display_phone").getAsString(), jobject.get("url").getAsString(), "", "", "");
                 returedval.add(outputModel);
 
             }
 
 
-
-
-           // JSONObject jsonObject = new JSONObject(response2.body().string().trim());       // parser
-            //JSONArray myResponse = (JSONArray)jsonObject.get("businesses");
-           // System.out.println(myResponse.getJSONObject(0).getString("id"));
-
-
         } catch (IOException e) {
 
             e.printStackTrace();
         }
 
 
-
-        return  returedval;
+        // return val
+        return returedval;
     }
 }