Checkstyle fixes.

iot/api/README.md → iot/api-client/README.md

@@ -1,5 +1,5 @@
-# Cloud IoT Core NodeJS Samples
-This folder contains NodeJS samples that demonstrate an overview of the
+# Cloud IoT Core Java Samples
+This folder contains Java samples that demonstrate an overview of the
 Google Cloud IoT Core platform.
 
 ## Quickstart

iot/api/manager/pom.xml → iot/api-client/manager/pom.xml

@@ -23,6 +23,14 @@
   <name>cloudiot-manager-demo</name>
   <url>http://maven.apache.org</url>
 
+  <!-- Parent defines config for testing & linting. -->
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+
   <!-- Start local repo -->
   <repositories>
     <!-- Use a local directory for the Cloud IoT Core API dependency. -->

iot/api/manager/src/main/java/com/google/cloud/iot/examples/DeviceRegistryExample.java → iot/api-client/manager/src/main/java/com/google/cloud/iot/examples/DeviceRegistryExample.java

@@ -30,6 +30,7 @@
 import com.google.api.services.cloudiot.v1beta1.model.NotificationConfig;
 import com.google.api.services.cloudiot.v1beta1.model.PublicKeyCredential;
 import com.google.common.io.Files;
+
 import java.io.File;
 import java.io.IOException;
 import java.security.GeneralSecurityException;

iot/api/manager/src/main/java/com/google/cloud/iot/examples/DeviceRegistryExampleOptions.java → iot/api-client/manager/src/main/java/com/google/cloud/iot/examples/DeviceRegistryExampleOptions.java

@@ -20,7 +20,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-/** Command line options for the Device Manager example */
+/** Command line options for the Device Manager example. */
 public class DeviceRegistryExampleOptions {
   String projectId;
   String pubsubTopic;
@@ -29,7 +29,7 @@ public class DeviceRegistryExampleOptions {
   String cloudRegion = "us-central1";
 
   /** Construct an DeviceRegistryExampleOptions class from command line flags. */
-  public static DeviceRegistryExampleOptions fromFlags(String args[]) {
+  public static DeviceRegistryExampleOptions fromFlags(String[] args) {
     Options options = new Options();
     // Required arguments
     options.addOption(

iot/api/manager/src/main/java/com/google/cloud/iot/examples/RetryHttpInitializerWrapper.java → iot/api-client/manager/src/main/java/com/google/cloud/iot/examples/RetryHttpInitializerWrapper.java

@@ -23,6 +23,7 @@
 import com.google.api.client.util.ExponentialBackOff;
 import com.google.api.client.util.Sleeper;
 import com.google.common.base.Preconditions;
+
 import java.io.IOException;
 import java.util.logging.Logger;
 

iot/api/mqtt_example/pom.xml → iot/api-client/mqtt_example/pom.xml

@@ -7,16 +7,27 @@
   <version>1.0</version>
   <name>cloudiot-mqtt-example</name>
   <url>http://maven.apache.org</url>
+
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
+
+  <!-- Parent defines config for testing & linting. -->
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+
   <repositories>
     <repository>
       <id>Eclipse Paho Repo</id>
       <url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
     </repository>
   </repositories>
+
   <dependencies>
     <dependency>
       <groupId>org.eclipse.paho</groupId>
@@ -39,4 +50,5 @@
       <version>1.3</version>
     </dependency>
   </dependencies>
+
 </project>

iot/api/mqtt_example/src/main/java/com/google/cloud/iot/examples/MqttExample.java → iot/api-client/mqtt_example/src/main/java/com/google/cloud/iot/examples/MqttExample.java

@@ -3,17 +3,18 @@
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.spec.PKCS8EncodedKeySpec;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.joda.time.DateTime;
 
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+
 /**
  * Java sample of connecting to Google Cloud IoT Core vice via MQTT, using JWT.
  *
@@ -46,7 +47,7 @@ private static PrivateKey loadKeyFile(String filename, String algorithm) throws
     return kf.generatePrivate(spec);
   }
 
-  /** Create a Cloud IoT Core JWT for the given project id, signed with the given private key */
+  /** Create a Cloud IoT Core JWT for the given project id, signed with the given private key. */
   private static String createJwt(String projectId, String privateKeyFile, String algorithm)
       throws Exception {
     DateTime now = new DateTime();
@@ -97,9 +98,9 @@ public static void main(String[] args) throws Exception {
     // connection to your device.
     connectOptions.setMqttVersion(MqttConnectOptions.MQTT_VERSION_3_1_1);
 
-    // With Google Cloud IoT Core, the username field is ignored, however it must be set for the Paho
-    // client library to send the password field. The password field is used to transmit a JWT to
-    // authorize the device.
+    // With Google Cloud IoT Core, the username field is ignored, however it must be set for the
+    // Paho client library to send the password field. The password field is used to transmit a JWT
+    // to authorize the device.
     connectOptions.setUserName("unused");
     connectOptions.setPassword(
         createJwt(options.projectId, options.privateKeyFile, options.algorithm).toCharArray());

iot/api/mqtt_example/src/main/java/com/google/cloud/iot/examples/MqttExampleOptions.java → iot/api-client/mqtt_example/src/main/java/com/google/cloud/iot/examples/MqttExampleOptions.java

@@ -7,7 +7,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-/** Command line options for the MQTT example */
+/** Command line options for the MQTT example. */
 public class MqttExampleOptions {
   String projectId;
   String registryId;
@@ -20,7 +20,7 @@ public class MqttExampleOptions {
   short mqttBridgePort = 8883;
 
   /** Construct an MqttExampleOptions class from command line flags. */
-  public static MqttExampleOptions fromFlags(String args[]) {
+  public static MqttExampleOptions fromFlags(String[] args) {
     Options options = new Options();
     // Required arguments
     options.addOption(

iot/api/scripts/iam.py → iot/api-client/scripts/iam.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2017 Google Inc. All Rights Reserved.
+# 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.