From 4f23af49c939794f11be5728ff7e1e2ff80b877d Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Tue, 20 Feb 2024 15:34:18 +0800 Subject: [PATCH] [CELEBORN-1273] Move java classes under scala src to java ### What changes were proposed in this pull request? Just fix minor typo: ``` ls **/scala/**/*.java common/src/main/scala/org/apache/celeborn/common/meta/WorkerEventInfo.java common/src/main/scala/org/apache/celeborn/common/meta/WorkerStatus.java ``` After this: ``` ls **/scala/**/*.java zsh: no matches found: **/scala/**/*.java ls **/java/**/*.scala zsh: no matches found: **/java/**/*.scala ``` ### Why are the changes needed? Fix code format. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing UT. Closes #2310 from turboFei/scala_java. Authored-by: Fei Wang Signed-off-by: SteNicholas --- .../org/apache/celeborn/common/meta/WorkerEventInfo.java | 4 ++-- .../org/apache/celeborn/common/meta/WorkerStatus.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) rename common/src/main/{scala => java}/org/apache/celeborn/common/meta/WorkerEventInfo.java (100%) rename common/src/main/{scala => java}/org/apache/celeborn/common/meta/WorkerStatus.java (95%) diff --git a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerEventInfo.java b/common/src/main/java/org/apache/celeborn/common/meta/WorkerEventInfo.java similarity index 100% rename from common/src/main/scala/org/apache/celeborn/common/meta/WorkerEventInfo.java rename to common/src/main/java/org/apache/celeborn/common/meta/WorkerEventInfo.java index 298c78cbb..672a0e5c9 100644 --- a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerEventInfo.java +++ b/common/src/main/java/org/apache/celeborn/common/meta/WorkerEventInfo.java @@ -17,11 +17,11 @@ package org.apache.celeborn.common.meta; -import org.apache.celeborn.common.protocol.WorkerEventType; - import java.io.Serializable; import java.util.Objects; +import org.apache.celeborn.common.protocol.WorkerEventType; + public class WorkerEventInfo implements Serializable { private static final long serialVersionUID = 5681914909039445235L; private int eventTypeValue; diff --git a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerStatus.java b/common/src/main/java/org/apache/celeborn/common/meta/WorkerStatus.java similarity index 95% rename from common/src/main/scala/org/apache/celeborn/common/meta/WorkerStatus.java rename to common/src/main/java/org/apache/celeborn/common/meta/WorkerStatus.java index a432b540f..ce7c6e49e 100644 --- a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerStatus.java +++ b/common/src/main/java/org/apache/celeborn/common/meta/WorkerStatus.java @@ -17,10 +17,10 @@ package org.apache.celeborn.common.meta; -import org.apache.celeborn.common.protocol.PbWorkerStatus; - import java.util.Objects; +import org.apache.celeborn.common.protocol.PbWorkerStatus; + public class WorkerStatus { private int stateValue; private long stateStartTime; @@ -55,7 +55,8 @@ public class WorkerStatus { return false; } WorkerStatus that = (WorkerStatus) o; - return getStateValue() == that.getStateValue() && getStateStartTime() == that.getStateStartTime(); + return getStateValue() == that.getStateValue() + && getStateStartTime() == that.getStateStartTime(); } @Override