[Streaming]Format java code using IDEA (#10440)

2026-07-17 11:32:33 +08:00 · 2020-08-31 19:45:00 +08:00
parent afde3db4f0
commit 6bde6b493e
125 changed files with 548 additions and 433 deletions
@@ -25,12 +25,12 @@ public abstract class BaseUnitTest {
  @BeforeMethod
  public void testBegin(Method method) {
    LOG.info(">>>>>>>>>>>>>>>>>>>> Test case: {}.{} began >>>>>>>>>>>>>>>>>>>>",
-        method.getDeclaringClass(),  method.getName());
+        method.getDeclaringClass(), method.getName());
  }

  @AfterMethod
  public void testEnd(Method method) {
    LOG.info(">>>>>>>>>>>>>>>>>>>> Test case: {}.{} end >>>>>>>>>>>>>>>>>>>>",
-        method.getDeclaringClass(),  method.getName());
+        method.getDeclaringClass(), method.getName());
  }
 }
@@ -50,11 +50,11 @@ public class ExecutionGraphTest extends BaseUnitTest {
        executionGraph.getExecutionVertexIdGenerator().get());

    executionGraph.getAllExecutionVertices().forEach(vertex -> {
-        Assert.assertNotNull(vertex.getStreamOperator());
-        Assert.assertNotNull(vertex.getExecutionJobVertexName());
-        Assert.assertNotNull(vertex.getVertexType());
-        Assert.assertNotNull(vertex.getLanguage());
-        Assert.assertEquals(vertex.getExecutionVertexName(),
+      Assert.assertNotNull(vertex.getStreamOperator());
+      Assert.assertNotNull(vertex.getExecutionJobVertexName());
+      Assert.assertNotNull(vertex.getVertexType());
+      Assert.assertNotNull(vertex.getLanguage());
+      Assert.assertEquals(vertex.getExecutionVertexName(),
          vertex.getExecutionJobVertexName() + "-" + vertex.getExecutionVertexIndex());
    });

@@ -66,10 +66,11 @@ public class ExecutionGraphTest extends BaseUnitTest {
    List<ExecutionVertex> upStreamVertices = upStream.getExecutionVertices();
    List<ExecutionVertex> downStreamVertices = downStream.getExecutionVertices();
    upStreamVertices.forEach(vertex -> {
-        Assert.assertEquals((double) vertex.getResource().get(ResourceType.CPU.name()), 2.0);
-        vertex.getOutputEdges().forEach(upStreamOutPutEdge -> {
-            Assert.assertTrue(downStreamVertices.contains(upStreamOutPutEdge.getTargetExecutionVertex()));
-        });
+      Assert.assertEquals((double) vertex.getResource().get(ResourceType.CPU.name()), 2.0);
+      vertex.getOutputEdges().forEach(upStreamOutPutEdge -> {
+        Assert
+            .assertTrue(downStreamVertices.contains(upStreamOutPutEdge.getTargetExecutionVertex()));
+      });
    });
  }

@@ -18,6 +18,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;

 public class HybridStreamTest {
+
  private static final Logger LOG = LoggerFactory.getLogger(HybridStreamTest.class);

  public static class Mapper1 implements MapFunction<Object, Object> {
@@ -17,7 +17,8 @@ import org.testng.Assert;
 import org.testng.annotations.Test;

 public class UnionStreamTest {
-  private static final Logger LOG = LoggerFactory.getLogger( UnionStreamTest.class );
+
+  private static final Logger LOG = LoggerFactory.getLogger(UnionStreamTest.class);

  @Test(timeOut = 60000)
  public void testUnionStream() throws Exception {
@@ -46,7 +46,8 @@ public class WordCountTest extends BaseUnitTest implements Serializable {
        .filter(pair -> !pair.word.contains("world"))
        .keyBy(pair -> pair.word)
        .reduce((ReduceFunction<WordAndCount>) (oldValue, newValue) ->
-            new WordAndCount(oldValue.word, oldValue.count + newValue.count))
+            new WordAndCount(oldValue.word,
+                oldValue.count + newValue.count))
        .sink((SinkFunction<WordAndCount>)
            result -> wordCount.put(result.word, result.count));

@@ -2,6 +2,7 @@ package io.ray.streaming.runtime.python;

 import static org.testng.Assert.assertEquals;

+
 import io.ray.streaming.api.stream.StreamSink;
 import io.ray.streaming.jobgraph.JobGraph;
 import io.ray.streaming.jobgraph.JobGraphBuilder;
@@ -3,6 +3,7 @@ package io.ray.streaming.runtime.serialization;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;

+
 import io.ray.streaming.message.KeyRecord;
 import io.ray.streaming.message.Record;
 import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -17,10 +18,10 @@ public class CrossLangSerializerTest {
    Record record = new Record("value");
    record.setStream("stream1");
    assertTrue(EqualsBuilder.reflectionEquals(record,
-      serializer.deserialize(serializer.serialize(record))));
+        serializer.deserialize(serializer.serialize(record))));
    KeyRecord keyRecord = new KeyRecord("key", "value");
    keyRecord.setStream("stream2");
    assertEquals(keyRecord,
-      serializer.deserialize(serializer.serialize(keyRecord)));
+        serializer.deserialize(serializer.serialize(keyRecord)));
  }
 }
@@ -3,6 +3,7 @@ package io.ray.streaming.runtime.serialization;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;

+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -18,7 +19,7 @@ public class MsgPackSerializerTest {
    MsgPackSerializer serializer = new MsgPackSerializer();

    assertEquals(serializer.deserialize(
-        serializer.serialize((byte)1)), (byte)1);
+        serializer.serialize((byte) 1)), (byte) 1);
  }

  @Test
