From 4df0cd0c7cf4b312bffdc75553123408ece3c5ef Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Tue, 15 Jun 2021 14:01:18 +0800 Subject: [PATCH] fix #3215 bug by improve code quality for client. (#6050) * fix #3215 bug by improve code quality for client. * Fix line indent. Co-authored-by: jiele.cao --- .../nacos/config/server/utils/AppNameUtils.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/AppNameUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/AppNameUtils.java index d10e357bf35..f0ea8cf689a 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/AppNameUtils.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/AppNameUtils.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.alibaba.nacos.config.server.utils; +package com.alibaba.nacos.client.utils; -import org.apache.commons.lang3.StringUtils; +import com.alibaba.nacos.common.utils.StringUtils; import java.io.File; /** - * App util. + * appName util. * * @author Nacos */ @@ -45,8 +45,10 @@ public class AppNameUtils { private static final String SERVER_UNKNOWN = "unknown server"; + private static final String DEFAULT_APP_NAME = "unknown"; + public static String getAppName() { - String appName = null; + String appName; appName = getAppNameByProjectName(); if (appName != null) { @@ -58,7 +60,7 @@ public static String getAppName() { return appName; } - return "unknown"; + return DEFAULT_APP_NAME; } private static String getAppNameByProjectName() { @@ -83,7 +85,7 @@ private static String getAppNameByServerHome() { } private static String getServerType() { - String serverType = null; + String serverType; if (System.getProperty(PARAM_MARKING_JBOSS) != null) { serverType = SERVER_JBOSS; } else if (System.getProperty(PARAM_MARKING_JETTY) != null) {