Make Checkstyle Happy Again.

Author: kurtisvg

dlp/src/main/java/com/example/dlp/DeIdentification.java

@@ -280,7 +280,7 @@ private static void deidentifyWithDateShift(
       // (Optional) The name of the Cloud KMS key used to encrypt ('wrap') the AES-256 key
       // If this is specified, then 'wrappedKey' and 'contextFieldId' must also be set
       // String keyName =
-      // 'projects/YOUR_GCLOUD_PROJECT/locations/YOUR_LOCATION/keyRings/YOUR_KEYRING_NAME/cryptoKeys/YOUR_KEY_NAME';
+      // 'projects/PROJECT/locations/LOCATION/keyRings/YOUR_KEYRING_NAME/cryptoKeys/YOUR_KEY_NAME';
 
       // (Optional) The encrypted ('wrapped') AES-256 key to use when shifting dates
       // This key should be encrypted using the Cloud KMS key specified above
@@ -303,8 +303,6 @@ private static void deidentifyWithDateShift(
             "You must set either ALL or NONE of {contextFieldId, keyName, wrappedKey}!");
       }
 
-      DateShiftConfig dateShiftConfig = dateShiftConfigBuilder.build();
-
       // Read and parse the CSV file
       // The first row of the file must specify column names, and all other rows
       // Path inputCsvFile = Paths.get("/path/to/file.csv");
