Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style: Modifiers should be declared in the correct order;Map init 设置大小 #1832

Merged
merged 4 commits into from
Sep 10, 2019
Merged

style: Modifiers should be declared in the correct order;Map init 设置大小 #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13e5096
style: Modifiers should be declared in the correct order;Map init 设置大…
xianlaioy Sep 9, 2019
7b5c6e9
style: Modifiers should be declared in the correct order;Map init 设置大…
xianlaioy Sep 9, 2019
08e69a0
refactor: 局部变量是线程安全的；
xianlaioy Sep 9, 2019
4e6d8b6
refactor: IO改成try resource。instanceList循环直接改成addAll
xianlaioy Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractSharedListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@
*/
@SuppressWarnings("PMD.AbstractClassShouldStartWithAbstractNamingRule")
public abstract class AbstractSharedListener implements Listener {

private volatile String dataId;
private volatile String group;

final public void fillContext(String dataId, String group) {
public final void fillContext(String dataId, String group) {
this.dataId = dataId;
this.group = group;
}

@Override
final public void receiveConfigInfo(String configInfo) {
public final void receiveConfigInfo(String configInfo) {
innerReceive(dataId, group, configInfo);
}

Expand Down
31 changes: 13 additions & 18 deletions client/src/main/java/com/alibaba/nacos/client/config/common/GroupKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,28 @@
*/
public class GroupKey {

static public String getKey(String dataId, String group) {
StringBuilder sb = new StringBuilder();
urlEncode(dataId, sb);
sb.append('+');
urlEncode(group, sb);
return sb.toString();
public static String getKey(String dataId, String group) {
return doGetKey(dataId, group, "");
}

public static String getKeyTenant(String dataId, String group, String tenant) {
return doGetKey(dataId, group, tenant);
}

public static String getKey(String dataId, String group, String datumStr) {
return doGetKey(dataId, group, datumStr);
}

static public String getKeyTenant(String dataId, String group, String tenant) {
private static String doGetKey(String dataId, String group, String datumStr) {
StringBuilder sb = new StringBuilder();
urlEncode(dataId, sb);
sb.append('+');
urlEncode(group, sb);
if (StringUtils.isNotEmpty(tenant)) {
if (StringUtils.isNotEmpty(datumStr)) {
sb.append('+');
urlEncode(tenant, sb);
urlEncode(datumStr, sb);
}
return sb.toString();
}

static public String getKey(String dataId, String group, String datumStr) {
StringBuilder sb = new StringBuilder();
urlEncode(dataId, sb);
sb.append('+');
urlEncode(group, sb);
sb.append('+');
urlEncode(datumStr, sb);
return sb.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions config/src/main/java/com/alibaba/nacos/config/server/model/app/ApplicationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*/
public class ApplicationInfo {

private static final long LOCK_EXPIRE_DURATION = 30 * 1000;
private static final long RECENTLY_DURATION = 24 * 60 * 60 * 1000;
private static final long LOCK_EXPIRE_DURATION = 30 * 1000L;
private static final long RECENTLY_DURATION = 24 * 60 * 60 * 1000L;

private String appName;

Expand Down
10 changes: 5 additions & 5 deletions config/src/main/java/com/alibaba/nacos/config/server/service/AggrWhitelist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
@Service
public class AggrWhitelist {

public static final String AGGRIDS_METADATA = "com.alibaba.nacos.metadata.aggrIDs";

/**
* 判断指定的dataId是否在聚合dataId白名单。
*/
static public boolean isAggrDataId(String dataId) {
public static boolean isAggrDataId(String dataId) {
if (null == dataId) {
throw new IllegalArgumentException();
}
Expand All @@ -56,7 +58,7 @@ static public boolean isAggrDataId(String dataId) {
/**
* 传入内容，重新加载聚合白名单
*/
static public void load(String content) {
public static void load(String content) {
if (StringUtils.isBlank(content)) {
fatalLog.error("aggr dataId whitelist is blank.");
return;
Expand All @@ -83,14 +85,12 @@ static void compile(List<String> whitelist) {
AGGR_DATAID_WHITELIST.set(list);
}

static public List<Pattern> getWhiteList() {
public static List<Pattern> getWhiteList() {
return AGGR_DATAID_WHITELIST.get();
}

// =======================

static public final String AGGRIDS_METADATA = "com.alibaba.nacos.metadata.aggrIDs";

static final AtomicReference<List<Pattern>> AGGR_DATAID_WHITELIST = new AtomicReference<List<Pattern>>(
new ArrayList<Pattern>());
}
2 changes: 1 addition & 1 deletion config/src/main/java/com/alibaba/nacos/config/server/service/LocalDataSourceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private List<String> loadSql(String sqlFile) throws Exception {
sqlFileIn = new FileInputStream(file);
}

StringBuffer sqlSb = new StringBuffer();
StringBuilder sqlSb = new StringBuilder();
byte[] buff = new byte[1024];
int byteRead = 0;
while ((byteRead = sqlFileIn.read(buff)) != -1) {
Expand Down
35 changes: 15 additions & 20 deletions config/src/main/java/com/alibaba/nacos/config/server/utils/GroupKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,32 @@
*/
public class GroupKey {

static public String getKey(String dataId, String group) {
StringBuilder sb = new StringBuilder();
urlEncode(dataId, sb);
sb.append('+');
urlEncode(group, sb);
return sb.toString();
public static String getKey(String dataId, String group) {
return doGetKey(dataId, group, "");
}

public static String getKeyTenant(String dataId, String group, String tenant) {
return doGetKey(dataId, group, tenant);
}

public static String getKey(String dataId, String group, String datumStr) {
return doGetKey(dataId, group, datumStr);
}

static public String getKeyTenant(String dataId, String group, String tenant) {
private static String doGetKey(String dataId, String group, String datumStr) {
StringBuilder sb = new StringBuilder();
urlEncode(dataId, sb);
sb.append('+');
urlEncode(group, sb);
if (StringUtils.isNotEmpty(tenant)) {
if (StringUtils.isNotEmpty(datumStr)) {
sb.append('+');
urlEncode(tenant, sb);
urlEncode(datumStr, sb);
}
return sb.toString();
}

static public String getKey(String dataId, String group, String datumStr) {
StringBuilder sb = new StringBuilder();
urlEncode(dataId, sb);
sb.append('+');
urlEncode(group, sb);
sb.append('+');
urlEncode(datumStr, sb);
return sb.toString();
}

static public String[] parseKey(String groupKey) {
public static String[] parseKey(String groupKey) {
StringBuilder sb = new StringBuilder();
String dataId = null;
String group = null;
Expand Down Expand Up @@ -97,7 +92,7 @@ static public String[] parseKey(String groupKey) {
}
}

return new String[] {dataId, group, tenant};
return new String[]{dataId, group, tenant};
}

/**
Expand Down
9 changes: 4 additions & 5 deletions config/src/main/java/com/alibaba/nacos/config/server/utils/MD5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
package com.alibaba.nacos.config.server.utils;

import com.alibaba.nacos.config.server.constant.Constants;

import com.google.common.collect.Maps;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;

Expand All @@ -31,10 +30,10 @@
@SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
public class MD5 {
private static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
private final static int DIGITS_COUNT = 16;
private final static int DIGITS_CHAR_SIZE = 32;
private static final int DIGITS_COUNT = 16;
private static final int DIGITS_CHAR_SIZE = 32;

private static Map<Character, Integer> rDigits = new HashMap<Character, Integer>(16);
private static Map<Character, Integer> rDigits = Maps.newHashMapWithExpectedSize(16);

static {
for (int i = 0; i < digits.length; ++i) {
Expand Down
2 changes: 1 addition & 1 deletion config/src/main/java/com/alibaba/nacos/config/server/utils/RegexParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static public String regexFormat(String regex) {
if (regex == null) {
throw new NullPointerException("regex string can't be null");
}
StringBuffer result = new StringBuffer();
StringBuilder result = new StringBuilder();
result.append("^");
for (int i = 0; i < regex.length(); i++) {
char ch = regex.charAt(i);
Expand Down
2 changes: 1 addition & 1 deletion config/src/main/java/com/alibaba/nacos/config/server/utils/TimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static Timestamp getCurrentTime() {
return new Timestamp(date.getTime());
}

static public String getCurrentTimeStr() {
public static String getCurrentTimeStr() {
Calendar c = Calendar.getInstance();
c.setTime(new Date());
FastDateFormat format = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
Expand Down
2 changes: 1 addition & 1 deletion config/src/main/java/com/alibaba/nacos/config/server/utils/TimeoutUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public synchronized void initLastResetTime() {
/**
* 累计总的时间
*
* @param timeout
* @param time
*/
public void addTotalTime(long time) {
totalTime.addAndGet(time);
Expand Down
4 changes: 2 additions & 2 deletions config/src/main/java/com/alibaba/nacos/config/server/utils/UrlAnalysisUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
*/
public class UrlAnalysisUtils {

private static Pattern urlPattern = Pattern.compile("^(\\w+://)?([\\w\\.]+:)(\\d*)?(\\??.*)");
private static final Pattern URL_PATTERN = Pattern.compile("^(\\w+://)?([\\w\\.]+:)(\\d*)?(\\??.*)");

public static String getContentIdentity(String content) {

if (!verifyIncrementPubContent(content)) {
return null;
}

Matcher matcher = urlPattern.matcher(content);
Matcher matcher = URL_PATTERN.matcher(content);
StringBuilder buf = new StringBuilder();
if (matcher.find()) {
String scheme = matcher.group(1);
Expand Down
15 changes: 3 additions & 12 deletions core/src/main/java/com/alibaba/nacos/core/utils/SystemUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,8 @@ private static String getClusterConfFilePath() {

public static List<String> readClusterConf() throws IOException {
List<String> instanceList = new ArrayList<String>();
Reader reader = null;

try {
reader = new InputStreamReader(new FileInputStream(new File(CLUSTER_CONF_FILE_PATH)),
StandardCharsets.UTF_8);
try(Reader reader = new InputStreamReader(new FileInputStream(new File(CLUSTER_CONF_FILE_PATH)),
StandardCharsets.UTF_8)) {
List<String> lines = IoUtils.readLines(reader);
String comment = "#";
for (String line : lines) {
Expand All @@ -142,19 +139,13 @@ public static List<String> readClusterConf() throws IOException {
int multiIndex = instance.indexOf(Constants.COMMA_DIVISION);
if (multiIndex > 0) {
// support the format: ip1:port,ip2:port # multi inline
for (String ins : instance.split(Constants.COMMA_DIVISION)) {
instanceList.add(ins);
}
instanceList.addAll(Arrays.asList(instance.split(Constants.COMMA_DIVISION)));
} else {
//support the format: 192.168.71.52:8848
instanceList.add(instance);
}
}
return instanceList;
} finally {
if (reader != null) {
reader.close();
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions test/src/test/java/com/alibaba/nacos/test/naming/RandomUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class RandomUtils {
private static Random rd = new Random();
private static int UNICODE_START = 19968;
private static int UNICODE_END = 40864;
private static final String STRING_POOL = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";

private RandomUtils() {
}
Expand Down Expand Up @@ -132,13 +133,12 @@ public static String getStringWithNumAndCha(int n) {
}

public static String getRandomString(int length) {
StringBuffer buffer = new StringBuffer("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
Random random = new Random();
int range = buffer.length();
int range = STRING_POOL.length();

for(int i = 0; i < length; ++i) {
sb.append(buffer.charAt(random.nextInt(range)));
sb.append(STRING_POOL.charAt(random.nextInt(range)));
}

return sb.toString();
Expand Down