Removing compile dependency on org.json (googleapis#2728)

garrettjonesgoogle · web-flow · commit f2f910fd55d0 · 2017-12-21T11:51:22.000-08:00
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
@@ -32,11 +32,6 @@
       <artifactId>joda-time</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -27,6 +27,11 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.GenericJson;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.JsonObjectParser;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.util.Charsets;
 import com.google.api.core.ApiClock;
 import com.google.api.core.BetaApi;
 import com.google.api.core.CurrentMillisClock;
@@ -59,9 +64,6 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
 import org.threeten.bp.Duration;
 
 /**
@@ -454,13 +456,20 @@ private static String getAppEngineProjectIdFromMetadataServer() throws IOExcepti
   }
 
   protected static String getServiceAccountProjectId() {
+    return getServiceAccountProjectId(System.getenv(CREDENTIAL_ENV_NAME));
+  }
+
+  @InternalApi("Visible for testing")
+  static String getServiceAccountProjectId(String credentialsPath) {
     String project = null;
-    String credentialsPath = System.getenv(CREDENTIAL_ENV_NAME);
     if (credentialsPath != null) {
       try (InputStream credentialsStream = new FileInputStream(credentialsPath)) {
-        JSONObject json = new JSONObject(new JSONTokener(credentialsStream));
-        project = json.getString("project_id");
-      } catch (IOException | JSONException ex) {
+        JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+        JsonObjectParser parser = new JsonObjectParser(jsonFactory);
+        GenericJson fileContents = parser.parseAndClose(
+            credentialsStream, Charsets.UTF_8, GenericJson.class);
+        project = (String) fileContents.get("project_id");
+      } catch (IOException e) {
         // ignore
       }
     }
diff --git a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
@@ -19,6 +19,7 @@
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -28,10 +29,14 @@
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.spi.ServiceRpcFactory;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.Set;
 import java.util.regex.Pattern;
+
+import com.google.common.io.Files;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -283,4 +288,29 @@ public void testBaseHashCode() {
     assertEquals(OPTIONS.hashCode(), OPTIONS_COPY.hashCode());
     assertNotEquals(DEFAULT_OPTIONS.hashCode(), OPTIONS.hashCode());
   }
+
+  @Test
+  public void testGetServiceAccountProjectId() throws Exception {
+    File credentialsFile = File.createTempFile("credentials", ".json");
+    credentialsFile.deleteOnExit();
+    Files.write("{\"project_id\":\"my-project-id\"}".getBytes(), credentialsFile);
+
+    assertEquals("my-project-id", ServiceOptions.getServiceAccountProjectId(credentialsFile.getPath()));
+  }
+
+  @Test
+  public void testGetServiceAccountProjectId_badJson() throws Exception {
+    File credentialsFile = File.createTempFile("credentials", ".json");
+    credentialsFile.deleteOnExit();
+    Files.write("asdfghj".getBytes(), credentialsFile);
+
+    assertNull(ServiceOptions.getServiceAccountProjectId(credentialsFile.getPath()));
+  }
+
+  @Test
+  public void testGetServiceAccountProjectId_nonExistentFile() throws Exception {
+    File credentialsFile = new File("/doesnotexist");
+
+    assertNull(ServiceOptions.getServiceAccountProjectId(credentialsFile.getPath()));
+  }
 }
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
@@ -167,5 +167,10 @@
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-contrib-grpc-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
