Run code formatter.

Author: dbw9580

contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSCompat.java

@@ -68,7 +68,7 @@ public IPFSCompat(String host, int port, String version, boolean ssl, int readTi
     this.host = host;
     this.port = port;
 
-    if(ssl) {
+    if (ssl) {
       this.protocol = "https";
     } else {
       this.protocol = "http";
@@ -81,15 +81,16 @@ public IPFSCompat(String host, int port, String version, boolean ssl, int readTi
   /**
    * Resolve names to IPFS CIDs.
    * See <a href="https://docs.ipfs.io/reference/http/api/#api-v0-resolve">resolve in IPFS doc</a>.
-   * @param scheme the scheme of the name to resolve, usually IPFS or IPNS
-   * @param path the path to the object
+   *
+   * @param scheme    the scheme of the name to resolve, usually IPFS or IPNS
+   * @param path      the path to the object
    * @param recursive whether recursively resolve names until it is a IPFS CID
    * @return a Map of JSON object, with the result as the value of key "Path"
    */
   public Map resolve(String scheme, String path, boolean recursive) {
     AtomicReference<Map> ret = new AtomicReference<>();
     getObjectStream(
-        "resolve?arg=/" + scheme+"/"+path +"&r="+recursive,
+        "resolve?arg=/" + scheme + "/" + path + "&r=" + recursive,
         res -> {
           ret.set((Map) res);
           return true;
@@ -120,15 +121,16 @@ public enum DHTQueryEventType {
     // Adding a peer to the query.
     AddingPeer,
     // Dialing a peer.
-    DialingPeer;
+    DialingPeer
   }
 
   public class DHT {
     /**
      * Find internet addresses of a given peer.
      * See <a href="https://docs.ipfs.io/reference/http/api/#api-v0-dht-findpeer">dht/findpeer in IPFS doc</a>.
-     * @param id the id of the peer to query
-     * @param timeout timeout value in seconds
+     *
+     * @param id       the id of the peer to query
+     * @param timeout  timeout value in seconds
      * @param executor executor
      * @return List of Multiaddresses of the peer
      */
@@ -142,7 +144,7 @@ public List<String> findpeerListTimeout(Multihash id, int timeout, ExecutorServi
             if (peer == null) {
               return false;
             }
-            if ( (int) peer.get("Type") != DHTQueryEventType.FinalPeer.ordinal() ) {
+            if ((int) peer.get("Type") != DHTQueryEventType.FinalPeer.ordinal()) {
               return false;
             }
             List<Map> responses = (List<Map>) peer.get("Responses");
@@ -176,8 +178,9 @@ public List<String> findpeerListTimeout(Multihash id, int timeout, ExecutorServi
     /**
      * Find providers of a given CID.
      * See <a href="https://docs.ipfs.io/reference/http/api/#api-v0-dht-findprovs">dht/findprovs in IPFS doc</a>.
-     * @param id the CID of the IPFS object
-     * @param timeout timeout value in seconds
+     *
+     * @param id       the CID of the IPFS object
+     * @param timeout  timeout value in seconds
      * @param executor executor
      * @return List of Multihash of providers of the object
      */
@@ -188,10 +191,10 @@ public List<String> findprovsListTimeout(Multihash id, int maxPeers, int timeout
           timeout,
           res -> {
             Map peer = (Map) res;
-            if ( peer == null ) {
+            if (peer == null) {
               return false;
             }
-            if ( (int) peer.get("Type") != DHTQueryEventType.Provider.ordinal() ) {
+            if ((int) peer.get("Type") != DHTQueryEventType.Provider.ordinal()) {
               return false;
             }
             List<Map> responses = (List<Map>) peer.get("Responses");
@@ -227,30 +230,31 @@ public class Name {
     /**
      * Resolve a IPNS name.
      * See <a href="https://docs.ipfs.io/reference/http/api/#api-v0-name-resolve">name/resolve in IPFS doc</a>.
-     * @param hash the IPNS name to resolve
-     * @param timeout timeout value in seconds
+     *
+     * @param hash     the IPNS name to resolve
+     * @param timeout  timeout value in seconds
      * @param executor executor
      * @return a Multihash of resolved name
      */
     public Optional<String> resolve(Multihash hash, int timeout, ExecutorService executor) {
       AtomicReference<String> ret = new AtomicReference<>();
       timeLimitedExec(
-        "name/resolve?arg=" + hash,
-        timeout,
-        res -> {
-          Map peer = (Map) res;
-          if (peer != null) {
-            ret.set((String) peer.get(("Path")));
-            return true;
-          }
-          return false;
-        },
-        err -> {
-          if (!(err instanceof TimeoutException)) {
-            throw new RuntimeException(err);
-          }
-        },
-        executor
+          "name/resolve?arg=" + hash,
+          timeout,
+          res -> {
+            Map peer = (Map) res;
+            if (peer != null) {
+              ret.set((String) peer.get(("Path")));
+              return true;
+            }
+            return false;
+          },
+          err -> {
+            if (!(err instanceof TimeoutException)) {
+              throw new RuntimeException(err);
+            }
+          },
+          executor
       );
       return Optional.ofNullable(ret.get());
     }
@@ -259,8 +263,8 @@ public Optional<String> resolve(Multihash hash, int timeout, ExecutorService exe
   private void timeLimitedExec(String path, int timeout, Predicate<Object> processor, Consumer<Exception> error,
                                ExecutorService executor) {
     CompletableFuture<Void> f = CompletableFuture.runAsync(
-      ()-> getObjectStream(path, processor, error),
-      executor
+        () -> getObjectStream(path, processor, error),
+        executor
     );
     try {
       f.get(timeout, TimeUnit.SECONDS);
@@ -271,7 +275,7 @@ private void timeLimitedExec(String path, int timeout, Predicate<Object> process
   }
 
   private void getObjectStream(String path, Predicate<Object> processor, Consumer<Exception> error) {
-    byte LINE_FEED = (byte)10;
+    byte LINE_FEED = (byte) 10;
 
     try {
       InputStream in = getStream(path);

contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSContext.java

@@ -64,7 +64,7 @@ public IPFSPeer load(Multihash key) {
         .build(new CacheLoader<Multihash, List<Multihash>>() {
           @Override
           public List<Multihash> load(Multihash key) {
-              return ipfsHelper.findprovsTimeout(key);
+            return ipfsHelper.findprovsTimeout(key);
           }
         });
   }

contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSGroupScan.java

@@ -106,7 +106,7 @@ public IPFSGroupScan(IPFSContext ipfsContext,
     this.ipfsScanSpec = ipfsScanSpec;
     this.config = ipfsContext.getStoragePluginConfig();
     logger.debug("GroupScan constructor called with columns {}", columns);
-    this.columns = columns == null || columns.size() == 0? ALL_COLUMNS : columns;
+    this.columns = columns == null || columns.size() == 0 ? ALL_COLUMNS : columns;
     init();
   }
 
@@ -251,7 +251,7 @@ public ScanStats getScanStats() {
   }
 
   @Override
-  public IPFSGroupScan clone(List<SchemaPath> columns){
+  public IPFSGroupScan clone(List<SchemaPath> columns) {
     logger.debug("IPFSGroupScan clone {}", columns);
     IPFSGroupScan cloned = new IPFSGroupScan(this);
     cloned.columns = columns;
@@ -299,7 +299,9 @@ public IPFSWork(Multihash root) {
       this.partialRoot = root;
     }
 
-    public Multihash getPartialRootHash() {return partialRoot;}
+    public Multihash getPartialRootHash() {
+      return partialRoot;
+    }
 
     public void setOnEndpoint(DrillbitEndpoint endpointAddress) {
       this.onEndpoint = endpointAddress;
@@ -340,12 +342,12 @@ static class IPFSTreeFlattener extends RecursiveTask<Map<Multihash, String>> {
 
     public IPFSTreeFlattener(Multihash hash, boolean isProvider, IPFSContext context) {
       this(
-        hash,
-        isProvider,
-        context.getMyself(),
-        context.getIPFSHelper(),
-        context.getIPFSPeerCache(),
-        context.getProviderCache()
+          hash,
+          isProvider,
+          context.getMyself(),
+          context.getIPFSHelper(),
+          context.getIPFSPeerCache(),
+          context.getProviderCache()
       );
     }
 

contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSHelper.java

@@ -89,6 +89,7 @@ public void setMyself(IPFSPeer myself) {
   /**
    * Set maximum number of providers per leaf node. The more providers, the more time it takes to do DHT queries, while
    * it is more likely we can find an optimal peer.
+   *
    * @param maxPeersPerLeaf max number of providers to search per leaf node
    */
   public void setMaxPeersPerLeaf(int maxPeersPerLeaf) {
@@ -113,7 +114,7 @@ public List<Multihash> findprovsTimeout(Multihash id) {
   public List<MultiAddress> findpeerTimeout(Multihash peerId) {
     // trying to resolve addresses of a node itself will always hang
     // so we treat it specially
-    if(peerId.equals(myself.getId())) {
+    if (peerId.equals(myself.getId())) {
       return myself.getMultiAddresses();
     }
 
@@ -180,7 +181,7 @@ public Multihash resolve(String prefix, String path, boolean recursive) {
   }
 
   @FunctionalInterface
-  public interface ThrowingFunction<T, R, E extends Exception>{
+  public interface ThrowingFunction<T, R, E extends Exception> {
     R apply(final T in) throws E;
   }
 
@@ -192,12 +193,13 @@ public interface ThrowingSupplier<R, E extends Exception> {
   /**
    * Execute a time-critical operation op within time timeout. Causes the query to fail completely
    * if the operation times out.
-   * @param op a Function that represents the operation to perform
-   * @param in the parameter for op
+   *
+   * @param op      a Function that represents the operation to perform
+   * @param in      the parameter for op
    * @param timeout consider the execution has timed out after this amount of time in seconds
-   * @param <T> Input type
-   * @param <R> Return type
-   * @param <E> Type of checked exception op throws
+   * @param <T>     Input type
+   * @param <R>     Return type
+   * @param <E>     Type of checked exception op throws
    * @return R the result of the operation
    * @throws E when the function throws an E
    */
@@ -228,9 +230,11 @@ private <R, E extends Exception> R timedFailure(Callable<R> task, int timeout, T
    * DRILL-7753: implement a more advanced algorithm that picks optimal addresses. Maybe check reachability, latency
    * and bandwidth?
    */
+
   /**
    * Choose a peer's network address from its advertised Multiaddresses.
    * Prefer globally routable address over local addresses.
+   *
    * @param peerAddrs Multiaddresses obtained from IPFS.DHT.findprovs
    * @return network address
    */
@@ -262,6 +266,7 @@ public Optional<String> getPeerDrillHostname(Multihash peerId) {
 
   /**
    * Check if an IPFS peer is also running a Drillbit so that it can be used to execute a part of a query.
+   *
    * @param peerId the id of the peer
    * @return if the peer is Drill-ready
    */
@@ -287,8 +292,9 @@ public Optional<Multihash> getIPNSDataHash(Multihash peerId) {
 
   /**
    * Get from IPFS data under a peer's ID, i.e. the data identified by /ipfs/{ID}/key.
+   *
    * @param peerId the peer's ID
-   * @param key key
+   * @param key    key
    * @return data in bytes
    */
   private Optional<byte[]> getPeerData(Multihash peerId, String key) {
@@ -300,7 +306,7 @@ private Optional<byte[]> getPeerData(Multihash peerId, String key) {
     for (MerkleNode link : links.get()) {
       if (link.name.equals(Optional.of(key))) {
         try {
-          byte[] result = timedFailure(client.object::data, link.hash,timeouts.get(FETCH_DATA));
+          byte[] result = timedFailure(client.object::data, link.hash, timeouts.get(FETCH_DATA));
           return Optional.of(result);
         } catch (IOException e) {
           return Optional.empty();
@@ -312,6 +318,7 @@ private Optional<byte[]> getPeerData(Multihash peerId, String key) {
 
   /**
    * Get all the links under a peer's ID.
+   *
    * @param peerId peer's ID
    * @return List of links
    */
@@ -327,11 +334,12 @@ private Optional<List<MerkleNode>> getPeerLinks(Multihash peerId) {
           client.object::get,
           Cid.decode(path),
           timeouts.get(FETCH_DATA)
-          ).links;
+      ).links;
       if (links.size() > 0) {
         return Optional.of(links);
       }
-    } catch (IOException ignored) { }
+    } catch (IOException ignored) {
+    }
     return Optional.empty();
   }
 }

contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSJSONReader.java

@@ -80,8 +80,8 @@ public void addContext(UserException.Builder builder) {
     String rootJson = new String(rawDataBytes);
     int start = rootJson.indexOf("{");
     int end = rootJson.lastIndexOf("}");
-    rootJson = rootJson.substring(start,end+1);
-    InputStream inStream =  new ByteArrayInputStream(rootJson.getBytes());
+    rootJson = rootJson.substring(start, end + 1);
+    InputStream inStream = new ByteArrayInputStream(rootJson.getBytes());
 
     try {
       jsonLoader = new JsonLoaderImpl.JsonLoaderBuilder()

contrib/storage-ipfs/src/main/java/org/apache/drill/exec/store/ipfs/IPFSScanBatchCreator.java

@@ -91,7 +91,8 @@ public IPFSJSONReaderFactory(IPFSSubScan subScan) {
     }
 
     @Override
-    public void bind(ManagedScanFramework framework) { }
+    public void bind(ManagedScanFramework framework) {
+    }
 
     @Override
     public ManagedReader<SchemaNegotiator> next() {