@@ -334,6 +332,8 @@ private static void deidentifyWithDateShift(
               .map(field -> FieldId.newBuilder().setName(field).build())
               .collect(Collectors.toList());
 
+      DateShiftConfig dateShiftConfig = dateShiftConfigBuilder.build();
+
       FieldTransformation fieldTransformation =
           FieldTransformation.newBuilder()
               .addAllFields(dateFieldIds)

dlp/src/main/java/com/example/dlp/Inspect.java

@@ -20,8 +20,6 @@
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dlp.v2.DlpServiceClient;
 import com.google.cloud.pubsub.v1.Subscriber;
-import com.google.privacy.dlp.v2.ProjectName;
-import com.google.pubsub.v1.ProjectSubscriptionName;
 import com.google.privacy.dlp.v2.Action;
 import com.google.privacy.dlp.v2.BigQueryOptions;
 import com.google.privacy.dlp.v2.BigQueryTable;
@@ -44,10 +42,11 @@
 import com.google.privacy.dlp.v2.KindExpression;
 import com.google.privacy.dlp.v2.Likelihood;
 import com.google.privacy.dlp.v2.PartitionId;
+import com.google.privacy.dlp.v2.ProjectName;
 import com.google.privacy.dlp.v2.StorageConfig;
 import com.google.protobuf.ByteString;
+import com.google.pubsub.v1.ProjectSubscriptionName;
 import com.google.pubsub.v1.ProjectTopicName;
-import com.google.pubsub.v1.TopicName;
 import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -157,19 +156,14 @@ private static void inspectFile(
 
       ByteContentItem.BytesType bytesType = ByteContentItem.BytesType.TEXT_UTF8;
 
-      switch (mimeType) {
-        case "image/jpeg":
-          bytesType = ByteContentItem.BytesType.IMAGE_JPEG;
-          break;
-        case "image/bmp":
-          bytesType = ByteContentItem.BytesType.IMAGE_BMP;
-          break;
-        case "image/png":
-          bytesType = ByteContentItem.BytesType.IMAGE_PNG;
-          break;
-        case "image/svg":
-          bytesType = ByteContentItem.BytesType.IMAGE_SVG;
-          break;
+      if (mimeType.equals("image/jpeg")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_JPEG;
+      } else if (mimeType.equals("image/bmp")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_BMP;
+      } else if (mimeType.equals("image/png")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_PNG;
+      } else if (mimeType.equals("image/svg")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_SVG;
       }
 
       byte[] data = Files.readAllBytes(Paths.get(filePath));
@@ -325,18 +319,18 @@ private static void waitOnJobCompletion(
     // setup a Pub/Sub subscriber to listen on the job completion status
     Subscriber subscriber =
         Subscriber.newBuilder(
-                ProjectSubscriptionName.newBuilder()
-                    .setProject(projectId)
-                    .setSubscription(subscriptionId)
-                    .build(),
-                (pubsubMessage, ackReplyConsumer) -> {
-                  ackReplyConsumer.ack();
-                  if (pubsubMessage.getAttributesCount() > 0
-                      && pubsubMessage.getAttributesMap().get("DlpJobName").equals(dlpJobName)) {
-                    // notify job completion
-                    done.set(true);
-                  }
-                })
+            ProjectSubscriptionName.newBuilder()
+                .setProject(projectId)
+                .setSubscription(subscriptionId)
+                .build(),
+            (pubsubMessage, ackReplyConsumer) -> {
+              ackReplyConsumer.ack();
+              if (pubsubMessage.getAttributesCount() > 0
+                  && pubsubMessage.getAttributesMap().get("DlpJobName").equals(dlpJobName)) {
+                // notify job completion
+                done.set(true);
+              }
+            })
             .build();
 
     // wait for job completion
@@ -356,8 +350,7 @@ private static void waitOnJobCompletion(
    * @param maxFindings max number of findings
    * @param topicId Google Cloud Pub/Sub topic to notify job status updates
    * @param subscriptionId Google Cloud Pub/Sub subscription to above topic to receive status
-   *     updates
-   * @throws Exception
+   *        updates
    */
   private static void inspectDatastore(
       String projectId,
@@ -367,8 +360,7 @@ private static void inspectDatastore(
       List<InfoType> infoTypes,
       int maxFindings,
       String topicId,
-      String subscriptionId)
-      throws Exception {
+      String subscriptionId) {
     // Instantiates a client
     try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
 
@@ -437,6 +429,8 @@ private static void inspectDatastore(
       } else {
         System.out.println("No findings.");
       }
+    } catch (Exception e) {
+      System.out.println("inspectDatastore Problems: " + e.getMessage());
     }
   }
   // [END dlp_inspect_datastore]
@@ -449,10 +443,9 @@ private static void inspectDatastore(
    * @param tableId The ID of the table to inspect, e.g. 'my_table'
    * @param minLikelihood The minimum likelihood required before returning a match
    * @param infoTypes The infoTypes of information to match
-   * @param maxFindings
-   * @param topicId
-   * @param subscriptionId
-   * @throws Exception
+   * @param maxFindings The maximum number of findings to report (0 = server maximum)
+   * @param topicId Topic ID for pubsub.
+   * @param subscriptionId Subscription ID for pubsub.
    */
   private static void inspectBigquery(
       String projectId,
@@ -462,8 +455,7 @@ private static void inspectBigquery(
       List<InfoType> infoTypes,
       int maxFindings,
       String topicId,
-      String subscriptionId)
-      throws Exception {
+      String subscriptionId) {
     // Instantiates a client
     try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
       // Reference to the BigQuery table
@@ -535,6 +527,8 @@ private static void inspectBigquery(
       } else {
         System.out.println("No findings.");
       }
+    } catch (Exception e) {
+      System.out.println("inspectBigquery Problems: " + e.getMessage());
     }
   }
   // [END dlp_inspect_bigquery]

dlp/src/main/java/com/example/dlp/Jobs.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.example.dlp;
 
 import com.google.cloud.ServiceOptions;

dlp/src/main/java/com/example/dlp/Redact.java

@@ -62,20 +62,16 @@ private static void redactImage(
       }
       ByteContentItem.BytesType bytesType = ByteContentItem.BytesType.BYTES_TYPE_UNSPECIFIED;
 
-      switch (mimeType) {
-        case "image/jpeg":
-          bytesType = ByteContentItem.BytesType.IMAGE_JPEG;
-          break;
-        case "image/bmp":
-          bytesType = ByteContentItem.BytesType.IMAGE_BMP;
-          break;
-        case "image/png":
-          bytesType = ByteContentItem.BytesType.IMAGE_PNG;
-          break;
-        case "image/svg":
-          bytesType = ByteContentItem.BytesType.IMAGE_SVG;
-          break;
+      if (mimeType.equals("image/jpeg")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_JPEG;
+      } else if (mimeType.equals("image/bmp")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_BMP;
+      } else if (mimeType.equals("image/png")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_PNG;
+      } else if (mimeType.equals("image/svg")) {
+        bytesType = ByteContentItem.BytesType.IMAGE_SVG;
       }
+      
       byte[] data = Files.readAllBytes(Paths.get(filePath));
 
       // The minimum likelihood required before redacting a match

dlp/src/main/java/com/example/dlp/RiskAnalysis.java

@@ -352,9 +352,9 @@ private static void calculateKAnonymity(
       System.out.println("Job status: " + completedJob.getState());
       AnalyzeDataSourceRiskDetails riskDetails = completedJob.getRiskDetails();
 
-      KAnonymityResult kAnonymityResult = riskDetails.getKAnonymityResult();
+      KAnonymityResult kanonymityResult = riskDetails.getKAnonymityResult();
       for (KAnonymityHistogramBucket result :
-          kAnonymityResult.getEquivalenceClassHistogramBucketsList()) {
+          kanonymityResult.getEquivalenceClassHistogramBucketsList()) {
         System.out.println(
             "Bucket size range: ["
                 + result.getEquivalenceClassSizeLowerBound()
@@ -461,9 +461,9 @@ private static void calculateLDiversity(
       System.out.println("Job status: " + completedJob.getState());
       AnalyzeDataSourceRiskDetails riskDetails = completedJob.getRiskDetails();
 
-      LDiversityResult lDiversityResult = riskDetails.getLDiversityResult();
+      LDiversityResult ldiversityResult = riskDetails.getLDiversityResult();
       for (LDiversityHistogramBucket result :
-          lDiversityResult.getSensitiveValueFrequencyHistogramBucketsList()) {
+          ldiversityResult.getSensitiveValueFrequencyHistogramBucketsList()) {
         for (LDiversityEquivalenceClass bucket : result.getBucketValuesList()) {
           List<String> quasiIdValues =
               bucket

dlp/src/main/java/com/example/dlp/Templates.java

@@ -1,15 +1,19 @@
-/**
- * Copyright 2018, 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
+/*
+ * Copyright 2018 Google Inc.
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * <p>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
+ * 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.
  */
+
 package com.example.dlp;
 
 import com.google.cloud.ServiceOptions;
@@ -162,9 +166,6 @@ private static void deleteInspectTemplate(String projectId, String templateId) {
   /** Command line application to create, list and delete DLP inspect templates. */
   public static void main(String[] args) throws Exception {
 
-    Options commandLineOptions = new Options();
-
-    Option projectIdOption = Option.builder("projectId").hasArg(true).required(false).build();
 
     OptionGroup optionsGroup = new OptionGroup();
     optionsGroup.setRequired(true);
@@ -178,11 +179,14 @@ public static void main(String[] args) throws Exception {
     Option deleteOption = new Option("d", "delete", false, "Delete inspect template");
     optionsGroup.addOption(deleteOption);
 
+    Options commandLineOptions = new Options();
     commandLineOptions.addOptionGroup(optionsGroup);
 
+    Option projectIdOption = Option.builder("projectId").hasArg(true).required(false).build();
+    commandLineOptions.addOption(projectIdOption);
+
     Option minLikelihoodOption =
         Option.builder("minLikelihood").hasArg(true).required(false).build();
-
     commandLineOptions.addOption(minLikelihoodOption);
 
     Option infoTypesOption = Option.builder("infoTypes").hasArg(true).required(false).build();

dlp/src/test/java/com/example/dlp/DeIdentificationIT.java

@@ -89,7 +89,7 @@ public void testDeidentifyWithDateShift() throws Exception {
             "-d",
             "-inputCsvPath", "src/test/resources/dates.csv",
             "-outputCsvPath", "src/test/resources/results.temp.csv",
-           "-dateFields", "birth_date,register_date",
+            "-dateFields", "birth_date,register_date",
             "-lowerBoundDays", "5",
             "-upperBoundDays", "5",
             "-contextField", "name",

dlp/src/test/java/com/example/dlp/InspectIT.java

@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.PrintStream;
 import org.junit.After;
 import org.junit.Before;
@@ -32,8 +31,8 @@
 @RunWith(JUnit4.class)
 // CHECKSTYLE OFF: AbbreviationAsWordInName
 public class InspectIT {
-
   // CHECKSTYLE ON: AbbreviationAsWordInName
+
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
@@ -50,7 +49,8 @@ public class InspectIT {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
-    System.setOut(out); // TODO(b/64541432) DLP currently doesn't support GOOGLE DEFAULT AUTH
+    System.setOut(out);
+    // TODO(b/64541432) DLP currently doesn't support GOOGLE DEFAULT AUTH
     assertNotNull(System.getenv("GOOGLE_APPLICATION_CREDENTIALS"));
   }