msb-public
/
hippo4j
mirror of https://github.com/longtai-cn/hippo4j
1
0
Code Issues Projects Releases Wiki Activity

Fix checkstyle plugin scan bug

Browse Source
pull/759/head
chen.ma 2 years ago
parent 26a7ad63ba
commit 1baf187ece
24 changed files with 128 additions and 63 deletions
Show Stats Download Patch File Download Diff File

3
hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
Unescape View File

@ -32,6 +32,9 @@ public interface ClientCloseHookExecute {
*/
void closeHook(ClientCloseHookReq req);
/**
* Client close hook req.
*/
@Data
@Accessors(chain = true)
class ClientCloseHookReq {

16
hippo4j-common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java
Unescape View File

@ -25,14 +25,14 @@ public class ChangeThreadPoolConstants {
/**
* Dynamic thread pool parameter change text
*/
public static final String CHANGE_THREAD_POOL_TEXT = "[{}] Dynamic thread pool change parameter." +
"\n corePoolSize: {}" +
"\n maximumPoolSize: {}" +
"\n capacity: {}" +
"\n keepAliveTime: {}" +
"\n executeTimeOut: {}" +
"\n rejectedType: {}" +
"\n allowCoreThreadTimeOut: {}";
public static final String CHANGE_THREAD_POOL_TEXT = "[{}] Dynamic thread pool change parameter."
+ "\n corePoolSize: {}"
+ "\n maximumPoolSize: {}"
+ "\n capacity: {}"
+ "\n keepAliveTime: {}"
+ "\n executeTimeOut: {}"
+ "\n rejectedType: {}"
+ "\n allowCoreThreadTimeOut: {}";
/**
* Dynamic thread pool parameter change separator

11
hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
Unescape View File

@ -64,12 +64,10 @@ public class AbstractSubjectCenter {
log.warn("Register observer. A string whose subject or observer is empty or empty.");
return;
}
List<Observer> observers = OBSERVERS_MAP.get(subject);
if (CollectionUtil.isEmpty(observers)) {
observers = new ArrayList();
}
observers.add(observer);
OBSERVERS_MAP.put(subject, observers);
}
@ -90,12 +88,11 @@ public class AbstractSubjectCenter {
* @param observer
*/
public static void remove(String subject, Observer observer) {
List<Observer> observers;
if (StringUtil.isBlank(subject) || CollectionUtil.isEmpty((observers = OBSERVERS_MAP.get(subject))) || observer == null) {
List<Observer> observers = OBSERVERS_MAP.get(subject);
if (StringUtil.isBlank(subject) || CollectionUtil.isEmpty(observers) || observer == null) {
log.warn("Remove observer. A string whose subject or observer is empty or empty.");
return;
}
observers.remove(observer);
}
@ -121,7 +118,6 @@ public class AbstractSubjectCenter {
log.warn("Under the subject, there is no observer group.");
return;
}
observers.parallelStream().forEach(each -> {
try {
each.accept(observerMessage);
@ -131,6 +127,9 @@ public class AbstractSubjectCenter {
});
}
/**
* Subject type.
*/
public enum SubjectType {
/**

3
hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
Unescape View File

@ -26,6 +26,9 @@ import java.util.concurrent.ThreadFactory;
*/
public class ExecutorFactory {
/**
* Thread pool management tool.
*/
public static final class Managed {
private static final String DEFAULT_NAMESPACE = "dynamic.thread-pool";

6
hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
Unescape View File

@ -32,7 +32,7 @@ public class ThreadPoolManager {
private Map<String, Map<String, Set<ExecutorService>>> resourcesManager;
private Map<String, Object> lockers = new ConcurrentHashMap(8);
private Map<String, Object> lockers = new ConcurrentHashMap();
private static final ThreadPoolManager INSTANCE = new ThreadPoolManager();
@ -47,7 +47,7 @@ public class ThreadPoolManager {
}
private void init() {
resourcesManager = new ConcurrentHashMap(8);
resourcesManager = new ConcurrentHashMap();
}
public void register(String tenantId, String group, ExecutorService executor) {
@ -60,7 +60,7 @@ public class ThreadPoolManager {
synchronized (monitor) {
Map<String, Set<ExecutorService>> map = resourcesManager.get(tenantId);
if (map == null) {
map = new HashMap(8);
map = new HashMap();
map.put(group, new HashSet());
map.get(group).add(executor);
resourcesManager.put(tenantId, map);

12
hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnum.java
Unescape View File

@ -24,7 +24,13 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.*;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.SynchronousQueue;
import java.util.stream.Stream;
/**
@ -78,6 +84,8 @@ public enum BlockingQueueTypeEnum {
this.name = name;
}
private static final int DEFAULT_CAPACITY = 1024;
static {
DynamicThreadPoolServiceLoader.register(CustomBlockingQueue.class);
}
@ -105,7 +113,7 @@ public enum BlockingQueueTypeEnum {
.orElseGet(() -> {
int temCapacity = capacity;
if (capacity == null || capacity <= 0) {
temCapacity = 1024;
temCapacity = DEFAULT_CAPACITY;
}
return new LinkedBlockingQueue(temCapacity);
}));

2
hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/RejectedPolicyTypeEnum.java
Unescape View File

@ -50,7 +50,7 @@ public enum RejectedPolicyTypeEnum {
@Getter
private String name;
public RejectedExecutionHandler rejectedHandler;
private RejectedExecutionHandler rejectedHandler;
RejectedPolicyTypeEnum(Integer type, String name, RejectedExecutionHandler rejectedHandler) {
this.type = type;

28
hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java
Unescape View File

@ -17,11 +17,15 @@
package cn.hippo4j.common.executor.support;
import java.util.AbstractQueue;
import java.util.Collection;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
/**
* A clone of {@linkplain java.util.concurrent.LinkedBlockingQueue}
@ -61,8 +65,8 @@ import java.util.*;
**/
public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
implements
BlockingQueue<E>,
java.io.Serializable {
BlockingQueue<E>,
java.io.Serializable {
private static final long serialVersionUID = -6903933977591709194L;
@ -229,8 +233,9 @@ public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
*/
public ResizableCapacityLinkedBlockingQueue(Collection<? extends E> c) {
this(Integer.MAX_VALUE);
for (Iterator<? extends E> it = c.iterator(); it.hasNext();)
for (Iterator<? extends E> it = c.iterator(); it.hasNext(); ) {
add(it.next());
}
}
// this doc comment is overridden to remove the reference to collections
@ -352,7 +357,7 @@ public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
final AtomicInteger count = this.count;
putLock.lockInterruptibly();
try {
for (;;) {
for (; ; ) {
if (count.get() < capacity) {
insert(o);
c = count.getAndIncrement();
@ -458,7 +463,7 @@ public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
final ReentrantLock takeLock = this.takeLock;
takeLock.lockInterruptibly();
try {
for (;;) {
for (; ; ) {
if (count.get() > 0) {
x = extract();
c = count.getAndDecrement();
@ -698,6 +703,9 @@ public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
return new Itr();
}
/**
* Itr.
*/
private class Itr implements Iterator<E> {
/*
@ -824,7 +832,7 @@ public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
last = head = new Node<E>(null);
// Read in all elements and place in queue
for (;;) {
for (; ; ) {
@SuppressWarnings("unchecked")
E item = (E) s.readObject();
if (item == null) {
@ -833,4 +841,4 @@ public class ResizableCapacityLinkedBlockingQueue<E> extends AbstractQueue<E>
add(item);
}
}
}
}

9
hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
Unescape View File

@ -113,6 +113,9 @@ public class InstanceInfo {
this.actionType = actionType;
}
/**
* Instance status.
*/
public enum InstanceStatus {
/**
@ -153,6 +156,9 @@ public class InstanceInfo {
}
}
/**
* Action type.
*/
public enum ActionType {
/**
* ADDED
@ -170,6 +176,9 @@ public class InstanceInfo {
DELETED
}
/**
* Instance renew.
*/
@Data
@Accessors(chain = true)
public static class InstanceRenew {

2
hippo4j-common/src/main/java/cn/hippo4j/common/model/WebIpAndPortInfo.java
Unescape View File

@ -103,4 +103,4 @@ public class WebIpAndPortInfo {
protected boolean contrastSegment(String appIp, String propIp) {
return ALL.equals(propIp) || appIp.equals(propIp);
}
}
}

5
hippo4j-common/src/main/java/cn/hippo4j/common/model/register/notify/DynamicThreadPoolRegisterCoreNotifyParameter.java
Unescape View File

@ -17,7 +17,10 @@
package cn.hippo4j.common.model.register.notify;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* Dynamic thread-pool register core notify parameter.

9
hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java
Unescape View File

@ -18,7 +18,11 @@
package cn.hippo4j.common.spi;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@ -86,7 +90,8 @@ public class DynamicThreadPoolServiceLoader {
private static Object newServiceInstance(final Class<?> clazz) {
try {
return clazz.getDeclaredConstructor().newInstance();
} catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
} catch (InstantiationException | IllegalAccessException | InvocationTargetException
| NoSuchMethodException e) {
throw new ServiceLoaderInstantiationException(clazz, e);
}
}

8
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java
Unescape View File

@ -24,9 +24,11 @@ import java.text.DecimalFormat;
*/
public class ByteConvertUtil {
public static final Integer KB_SIZE = 2 << 9;
public static final Integer MB_SIZE = 2 << 19;
public static final Integer GB_SIZE = 2 << 29;
public static final int KB_SIZE = 2 << 9;
public static final int MB_SIZE = 2 << 19;
public static final int GB_SIZE = 2 << 29;
public static String getPrintSize(long size) {
DecimalFormat df = new DecimalFormat("#.00");

4
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CalculateUtil.java
Unescape View File

@ -25,7 +25,9 @@ package cn.hippo4j.common.toolkit;
*/
public class CalculateUtil {
private static final int PERCENTAGE = 100;
public static int divide(int num1, int num2) {
return ((int) (Double.parseDouble(num1 + "") / Double.parseDouble(num2 + "") * 100));
return ((int) (Double.parseDouble(num1 + "") / Double.parseDouble(num2 + "") * PERCENTAGE));
}
}

11
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
Unescape View File

@ -35,11 +35,12 @@ public class CollectionUtil {
* @return
*/
public static <T> T getFirst(Iterable<T> iterable) {
Iterator<T> iterator;
if (iterable != null && (iterator = iterable.iterator()) != null && iterator.hasNext()) {
return iterator.next();
if (iterable != null) {
Iterator<T> iterator = iterable.iterator();
if (iterator != null && iterator.hasNext()) {
return iterator.next();
}
}
return null;
}
@ -90,7 +91,7 @@ public class CollectionUtil {
* @return
*/
public static boolean isEmpty(Iterator<?> iterator) {
return null == iterator || false == iterator.hasNext();
return null == iterator || !iterator.hasNext();
}
/**

4
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/FileUtil.java
Unescape View File

@ -29,6 +29,8 @@ import java.io.InputStream;
*/
public class FileUtil {
private static final int ERROR_CODE = -1;
@SneakyThrows
public static String readUtf8String(String path) {
String resultReadStr;
@ -38,7 +40,7 @@ public class FileUtil {
BufferedInputStream bis = new BufferedInputStream(inputStream);
ByteArrayOutputStream buf = new ByteArrayOutputStream()) {
int result = bis.read();
while (result != -1) {
while (result != ERROR_CODE) {
buf.write((byte) result);
result = bis.read();
}

18
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
Unescape View File

@ -33,6 +33,16 @@ public class Md5Util {
private static final char[] DIGITS_LOWER = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
private static final char XF0 = 0xF0;
private static final char XF = 0x0F;
private static final int DATA_ID_GROUP_ID_THREE_LEN = 3;
private static final int DATA_ID_GROUP_ID_FOUR_LEN = 4;
private static final int DISPLACEMENT = 4;
private static final ThreadLocal<MessageDigest> MESSAGE_DIGEST_LOCAL = ThreadLocal.withInitial(() -> {
try {
return MessageDigest.getInstance("MD5");
@ -65,8 +75,8 @@ public class Md5Util {
int l = bytes.length;
char[] out = new char[l << 1];
for (int i = 0, j = 0; i < l; i++) {
out[j++] = DIGITS_LOWER[(0xF0 & bytes[i]) >>> 4];
out[j++] = DIGITS_LOWER[0x0F & bytes[i]];
out[j++] = DIGITS_LOWER[(XF0 & bytes[i]) >>> DISPLACEMENT];
out[j++] = DIGITS_LOWER[XF & bytes[i]];
}
return new String(out);
}
@ -86,12 +96,12 @@ public class Md5Util {
sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[1]);
// if have tenant, then set it
if (dataIdGroupId.length == 3) {
if (dataIdGroupId.length == DATA_ID_GROUP_ID_THREE_LEN) {
if (StringUtil.isNotBlank(dataIdGroupId[2])) {
sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[2]);
}
} else if (dataIdGroupId.length == 4) {
} else if (dataIdGroupId.length == DATA_ID_GROUP_ID_FOUR_LEN) {
if (StringUtil.isNotBlank(dataIdGroupId[2])) {
sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[2]);

4
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
Unescape View File

@ -61,7 +61,7 @@ public class ReflectUtil {
}
public static <T extends AccessibleObject> T setAccessible(T accessibleObject) {
if (null != accessibleObject && false == accessibleObject.isAccessible()) {
if (null != accessibleObject && !accessibleObject.isAccessible()) {
accessibleObject.setAccessible(true);
}
return accessibleObject;
@ -121,7 +121,7 @@ public class ReflectUtil {
cn.hutool.core.lang.Assert.notNull(field, "Field in [{}] not exist !", obj);
final Class<?> fieldType = field.getType();
if (null != value) {
if (false == fieldType.isAssignableFrom(value.getClass())) {
if (!fieldType.isAssignableFrom(value.getClass())) {
final Object targetValue = Convert.convert(fieldType, value);
if (null != targetValue) {
value = targetValue;

7
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java
Unescape View File

@ -55,8 +55,11 @@ public final class Singleton {
*/
public static <T> T get(String key, Supplier<T> supplier) {
Object result = SINGLE_OBJECT_POOL.get(key);
if (result == null && (result = supplier.get()) != null) {
SINGLE_OBJECT_POOL.put(key, result);
if (result == null) {
result = supplier.get();
if (result != null) {
SINGLE_OBJECT_POOL.put(key, result);
}
}
return result != null ? (T) result : null;
}

13
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
Unescape View File

@ -63,14 +63,17 @@ public class StringUtil {
* @return
*/
public static boolean isBlank(CharSequence str) {
int length;
if ((str == null) || ((length = str.length()) == 0)) {
if ((str == null)) {
return true;
}
int length = str.length();
if (length == 0) {
return true;
}
for (int i = 0; i < length; i++) {
char c = str.charAt(i);
boolean charNotBlank = Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\ufeff' || c == '\u202a';
if (charNotBlank == false) {
if (!charNotBlank) {
return false;
}
}
@ -104,7 +107,7 @@ public class StringUtil {
* @return
*/
public static boolean isNotBlank(CharSequence str) {
return isBlank(str) == false;
return !isBlank(str);
}
/**
@ -114,7 +117,7 @@ public class StringUtil {
* @return
*/
public static boolean isAllNotEmpty(CharSequence... args) {
return false == hasEmpty(args);
return !hasEmpty(args);
}
/**

3
hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
Unescape View File

@ -46,6 +46,9 @@ public class UserContext {
USER_THREAD_LOCAL.remove();
}
/**
* User info.
*/
@Data
@NoArgsConstructor
@AllArgsConstructor

2
hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/AbstractException.java
Unescape View File

@ -25,7 +25,7 @@ import lombok.Getter;
public class AbstractException extends RuntimeException {
@Getter
public final ErrorCode errorCode;
private final ErrorCode errorCode;
public AbstractException(String message, Throwable throwable, ErrorCode errorCode) {
super(message, throwable);

8
hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java
Unescape View File

@ -59,9 +59,9 @@ public class ServiceException extends AbstractException {
@Override
public String toString() {
return "ServiceException{" +
"code='" + errorCode.getCode() + "'," +
"message='" + errorCode.getMessage() + "'" +
'}';
return "ServiceException{"
+ "code='" + getErrorCode().getCode() + "',"
+ "message='" + getErrorCode().getMessage() + "'"
+ '}';
}
}

3
hippo4j-common/src/test/java/cn/hippo4j/common/function/MatcherFunctionTest.java
Unescape View File

@ -18,9 +18,10 @@
package cn.hippo4j.common.function;
import cn.hippo4j.common.toolkit.Assert;
import java.math.BigDecimal;
import org.junit.Test;
import java.math.BigDecimal;
public final class MatcherFunctionTest {
public static <T> boolean matchTest(Matcher<T> matcher, T value) {

Write Preview
Loading…
Cancel
Save