Reformatt code using google java style formatter (#861)

Add the formatter and updated README

Author: tonyxiaowei

dbsync/README.md

@@ -8,6 +8,12 @@ Compiling the code from source requires `Java 8`, running the tools requires
 `Java 8` or higher. To check Java version run the command`java -version` or
 refer to Java vendor documentation.
 
+## Contributing
+
+Before submitting any code changes, please run the formatter
+
+    java -jar dbsync/google-java-format-1.7-all-deps.jar -i $(git ls-files|grep \.java$)
+
 ## Gcysnc
 
 This tool is in preview mode, it's being actively developed.

dbsync/client/src/main/java/com/google/edwmigration/dbsync/client/GcsClientMain.java

@@ -2,40 +2,45 @@
 
 import com.google.edwmigration.dbsync.common.DefaultArguments;
 import java.net.URI;
-import java.util.logging.Logger;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 import joptsimple.OptionSpec;
 
 public class GcsClientMain {
 
   private static class Arguments extends DefaultArguments {
 
     private final OptionSpec<String> projectOptionSpec =
-        parser.accepts("project", "Specifies the destination project")
+        parser
+            .accepts("project", "Specifies the destination project")
             .withRequiredArg()
             .ofType(String.class)
             .required();
 
     private final OptionSpec<String> locationOptionSpec =
-        parser.accepts("location", "Specifies the gcp location")
+        parser
+            .accepts("location", "Specifies the gcp location")
             .withRequiredArg()
             .ofType(String.class)
             .required();
 
     private final OptionSpec<String> targetOptionSpec =
-        parser.accepts("target_file", "Specifies the target file")
+        parser
+            .accepts("target_file", "Specifies the target file")
             .withRequiredArg()
             .ofType(String.class)
             .required();
 
     private final OptionSpec<String> sourceOptionSpec =
-        parser.accepts("source_file", "Specifies the source file")
+        parser
+            .accepts("source_file", "Specifies the source file")
             .withRequiredArg()
             .ofType(String.class)
             .required();
 
     private final OptionSpec<String> stagingBucketOptionSpec =
-        parser.accepts("staging_bucket", "Specifies the staging bucket")
+        parser
+            .accepts("staging_bucket", "Specifies the staging bucket")
             .withRequiredArg()
             .ofType(String.class)
             .required();
@@ -74,8 +79,7 @@ public static void main(String[] args) {
           arguments.getLocation(),
           new URI(arguments.getSourceUri()),
           new URI(arguments.getStagingBucket() + "/"),
-          new URI(arguments.getTargetUri())
-      );
+          new URI(arguments.getTargetUri()));
     } catch (Exception e) {
       Logger.getLogger("rsync").log(Level.INFO, e.getMessage(), e);
     }

dbsync/client/src/main/java/com/google/edwmigration/dbsync/client/RsyncClient.java

@@ -1,14 +1,13 @@
 package com.google.edwmigration.dbsync.client;
 
-
-import com.google.edwmigration.dbsync.server.CloudRunServerAPI;
+import com.google.common.io.ByteSink;
+import com.google.common.io.ByteSource;
 import com.google.edwmigration.dbsync.common.InstructionGenerator;
 import com.google.edwmigration.dbsync.common.storage.LocalStorage;
 import com.google.edwmigration.dbsync.proto.Checksum;
+import com.google.edwmigration.dbsync.server.CloudRunServerAPI;
 import com.google.edwmigration.dbsync.server.GCSTarget;
 import com.google.edwmigration.dbsync.server.RsyncTarget;
-import com.google.common.io.ByteSink;
-import com.google.common.io.ByteSource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -27,7 +26,8 @@ public class RsyncClient {
   // GcsClientMain calls this.
   // Validation calls this.
   // TODO support multiple files ?
-  public void putRsync(String projectId, String location, URI sourceUri, URI stagingBucket, URI targetUri)
+  public void putRsync(
+      String projectId, String location, URI sourceUri, URI stagingBucket, URI targetUri)
       throws IOException, ExecutionException, InterruptedException {
     ByteSource byteSource;
     switch (sourceUri.getScheme()) {
@@ -47,7 +47,7 @@ public void putRsync(String projectId, String location, URI sourceUri, URI stagi
     if (byteSource.size() < MIN_SIZE_TO_RSYNC) {
       throw new IllegalStateException("dont handle small files");
     } else {
-      //TODO move this out of the put rsync and into a initialization function to be called once
+      // TODO move this out of the put rsync and into a initialization function to be called once
       server.deployRsyncJobs();
       putRsync(byteSource, server, new GCSTarget(projectId, targetUri, stagingBucket));
     }
@@ -73,18 +73,21 @@ private void putRsync(ByteSource source, CloudRunServerAPI server, RsyncTarget t
     InstructionGenerator generator = new InstructionGenerator(CHECKSUM_BLOCK_SIZE);
     ByteSink instructionSink = target.getInstructionsByteSink();
     try (OutputStream instructionStream = instructionSink.openBufferedStream()) {
-      generator.generate(instruction -> {
-        try {
-          instruction.writeDelimitedTo(instructionStream);
-        } catch (IOException e) {
-          throw new RuntimeException("Failed to write instructions", e);
-        }
-      }, source, targetChecksums);
+      generator.generate(
+          instruction -> {
+            try {
+              instruction.writeDelimitedTo(instructionStream);
+            } catch (IOException e) {
+              throw new RuntimeException("Failed to write instructions", e);
+            }
+          },
+          source,
+          targetChecksums);
     }
 
     // Reconstruct on GCS
     server.reconstruct();
 
-    //TODO delete the jobs from cloudrun
+    // TODO delete the jobs from cloudrun
   }
 }

dbsync/common/src/jmh/java/com/google/edwmigration/dbsync/jmh/RollingChecksumBenchmark.java

@@ -16,9 +16,9 @@
 import org.openjdk.jmh.infra.Blackhole;
 
 @State(Scope.Benchmark)
-@Fork(value=2)
-@Warmup(iterations=2, time=RollingChecksumBenchmark.MS, timeUnit = TimeUnit.MILLISECONDS )
-@Measurement(iterations=4, time=RollingChecksumBenchmark.MS, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 2)
+@Warmup(iterations = 2, time = RollingChecksumBenchmark.MS, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 4, time = RollingChecksumBenchmark.MS, timeUnit = TimeUnit.MILLISECONDS)
 public class RollingChecksumBenchmark {
   public static final int MS = 1000;
   private static final int N = 1024;
@@ -35,14 +35,13 @@ public void setUp() throws Exception {
   }
 
   @Benchmark
-  public void testResetBytes(Blackhole bh) throws Exception{
-    for (int i = 0; i < N; i++)
-      impl.reset(bytes, 0);
+  public void testResetBytes(Blackhole bh) throws Exception {
+    for (int i = 0; i < N; i++) impl.reset(bytes, 0);
     bh.consume(impl);
   }
 
   @Benchmark
-  public void testResetStream(Blackhole bh) throws Exception{
+  public void testResetStream(Blackhole bh) throws Exception {
     for (int i = 0; i < N; i++) {
       stream.reset();
       impl.reset(stream);

dbsync/common/src/main/java/com/google/edwmigration/dbsync/common/AlgorithmConstants.java

@@ -2,5 +2,4 @@
 
 public interface AlgorithmConstants {
   public static final int MAX_LITERAL_LENGTH = 4096;
-
 }

dbsync/common/src/main/java/com/google/edwmigration/dbsync/common/ChecksumGenerator.java

@@ -1,10 +1,10 @@
 package com.google.edwmigration.dbsync.common;
 
-import com.google.edwmigration.dbsync.proto.Checksum;
 import com.google.common.base.Optional;
 import com.google.common.hash.HashCode;
 import com.google.common.io.ByteSource;
 import com.google.common.primitives.Ints;
+import com.google.edwmigration.dbsync.proto.Checksum;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,6 +16,7 @@ public class ChecksumGenerator {
 
   @SuppressWarnings("unused")
   private static final Logger logger = LoggerFactory.getLogger(ChecksumGenerator.class);
+
   private static final boolean DEBUG = false;
 
   private final @NonNegative int blockSize;
@@ -48,31 +49,40 @@ public void generate(ChecksumConsumer<IOException> out, ByteSource in) throws IO
         // Yes, this masks the instance variable.
         int blockSize = rollingChecksum.getBlockSize();
         if (DEBUG) {
-          logger.info("Generating checksums for [{} .. +{}] in {} bytes", offset, blockSize,
-              dataSize);
+          logger.info(
+              "Generating checksums for [{} .. +{}] in {} bytes", offset, blockSize, dataSize);
         }
 
-        // If someone changes the size of the ByteSource underneath us, this might throw EOFException.
+        // If someone changes the size of the ByteSource underneath us, this might throw
+        // EOFException.
         rollingChecksum.reset(i);
         int weakHashCode = rollingChecksum.getWeakHashCode();
         HashCode strongHashCode = rollingChecksum.getStrongHashCode();
 
         if (DEBUG) {
-          HashCode _strongHashCode = RollingChecksumImpl.STRONG_HASH_FUNCTION.hashBytes(dataArray,
-              Ints.checkedCast(offset), blockSize);
+          HashCode _strongHashCode =
+              RollingChecksumImpl.STRONG_HASH_FUNCTION.hashBytes(
+                  dataArray, Ints.checkedCast(offset), blockSize);
           if (!strongHashCode.equals(_strongHashCode)) {
             throw new IllegalStateException(
-                "Bad hash code at " + offset + "..+" + blockSize + ": " + strongHashCode + " != "
+                "Bad hash code at "
+                    + offset
+                    + "..+"
+                    + blockSize
+                    + ": "
+                    + strongHashCode
+                    + " != "
                     + _strongHashCode);
           }
         }
 
-        Checksum c = Checksum.newBuilder()
-            .setBlockOffset(offset)
-            .setBlockLength(blockSize)
-            .setWeakChecksum(weakHashCode)
-            .setStrongChecksum(ByteString.copyFrom(strongHashCode.asBytes()))
-            .build();
+        Checksum c =
+            Checksum.newBuilder()
+                .setBlockOffset(offset)
+                .setBlockLength(blockSize)
+                .setWeakChecksum(weakHashCode)
+                .setStrongChecksum(ByteString.copyFrom(strongHashCode.asBytes()))
+                .build();
         out.accept(c);
       }
     }

dbsync/common/src/main/java/com/google/edwmigration/dbsync/common/DefaultArguments.java

@@ -16,7 +16,6 @@
  */
 package com.google.edwmigration.dbsync.common;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;
 import java.io.IOException;
@@ -26,8 +25,6 @@
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
-import joptsimple.ValueConversionException;
-import joptsimple.ValueConverter;
 import org.anarres.jdiagnostics.ProductMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

dbsync/common/src/main/java/com/google/edwmigration/dbsync/common/DefaultHashStrategies.java

@@ -11,9 +11,7 @@ public class DefaultHashStrategies {
   public static final Int64 INSTANCE64 = new Int64();
   public static final ByteArray BYTE_ARRAY = new ByteArray();
 
-  /**
-   * Based on Thomas Wang's code from https://gist.github.com/badboy/6267743
-   */
+  /** Based on Thomas Wang's code from https://gist.github.com/badboy/6267743 */
   @SuppressWarnings("UnnecessaryParentheses")
   public static int hash_mix_64_to_32(long key) {
     key = (~key) + (key << 18); // key = (key << 18) - key - 1;
@@ -25,9 +23,7 @@ public static int hash_mix_64_to_32(long key) {
     return (int) key;
   }
 
-  /**
-   * Based on http://www.burtleburtle.net/bob/hash/integer.html .
-   */
+  /** Based on http://www.burtleburtle.net/bob/hash/integer.html . */
   public static int hash_mix_full(int a) {
     a = (a + 0x7ed55d16) + (a << 12);
     a = (a ^ 0xc761c23c) ^ (a >> 19);
@@ -42,9 +38,7 @@ public static int hash_mix_full(long a) {
     return hash_mix_full(Long.hashCode(a));
   }
 
-  /**
-   * Based on http://www.burtleburtle.net/bob/hash/integer.html .
-   */
+  /** Based on http://www.burtleburtle.net/bob/hash/integer.html . */
   public static int hash_mix_low(int a) {
     a += ~(a << 15);
     a ^= (a >> 10);

dbsync/common/src/main/java/com/google/edwmigration/dbsync/common/InstructionGenerator.java

@@ -1,22 +1,18 @@
 package com.google.edwmigration.dbsync.common;
 
+import com.google.common.io.ByteSource;
 import com.google.edwmigration.dbsync.proto.BlockLocation;
 import com.google.edwmigration.dbsync.proto.Checksum;
 import com.google.edwmigration.dbsync.proto.Instruction;
-import com.google.common.hash.HashCode;
-import com.google.common.io.ByteSource;
 import com.google.protobuf.ByteString;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Consumer;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +21,7 @@ public class InstructionGenerator {
 
   @SuppressWarnings("unused")
   private static final Logger logger = LoggerFactory.getLogger(InstructionGenerator.class);
+
   private static final boolean DEBUG = false;
 
   private final int blockSize;
@@ -39,8 +36,11 @@ private static Instruction newLiteralInstruction(byte[] literalBuffer, int liter
         .build();
   }
 
-  public void generate(InstructionConsumer<? extends IOException> out, ByteSource in,
-      List<? extends Checksum> checksums) throws IOException {
+  public void generate(
+      InstructionConsumer<? extends IOException> out,
+      ByteSource in,
+      List<? extends Checksum> checksums)
+      throws IOException {
     Int2ObjectMap<Collection<Checksum>> checksumMap = new Int2ObjectOpenHashMap<>(checksums.size());
     for (Checksum c : checksums) {
       checksumMap.computeIfAbsent(c.getWeakChecksum(), k -> new ArrayList<>()).add(c);
@@ -53,8 +53,8 @@ public void generate(InstructionConsumer<? extends IOException> out, ByteSource
     int blockSize = checksums.isEmpty() ? this.blockSize : checksums.get(0).getBlockLength();
 
     @NonNegative int rollingBlockLength;
-    final byte[] literalBuffer = new byte[Math.min(blockSize,
-        AlgorithmConstants.MAX_LITERAL_LENGTH)];
+    final byte[] literalBuffer =
+        new byte[Math.min(blockSize, AlgorithmConstants.MAX_LITERAL_LENGTH)];
     @NonNegative int literalBufferLength = 0;
 
     // int lastBlockSize = checksums.get(checksums.size() - 1).getBlockLength();
@@ -85,11 +85,13 @@ public void generate(InstructionConsumer<? extends IOException> out, ByteSource
                   out.accept(newLiteralInstruction(literalBuffer, literalBufferLength));
                   literalBufferLength = 0;
                 }
-                Instruction insn = Instruction.newBuilder()
-                    .setBlockLocation(BlockLocation.newBuilder()
-                        .setBlockOffset(c.getBlockOffset())
-                        .setBlockLength(c.getBlockLength()))
-                    .build();
+                Instruction insn =
+                    Instruction.newBuilder()
+                        .setBlockLocation(
+                            BlockLocation.newBuilder()
+                                .setBlockOffset(c.getBlockOffset())
+                                .setBlockLength(c.getBlockLength()))
+                        .build();
                 out.accept(insn);
                 continue STREAM;
               }
@@ -132,10 +134,7 @@ public void generate(InstructionConsumer<? extends IOException> out, ByteSource
 
   public interface InstructionConsumer<X extends Exception> {
 
-    /**
-     * Accepts an instruction from the generator
-     */
+    /** Accepts an instruction from the generator */
     void accept(Instruction instruction) throws X;
   }
-
 }