remove discovery doc output from get-client-lib

tangiel · tangiel · commit abf18e06dbaa · 2017-01-03T11:01:37.000-08:00
Local discovery introduced intermediate discovery doc output in
get-client-lib due to the removal of gen-discovery-doc. This change
reverts to the previous behavior.
diff --git a/endpoints-framework-tools/src/main/java/com/google/api/server/spi/tools/GetClientLibAction.java b/endpoints-framework-tools/src/main/java/com/google/api/server/spi/tools/GetClientLibAction.java
@@ -82,7 +82,7 @@ public Object getClientLib(URL[] classPath, String language, String outputDirPat
       String warPath, List<String> serviceClassNames, String buildSystem, boolean debug)
           throws ClassNotFoundException, IOException, ApiConfigException {
     Map<String, String> discoveryDocs = new GetDiscoveryDocAction().getDiscoveryDoc(
-        classPath, outputDirPath, warPath, serviceClassNames, debug);
+        classPath, outputDirPath, warPath, serviceClassNames, debug, false /* outputToDisk */);
     for (Map.Entry<String, String> entry : discoveryDocs.entrySet()) {
       new GenClientLibAction().genClientLib(language, outputDirPath, entry.getValue(), buildSystem);
     }
diff --git a/endpoints-framework-tools/src/main/java/com/google/api/server/spi/tools/GetDiscoveryDocAction.java b/endpoints-framework-tools/src/main/java/com/google/api/server/spi/tools/GetDiscoveryDocAction.java
@@ -93,6 +93,22 @@ public boolean execute() throws ClassNotFoundException, IOException, ApiConfigEx
   public Map<String, String> getDiscoveryDoc(URL[] classPath, String outputDirPath,
       String warPath, List<String> serviceClassNames, boolean debug)
           throws ClassNotFoundException, IOException, ApiConfigException {
+    return getDiscoveryDoc(classPath, outputDirPath, warPath, serviceClassNames, debug, true);
+  }
+
+  /**
+   * Generates a Java client library for an API.  Combines the steps of generating API
+   * configuration, generating Discovery doc and generating client library into one.
+   * @param classPath Class path to load service classes and their dependencies
+   * @param outputDirPath Directory to write output files into
+   * @param warPath Directory or file containing a WAR layout
+   * @param serviceClassNames Array of service class names of the API
+   * @param debug Whether or not to output intermediate output files
+   * @param outputToDisk Whether or not to output discovery docs to disk
+   */
+  public Map<String, String> getDiscoveryDoc(URL[] classPath, String outputDirPath,
+      String warPath, List<String> serviceClassNames, boolean debug, boolean outputToDisk)
+      throws ClassNotFoundException, IOException, ApiConfigException {
     File outputDir = new File(outputDirPath);
     if (!outputDir.isDirectory()) {
       throw new IllegalArgumentException(outputDirPath + " is not a directory");
@@ -120,9 +136,11 @@ public Map<String, String> getDiscoveryDoc(URL[] classPath, String outputDirPath
       String discoveryDocFilePath =
           outputDir + "/" + key.getName() + "-" + key.getVersion() + "-rest.discovery";
       String docString = writer.writeValueAsString(entry.getValue());
-      Files.write(docString, new File(discoveryDocFilePath), UTF_8);
+      if (outputToDisk) {
+        Files.write(docString, new File(discoveryDocFilePath), UTF_8);
+        System.out.println("API Discovery Document written to " + discoveryDocFilePath);
+      }
       builder.put(discoveryDocFilePath, docString);
-      System.out.println("API Discovery Document written to " + discoveryDocFilePath);
     }
     return builder.build();
   }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public Object getClientLib(URL[] classPath, String language, String outputDirPat`
`82`	`82`	`String warPath, List<String> serviceClassNames, String buildSystem, boolean debug)`
`83`	`83`	`throws ClassNotFoundException, IOException, ApiConfigException {`
`84`	`84`	`Map<String, String> discoveryDocs = new GetDiscoveryDocAction().getDiscoveryDoc(`
`85`		`- classPath, outputDirPath, warPath, serviceClassNames, debug);`
	`85`	`+ classPath, outputDirPath, warPath, serviceClassNames, debug, false /* outputToDisk */);`
`86`	`86`	`for (Map.Entry<String, String> entry : discoveryDocs.entrySet()) {`
`87`	`87`	`new GenClientLibAction().genClientLib(language, outputDirPath, entry.getValue(), buildSystem);`
`88`	`88`	`}`