This is an automated email from the ASF dual-hosted git repository. pingsutw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push: new f492e42a SUBMARINE-1347. Fix the syntax error reported in sonarcloud. f492e42a is described below commit f492e42a54331e4bccab029422bee68bc7c9ec58 Author: HH <hhcs9...@gmail.com> AuthorDate: Sat Nov 19 14:33:41 2022 +0800 SUBMARINE-1347. Fix the syntax error reported in sonarcloud. ### What is this PR for? Fix the syntax error reported in sonarcloud. ### What type of PR is it? Bug Fix ### Todos * [ ] - Task ### What is the Jira issue? [SUBMARINE-1347](https://issues.apache.org/jira/browse/SUBMARINE-1347) ### How should this be tested? <!-- * First time? Setup Travis CI as described on https://submarine.apache.org/contribution/contributions.html#continuous-integration * Strongly recommended: add automated unit tests for any new or changed behavior * Outline any manual steps to test the PR here. --> ### Screenshots (if appropriate) ### Questions: * Do the license files need updating? No * Are there breaking changes for older versions? No * Does this need new documentation? No Author: HH <hhcs9...@gmail.com> Signed-off-by: Kevin <pings...@apache.org> Closes #1018 from hhcs9527/SUBMARINE-1347 and squashes the following commits: 900a3755 [HH] SUBMARINE-1347. Fix the syntax error reported in sonarcloud. --- .../java/org/apache/submarine/server/manager/ModelVersionManager.java | 2 +- .../org/apache/submarine/server/manager/RegisteredModelManager.java | 2 +- .../java/org/apache/submarine/server/websocket/WebSocketServer.java | 4 ++-- .../org/apache/submarine/server/submitter/k8s/model/mljob/MLJob.java | 2 +- .../server/submitter/k8s/model/xgboostjob/XGBoostJobList.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/ModelVersionManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/ModelVersionManager.java index e25ab284..cbfc18d0 100644 --- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/ModelVersionManager.java +++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/ModelVersionManager.java @@ -35,7 +35,7 @@ import org.apache.submarine.server.s3.Client; * ModelVersion manager. */ public class ModelVersionManager { - private static volatile ModelVersionManager manager; + private static ModelVersionManager manager; /* Model version service */ private final ModelVersionService modelVersionService; diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/RegisteredModelManager.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/RegisteredModelManager.java index d2d5890d..f8a94dc8 100644 --- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/RegisteredModelManager.java +++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/manager/RegisteredModelManager.java @@ -37,7 +37,7 @@ import org.apache.submarine.server.s3.Client; * Registered model manager. */ public class RegisteredModelManager { - private static volatile RegisteredModelManager manager; + private static RegisteredModelManager manager; /* Registered model service */ private final RegisteredModelService registeredModelService; diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/websocket/WebSocketServer.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/websocket/WebSocketServer.java index 2c1f536d..2e46ca12 100644 --- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/websocket/WebSocketServer.java +++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/websocket/WebSocketServer.java @@ -66,9 +66,9 @@ public class WebSocketServer extends WebSocketServlet private static AtomicReference<WebSocketServer> self = new AtomicReference<>(); - private ConnectionManager connectionManager; + private static ConnectionManager connectionManager; - private ExecutorService executorService = Executors.newFixedThreadPool(10); + private static ExecutorService executorService = Executors.newFixedThreadPool(10); public WebSocketServer() { this.connectionManager = new ConnectionManager(); diff --git a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/mljob/MLJob.java b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/mljob/MLJob.java index 24915067..2294b749 100644 --- a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/mljob/MLJob.java +++ b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/mljob/MLJob.java @@ -284,7 +284,7 @@ public abstract class MLJob implements KubernetesObject, K8sResource<Experiment> return false; if (handlerSpec.get("FILE_SYSTEM_TYPE") == null) return false; - else if (handlerSpec.get("FILE_SYSTEM_TYPE") == "HDFS") { + else if (handlerSpec.get("FILE_SYSTEM_TYPE").equals("HDFS")) { if ((handlerSpec.get("HDFS_HOST") == null) || (handlerSpec.get("HDFS_PORT") == null) || (handlerSpec.get("HDFS_SOURCE") == null) || (handlerSpec.get("ENABLE_KERBEROS") == null)) { return false; diff --git a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/xgboostjob/XGBoostJobList.java b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/xgboostjob/XGBoostJobList.java index 2691965d..13e52209 100644 --- a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/xgboostjob/XGBoostJobList.java +++ b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/model/xgboostjob/XGBoostJobList.java @@ -50,7 +50,7 @@ public class XGBoostJobList implements KubernetesListObject { @Override public String getApiVersion() { - return XGBoostJob.CRD_XGBOOST_API_VERSION_V1; + return apiVersion; } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@submarine.apache.org For additional commands, e-mail: dev-h...@submarine.apache.org