[incubator-nemo] branch master updated: [NEMO-429] SWPP TEAM17 Code Smell Fix (#268)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

taegeonum pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git


The following commit(s) were added to refs/heads/master by this push:
     new 440da45  [NEMO-429] SWPP TEAM17 Code Smell Fix (#268)
440da45 is described below

commit 440da45768b04abd5a64db6d02764fea28124476
Author: ske-kr <54...@users.noreply.github.com>
AuthorDate: Thu Feb 6 13:35:32 2020 +0900

    [NEMO-429] SWPP TEAM17 Code Smell Fix (#268)
    
    JIRA: [NEMO-429: SWPP-TEAM17](https://issues.apache.org/jira/projects/NEMO/issues/NEMO-429)
    
    **Major changes:**
    - Fixed code smells (SWPP Code Smell session)
    
    **Minor changes to note:**
    - remove declaration of thrown exceptions
    - serializable issues
    -  assertion errors
---
 .../src/main/java/org/apache/nemo/client/JobLauncher.java |  2 +-
 .../org/apache/nemo/common/coder/IntDecoderFactory.java   |  2 +-
 .../compiler/frontend/beam/coder/BeamEncoderFactory.java  |  4 ++--
 .../apache/nemo/runtime/executor/task/TaskExecutor.java   | 15 ++++++++-------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/src/main/java/org/apache/nemo/client/JobLauncher.java b/client/src/main/java/org/apache/nemo/client/JobLauncher.java
index c349ecf..4559bad 100644
--- a/client/src/main/java/org/apache/nemo/client/JobLauncher.java
+++ b/client/src/main/java/org/apache/nemo/client/JobLauncher.java
@@ -352,7 +352,7 @@ public final class JobLauncher {
    *
    * @return driver message configuration.
    */
-  private static Configuration getDriverMessageConf()  {
+  private static Configuration getDriverMessageConf() {
     return TANG.newConfigurationBuilder()
       .bindNamedParameter(MessageParameters.SenderId.class, MessageEnvironment.MASTER_COMMUNICATION_ID)
       .build();
diff --git a/common/src/main/java/org/apache/nemo/common/coder/IntDecoderFactory.java b/common/src/main/java/org/apache/nemo/common/coder/IntDecoderFactory.java
index 146965b..c27f31a 100644
--- a/common/src/main/java/org/apache/nemo/common/coder/IntDecoderFactory.java
+++ b/common/src/main/java/org/apache/nemo/common/coder/IntDecoderFactory.java
@@ -60,7 +60,7 @@ public final class IntDecoderFactory implements DecoderFactory<Integer> {
    */
   private final class IntDecoder implements Decoder<Integer> {
 
-    private final DataInputStream inputStream;
+    private transient DataInputStream inputStream;
 
     /**
      * Constructor.
diff --git a/compiler/frontend/beam/src/main/java/org/apache/nemo/compiler/frontend/beam/coder/BeamEncoderFactory.java b/compiler/frontend/beam/src/main/java/org/apache/nemo/compiler/frontend/beam/coder/BeamEncoderFactory.java
index a60cae8..91b3dc1 100644
--- a/compiler/frontend/beam/src/main/java/org/apache/nemo/compiler/frontend/beam/coder/BeamEncoderFactory.java
+++ b/compiler/frontend/beam/src/main/java/org/apache/nemo/compiler/frontend/beam/coder/BeamEncoderFactory.java
@@ -69,7 +69,7 @@ public final class BeamEncoderFactory<T> implements EncoderFactory<T> {
   private final class BeamEncoder<T2> implements Encoder<T2> {
 
     private final Coder<T2> beamCoder;
-    private final OutputStream outputStream;
+    private transient OutputStream outputStream;
 
     /**
      * Constructor.
@@ -100,7 +100,7 @@ public final class BeamEncoderFactory<T> implements EncoderFactory<T> {
    */
   private final class BeamVoidEncoder<T2> implements Encoder<T2> {
 
-    private final OutputStream outputStream;
+    private transient OutputStream outputStream;
 
     /**
      * Constructor.
diff --git a/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/task/TaskExecutor.java b/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/task/TaskExecutor.java
index 7211e50..7e6c5de 100644
--- a/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/task/TaskExecutor.java
+++ b/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/task/TaskExecutor.java
@@ -62,6 +62,7 @@ import java.util.stream.Collectors;
 @NotThreadSafe
 public final class TaskExecutor {
   private static final Logger LOG = LoggerFactory.getLogger(TaskExecutor.class.getName());
+  private static final String TASK_METRIC_ID = "TaskMetric";
 
   // Essential information
   private boolean isExecuted;
@@ -339,11 +340,11 @@ public final class TaskExecutor {
       return;
     }
 
-    metricMessageSender.send("TaskMetric", taskId,
+    metricMessageSender.send(TASK_METRIC_ID, taskId,
       "boundedSourceReadTime", SerializationUtils.serialize(boundedSourceReadTime));
-    metricMessageSender.send("TaskMetric", taskId,
+    metricMessageSender.send(TASK_METRIC_ID, taskId,
       "serializedReadBytes", SerializationUtils.serialize(serializedReadBytes));
-    metricMessageSender.send("TaskMetric", taskId,
+    metricMessageSender.send(TASK_METRIC_ID, taskId,
       "encodedReadBytes", SerializationUtils.serialize(encodedReadBytes));
 
     // Phase 2: Finalize task-internal states and elements
@@ -682,13 +683,13 @@ public final class TaskExecutor {
     });
 
     // finalize OutputWriters for additional tagged children
-    vertexHarness.getWritersToAdditionalChildrenTasks().values().forEach(outputWriters -> {
+    vertexHarness.getWritersToAdditionalChildrenTasks().values().forEach(outputWriters ->
       outputWriters.forEach(outputWriter -> {
         outputWriter.close();
         final Optional<Long> writtenBytes = outputWriter.getWrittenBytes();
         writtenBytes.ifPresent(writtenBytesList::add);
-      });
-    });
+      })
+    );
 
     long totalWrittenBytes = 0;
     for (final Long writtenBytes : writtenBytesList) {
@@ -696,7 +697,7 @@ public final class TaskExecutor {
     }
 
     // TODO #236: Decouple metric collection and sending logic
-    metricMessageSender.send("TaskMetric", taskId,
+    metricMessageSender.send(TASK_METRIC_ID, taskId,
       "writtenBytes", SerializationUtils.serialize(totalWrittenBytes));
   }
 }