Merge branch 'iot-http-device-tests' of https://github.com/googleclou…

…dplatform/java-docs-samples into iot-http-device-tests

endpoints/getting-started/deployment.yaml

@@ -42,10 +42,10 @@ spec:
       - name: esp
         image: gcr.io/endpoints-release/endpoints-runtime:1
         args: [
-          "-p", "8081",
-          "-a", "127.0.0.1:8080",
-          "-s", "SERVICE_NAME",
-          "-v", "SERVICE_CONFIG_ID",
+          "--http_port", "8081",
+          "--backend", "127.0.0.1:8080",
+          "--service", "SERVICE_NAME",
+          "--version", "SERVICE_CONFIG_ID",
         ]
       # [END esp]
         ports:

pom.xml

@@ -91,6 +91,7 @@
 
         <module>unittests</module>
         <module>video/cloud-client</module>
+        <module>vision/beta/cloud-client</module>
         <module>vision/cloud-client</module>
         <module>vision/face-detection</module>
         <module>vision/label</module>

vision/beta/cloud-client/README.md

@@ -0,0 +1,87 @@
+# Image Feature Detection Sample
+
+[Google Cloud Vision API][vision] provides feature detection for images.
+This API is part of the larger collection of Cloud Machine Learning APIs.
+
+This sample Java application demonstrates how to access the Cloud Vision API
+using the [Google Cloud Client Library for Java][google-cloud-java].
+
+[vision]: https://cloud.google.com/vision/docs/
+[google-cloud-java]: https://github.com/GoogleCloudPlatform/google-cloud-java
+
+## Build the sample
+
+Install [Maven](http://maven.apache.org/).
+
+Build your project with:
+
+```
+mvn clean package
+```
+
+You can then run `Detect` via:
+
+```
+mvn exec:java -DDetect -Dexec.args="arg1 'arg 2' arg3"
+```
+
+### Analyze an image
+
+```
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/your-project-credentials.json
+```
+
+#### Faces
+```
+mvn exec:java -DDetect -Dexec.args="faces ./resources/face_no_surprise.jpg"
+```
+
+#### Labels
+```
+mvn exec:java -DDetect -Dexec.args="labels ./resources/wakeupcat.jpg"
+```
+
+#### Landmarks
+```
+mvn exec:java -DDetect -Dexec.args="landmarks ./resources/landmark.jpg"
+```
+
+#### Logos
+```
+mvn exec:java -DDetect -Dexec.args="logos ./resources/logos.png"
+```
+
+#### Text
+```
+mvn exec:java -DDetect -Dexec.args="text ./resources/text.jpg"
+```
+
+#### Safe Search
+```
+mvn exec:java -DDetect -Dexec.args="safe-search ./resources/wakeupcat.jpg"
+```
+
+#### Properties
+```
+mvn exec:java -DDetect -Dexec.args="properties ./resources/city.jpg"
+```
+
+#### Web
+```
+mvn exec:java -DDetect -Dexec.args="web ./resources/landmark.jpg"
+```
+
+#### Web Entities
+```
+mvn exec:java -DDetect -Dexec.args="web-entities ./resources/landmark.jpg"
+```
+
+#### Web Entities Include Geo
+```
+mvn exec:java -DDetect -Dexec.args="web-entities-include-geo ./resources/landmark.jpg"
+```
+
+#### Crop
+```
+mvn exec:java -DDetect -Dexec.args="crop ./resources/landmark.jpg"
+```

vision/beta/cloud-client/pom.xml

@@ -0,0 +1,91 @@
+<!--
+  Copyright 2017 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example.vision</groupId>
+  <artifactId>vision-detect-beta</artifactId>
+  <packaging>jar</packaging>
+
+  <!-- Parent defines config for testing & linting. -->
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../../..</relativePath>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <!-- [START dependencies] -->
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-vision</artifactId>
+      <version>1.14.0</version>
+    </dependency>
+    <!-- [END dependencies] -->
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.36</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>Detect</id>
+      <activation>
+        <property>
+          <name>Detect</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <mainClass>com.example.vision.Detect</mainClass>
+              <cleanupDaemonThreads>false</cleanupDaemonThreads>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>