@@ -1,12 +1,12 @@
 package io.ray.streaming.runtime.streamingqueue;

+import io.ray.api.ActorHandle;
 import io.ray.api.BaseActorHandle;
 import io.ray.api.Ray;
-import io.ray.api.ActorHandle;
 import io.ray.runtime.functionmanager.JavaFunctionDescriptor;
 import io.ray.streaming.runtime.config.StreamingWorkerConfig;
-import io.ray.streaming.runtime.transfer.ChannelId;
 import io.ray.streaming.runtime.transfer.ChannelCreationParametersBuilder;
+import io.ray.streaming.runtime.transfer.ChannelId;
 import io.ray.streaming.runtime.transfer.DataMessage;
 import io.ray.streaming.runtime.transfer.DataReader;
 import io.ray.streaming.runtime.transfer.DataWriter;
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import org.testng.Assert;

 public class Worker {
+
  private static final Logger LOGGER = LoggerFactory.getLogger(Worker.class);

  protected TransferHandler transferHandler = null;
@@ -50,6 +51,7 @@ public class Worker {
 }

 class ReaderWorker extends Worker {
+
  private static final Logger LOGGER = LoggerFactory.getLogger(ReaderWorker.class);

  private String name = null;
@@ -170,6 +172,7 @@ class ReaderWorker extends Worker {
 }

 class WriterWorker extends Worker {
+
  private static final Logger LOGGER = LoggerFactory.getLogger(WriterWorker.class);

  private String name = null;
@@ -2,6 +2,7 @@ package io.ray.streaming.runtime.transfer;

 import static org.testng.Assert.assertEquals;

+
 import io.ray.streaming.runtime.BaseUnitTest;
 import io.ray.streaming.runtime.util.EnvUtil;
 import org.testng.annotations.Test;
@@ -21,12 +21,11 @@ public class Mockitools {
  public static void mockGscApi() {
    PowerMockito.mockStatic(RayUtils.class);
    PowerMockito.when(RayUtils.getAliveNodeInfoMap())
-      .thenReturn(mockGetNodeInfoMap(mockGetAllNodeInfo()));
+        .thenReturn(mockGetNodeInfoMap(mockGetAllNodeInfo()));
  }

  /**
   * Mock get all node info from GCS
-   * @return
   */
  public static List<NodeInfo> mockGetAllNodeInfo() {
    List<NodeInfo> nodeInfos = new LinkedList<>();
@@ -55,21 +54,22 @@ public class Mockitools {

  /**
   * Mock get node info map
+   *
   * @param nodeInfos all node infos fetched from GCS
   * @return node info map, key is node unique id, value is node info
   */
  public static Map<UniqueId, NodeInfo> mockGetNodeInfoMap(List<NodeInfo> nodeInfos) {
    return nodeInfos.stream().filter(nodeInfo -> nodeInfo.isAlive).collect(
-      Collectors.toMap(nodeInfo -> nodeInfo.nodeId, nodeInfo -> nodeInfo));
+        Collectors.toMap(nodeInfo -> nodeInfo.nodeId, nodeInfo -> nodeInfo));
  }

  private static NodeInfo mockNodeInfo(int i, Map<String, Double> resources) {
    return new NodeInfo(
-      createNodeId(i),
-      "localhost" + i,
-      "localhost" + i,
-      true,
-      resources);
+        createNodeId(i),
+        "localhost" + i,
+        "localhost" + i,
+        true,
+        resources);
  }

  private static UniqueId createNodeId(int id) {
@@ -2,6 +2,7 @@ package io.ray.streaming.runtime.util;

 import static org.testng.Assert.assertEquals;

+
 import java.io.Serializable;
 import java.util.Collections;
 import org.testng.annotations.Test;
@@ -9,6 +10,7 @@ import org.testng.annotations.Test;
 public class ReflectionUtilsTest {

  static class Foo implements Serializable {
+
    public void f1() {
    }