From a718c84d4cccb314b6a205cbbbcba58bdfd4938c Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Mon, 1 Oct 2018 10:48:34 +0800 Subject: [PATCH] Polish alibaba/nacos#104 --- .../naming/cache/ConcurrentDiskUtil.java | 3 - .../nacos/client/naming/net/HttpClient.java | 6 - .../alibaba/nacos/common/util/IoUtils.java | 7 - .../alibaba/nacos/common/util/SystemUtil.java | 4 - config/src/main/java/LogbackInitTest.java | 68 ---------- .../server/monitor/ResponseMonitor.java | 123 ++++++++---------- .../config/server/utils/RegexParser.java | 4 - .../nacos/config/server/utils/TimeUtils.java | 14 +- .../main/java/com/alibaba/nacos/core/App.java | 28 ---- .../alibaba/nacos/naming/core/Cluster.java | 7 - .../monitor/PerformanceLoggerThread.java | 3 - .../main/java/com/alibaba/nacos/test/App.java | 28 ---- .../nacos/test/naming/RandomUtils.java | 15 --- 13 files changed, 59 insertions(+), 251 deletions(-) delete mode 100644 config/src/main/java/LogbackInitTest.java delete mode 100644 core/src/main/java/com/alibaba/nacos/core/App.java delete mode 100644 test/src/main/java/com/alibaba/nacos/test/App.java diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java b/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java index 114a651586f..6fc5fa89729 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java @@ -229,9 +229,6 @@ private static void sleep(int time) { } } - public static void main(String[] args) { - } - static final public Logger log = LogUtils.LOG; static final int RETRY_COUNT = 10; static final int SLEEP_BASETIME = 10; diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java index b49b559bf36..24b9836e584 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java @@ -175,12 +175,6 @@ private static String encodingParams(Map params, String encoding return sb.toString(); } - public static void main(String[] args) throws UnsupportedEncodingException { - Map params = new HashMap(2); - params.put("s", "Wms+rkGG8jlaBBbpl8FIDxxNQGA="); - System.out.println(encodingParams(params, "utf-8")); - } - public static class HttpResult { final public int code; final public String content; diff --git a/common/src/main/java/com/alibaba/nacos/common/util/IoUtils.java b/common/src/main/java/com/alibaba/nacos/common/util/IoUtils.java index f9f489dc005..33356073b37 100644 --- a/common/src/main/java/com/alibaba/nacos/common/util/IoUtils.java +++ b/common/src/main/java/com/alibaba/nacos/common/util/IoUtils.java @@ -162,12 +162,5 @@ public static byte[] tryDecompress(InputStream raw) throws Exception { return null; } - public static void main(String[] args) throws IOException { - -// String path = "/Users/zhupengfei/test_write.txt"; - -// writeStringToFile(new File(path), "hello2222", "utf-8"); - } - } diff --git a/common/src/main/java/com/alibaba/nacos/common/util/SystemUtil.java b/common/src/main/java/com/alibaba/nacos/common/util/SystemUtil.java index 4955187e2ee..54f2f918120 100644 --- a/common/src/main/java/com/alibaba/nacos/common/util/SystemUtil.java +++ b/common/src/main/java/com/alibaba/nacos/common/util/SystemUtil.java @@ -45,10 +45,6 @@ public static String getSystemEnv(String key) { return env; } - public static void main(String[] args) throws SQLException { - System.out.println(Boolean.parseBoolean("Tfue")); - } - public static float getLoad() { return (float) operatingSystemMXBean.getSystemLoadAverage(); } diff --git a/config/src/main/java/LogbackInitTest.java b/config/src/main/java/LogbackInitTest.java deleted file mode 100644 index 408d0fb3a03..00000000000 --- a/config/src/main/java/LogbackInitTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.alibaba.nacos.config.server.utils.AppNameUtils; - -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; - -/** - * logback test - * @author Nacos - * - */ -public class LogbackInitTest { - - private static final Logger logger = LoggerFactory.getLogger(LogbackInitTest.class); - - - - public static void main(String[] args) throws Exception { - AppNameUtils.class.getClassLoader(); - String classpath = AppNameUtils.class.getResource("/").getPath(); - System.out.println("The classpath is " + classpath); - - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - lc.reset(); - - JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(lc); - configurator.doConfigure(LogbackInitTest.class.getResource("logback-jiuren.xml")); - - for (;;) { - logger.info("hello"); - System.out.println(getLevel(logger)); - Thread.sleep(1000L); - } - } - - - static String getLevel(Logger logger) { - if (logger.isDebugEnabled()) { - return "debug"; - } else if (logger.isInfoEnabled()) { - return "info"; - } else if (logger.isWarnEnabled()) { - return "warn"; - } else if (logger.isErrorEnabled()) { - return "error"; - } else { - return "unknown"; - } - } -} diff --git a/config/src/main/java/com/alibaba/nacos/config/server/monitor/ResponseMonitor.java b/config/src/main/java/com/alibaba/nacos/config/server/monitor/ResponseMonitor.java index ea98ae7b0db..a7ad949a5e7 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/monitor/ResponseMonitor.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/monitor/ResponseMonitor.java @@ -20,78 +20,61 @@ /** * Response Monitory - * - * @author Nacos * + * @author Nacos */ public class ResponseMonitor { - static AtomicLong[] getConfigCountDetail = new AtomicLong[8]; - static AtomicLong getConfigCount = new AtomicLong(); - private static final int MS_50 = 50; - private static final int MS_100 = 100; - private static final int MS_200 = 200; - private static final int MS_500 = 500; - private static final int MS_1000 = 1000; - private static final int MS_2000 = 2000; - private static final int MS_3000 = 3000; + static AtomicLong[] getConfigCountDetail = new AtomicLong[8]; + static AtomicLong getConfigCount = new AtomicLong(); + private static final int MS_50 = 50; + private static final int MS_100 = 100; + private static final int MS_200 = 200; + private static final int MS_500 = 500; + private static final int MS_1000 = 1000; + private static final int MS_2000 = 2000; + private static final int MS_3000 = 3000; + + static { + refresh(); + } + + public static void refresh() { + for (int i = 0; i < getConfigCountDetail.length; i++) { + getConfigCountDetail[i] = new AtomicLong(); + } + } + + public static void addConfigTime(long time) { + getConfigCount.incrementAndGet(); + if (time < MS_50) { + getConfigCountDetail[0].incrementAndGet(); + } else if (time < MS_100) { + getConfigCountDetail[1].incrementAndGet(); + } else if (time < MS_200) { + getConfigCountDetail[2].incrementAndGet(); + } else if (time < MS_500) { + getConfigCountDetail[3].incrementAndGet(); + } else if (time < MS_1000) { + getConfigCountDetail[4].incrementAndGet(); + } else if (time < MS_2000) { + getConfigCountDetail[5].incrementAndGet(); + } else if (time < MS_3000) { + getConfigCountDetail[6].incrementAndGet(); + } else { + getConfigCountDetail[7].incrementAndGet(); + } + } - static{ - refresh(); - } - - public static void refresh(){ - for(int i = 0; i< getConfigCountDetail.length;i++){ - getConfigCountDetail[i] = new AtomicLong(); - } - } - - public static void addConfigTime(long time){ - getConfigCount.incrementAndGet(); - if(time < MS_50){ - getConfigCountDetail[0].incrementAndGet(); - } else if(time < MS_100) { - getConfigCountDetail[1].incrementAndGet(); - } else if (time < MS_200){ - getConfigCountDetail[2].incrementAndGet(); - } else if(time < MS_500){ - getConfigCountDetail[3].incrementAndGet(); - } else if(time < MS_1000){ - getConfigCountDetail[4].incrementAndGet(); - } else if(time < MS_2000){ - getConfigCountDetail[5].incrementAndGet(); - } else if(time < MS_3000){ - getConfigCountDetail[6].incrementAndGet(); - } else { - getConfigCountDetail[7].incrementAndGet(); - } - } - - public static String getStringForPrint(){ - DecimalFormat df = new DecimalFormat("##.0"); - StringBuilder s = new StringBuilder("getConfig monitor:\r\n"); - s.append("0-50ms:" + df.format(getConfigCountDetail[0].getAndSet(0)*100/ getConfigCount.get())).append("%\r\n"); - s.append("100-200ms:" + df.format(getConfigCountDetail[2].getAndSet(0)*100/ getConfigCount.get())).append("%\r\n"); - s.append("200-500ms:" + df.format(getConfigCountDetail[3].getAndSet(0)*100/ getConfigCount.get())).append("%\r\n"); - s.append("500-1000ms:" + df.format(getConfigCountDetail[4].getAndSet(0)*100/ getConfigCount.get())).append("%\r\n"); - s.append("1000-2000ms:" + df.format(getConfigCountDetail[5].getAndSet(0)*100/ getConfigCount.get())).append("%\r\n"); - s.append("2000-3000ms:" + df.format(getConfigCountDetail[6].getAndSet(0)*100/ getConfigCount.get())).append("%\r\n"); - s.append("3000以上ms:" + df.format(getConfigCountDetail[7].getAndSet(0)*100/ getConfigCount.getAndSet(0))).append("%\r\n"); - return s.toString(); - } - - public static void main(String[] args) { - ResponseMonitor.addConfigTime(10); - ResponseMonitor.addConfigTime(10); - ResponseMonitor.addConfigTime(10); - ResponseMonitor.addConfigTime(10); - ResponseMonitor.addConfigTime(100); - ResponseMonitor.addConfigTime(150); - ResponseMonitor.addConfigTime(250); - ResponseMonitor.addConfigTime(350); - ResponseMonitor.addConfigTime(750); - ResponseMonitor.addConfigTime(15000); - System.out.println(ResponseMonitor.getStringForPrint()); - System.out.println(ResponseMonitor.getStringForPrint()); - - } + public static String getStringForPrint() { + DecimalFormat df = new DecimalFormat("##.0"); + StringBuilder s = new StringBuilder("getConfig monitor:\r\n"); + s.append("0-50ms:" + df.format(getConfigCountDetail[0].getAndSet(0) * 100 / getConfigCount.get())).append("%\r\n"); + s.append("100-200ms:" + df.format(getConfigCountDetail[2].getAndSet(0) * 100 / getConfigCount.get())).append("%\r\n"); + s.append("200-500ms:" + df.format(getConfigCountDetail[3].getAndSet(0) * 100 / getConfigCount.get())).append("%\r\n"); + s.append("500-1000ms:" + df.format(getConfigCountDetail[4].getAndSet(0) * 100 / getConfigCount.get())).append("%\r\n"); + s.append("1000-2000ms:" + df.format(getConfigCountDetail[5].getAndSet(0) * 100 / getConfigCount.get())).append("%\r\n"); + s.append("2000-3000ms:" + df.format(getConfigCountDetail[6].getAndSet(0) * 100 / getConfigCount.get())).append("%\r\n"); + s.append("3000以上ms:" + df.format(getConfigCountDetail[7].getAndSet(0) * 100 / getConfigCount.getAndSet(0))).append("%\r\n"); + return s.toString(); + } } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java index a8c321b009d..a32d33c2b85 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java @@ -75,8 +75,4 @@ static public boolean containsWildcard(String regex) { return (regex.contains("?") || regex.contains("*")); } - public static void main(String[] args) { - String str = "com.taobao.uic.*"; - System.out.println(str + " -> " + regexFormat(str)); - } } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java index 644af4811d6..9f57e01b9ad 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java @@ -15,27 +15,25 @@ */ package com.alibaba.nacos.config.server.utils; +import org.apache.commons.lang.time.FastDateFormat; + import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang.time.FastDateFormat; /** * Time util - * @author Nacos * + * @author Nacos */ public class TimeUtils { - public static Timestamp getCurrentTime() { + public static Timestamp getCurrentTime() { Date date = new Date(); return new Timestamp(date.getTime()); } - public static void main(String[] args) { - System.out.println(getCurrentTime().toString()); - } - - static public String getCurrentTimeStr() { + + static public String getCurrentTimeStr() { Calendar c = Calendar.getInstance(); c.setTime(new Date()); c.get(Calendar.HOUR); diff --git a/core/src/main/java/com/alibaba/nacos/core/App.java b/core/src/main/java/com/alibaba/nacos/core/App.java deleted file mode 100644 index b006320b4a8..00000000000 --- a/core/src/main/java/com/alibaba/nacos/core/App.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.nacos.core; - -/** - * Hello world! - * @author xxc - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java index e911e015edd..7462bd90e2e 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java @@ -451,11 +451,4 @@ public void valid() { } } } - - public static void main(String[] args) { - String v1 = "nesttest"; - if (v1.matches(CLUSTER_NAME_SYNTAX)) { - System.out.print(""); - } - } } diff --git a/naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java b/naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java index a9c604c80a0..c33669f7e41 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java @@ -136,7 +136,4 @@ private long getAvgPushCost() { } return avgCost; } - - public static void main(String[] args) { - } } diff --git a/test/src/main/java/com/alibaba/nacos/test/App.java b/test/src/main/java/com/alibaba/nacos/test/App.java deleted file mode 100644 index bf3ea7e9c0e..00000000000 --- a/test/src/main/java/com/alibaba/nacos/test/App.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.nacos.test; - -/** - * Hello world! - * @author xxc - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/RandomUtils.java b/test/src/test/java/com/alibaba/nacos/test/naming/RandomUtils.java index c6bd7f69dbd..b24adbbb9f4 100644 --- a/test/src/test/java/com/alibaba/nacos/test/naming/RandomUtils.java +++ b/test/src/test/java/com/alibaba/nacos/test/naming/RandomUtils.java @@ -263,21 +263,6 @@ public static boolean getBoolean() { return getIntegerMoreThanZeroLessThan(3) == 1; } - public static void main(String[] args) { - for(int t = 0; t < 20; ++t) { - Collection arrs = getRandomCollection(1, 5, 5); - Iterator var3 = arrs.iterator(); - - while(var3.hasNext()) { - int i = (Integer)var3.next(); - System.out.println(i); - } - - System.out.println("----"); - } - - } - public static String getStringByUUID() { return UUID.randomUUID().toString(); }