Merge pull request #401 from wcnnkh/dev

Dev
wcnnkh · Mar 23, 2023 · c2791f9 · c2791f9
2 parents d0e96bf + 10da734
commit c2791f9
Show file tree

Hide file tree

Showing 186 changed files with 2,359 additions and 2,420 deletions.
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>activemq-broker</artifactId>
 	<dependencies>

diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>activemq-client</artifactId>
 	<dependencies>

diff --git a/amqp/pom.xml b/amqp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.basc.framework</groupId>
     <artifactId>framework</artifactId>
-    <version>1.8.2</version>
+    <version>1.8.3</version>
   </parent>
   <artifactId>amqp</artifactId>
   <dependencies>

diff --git a/amqp/src/main/java/io/basc/framework/amqp/AbstractExchange.java b/amqp/src/main/java/io/basc/framework/amqp/AbstractExchange.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import io.basc.framework.json.JsonUtils;
 import io.basc.framework.lang.NestedExceptionUtils;
 import io.basc.framework.logger.Logger;
 import io.basc.framework.logger.LoggerFactory;
@@ -135,7 +134,7 @@ public void onMessage(String exchange, String routingKey, Message<T> message) th
 				// 这是一个延迟消息
 				if (logger.isDebugEnabled()) {
 					logger.debug("delay message forward exchange:{}, routingKey:{}, message:{}", exchange, routingKey,
-							JsonUtils.getSupport().toJsonString(message));
+							message);
 				}
 
 				message.setDelay(0, TimeUnit.SECONDS);
@@ -148,16 +147,15 @@ public void onMessage(String exchange, String routingKey, Message<T> message) th
 				int delay = 1;
 				TimeUnit delayTimeUnit = TimeUnit.SECONDS;
 				logger.error("retry delay: {}, Unable to consume exchange:{}, routingKey:{}, message:{}",
-						delayTimeUnit.toMillis(delay), exchange, routingKeyToUse,
-						JsonUtils.getSupport().toJsonString(message));
+						delayTimeUnit.toMillis(delay), exchange, routingKeyToUse, message);
 				message.setDelay(delay, delayTimeUnit);
 				retryPush(routingKeyToUse, message);
 				return;
 			}
 
 			if (logger.isDebugEnabled()) {
 				logger.debug("handleDelivery exchange:{}, routingKey:{}, message:{}", exchange, routingKeyToUse,
-						JsonUtils.getSupport().toJsonString(message));
+						message);
 			}
 
 			// 开始消费消息
@@ -190,11 +188,10 @@ public void onMessage(String exchange, String routingKey, Message<T> message) th
 						|| (maxRetryCount > 0 && message.getRetryCount() > maxRetryCount)) {// 不重试
 					logger.error(NestedExceptionUtils.getRootCause(e),
 							"Don't try again: exchange={}, routingKey={}, message={}", exchange, routingKeyToUse,
-							JsonUtils.getSupport().toJsonString(message));
+							message);
 				} else {
 					logger.error(NestedExceptionUtils.getRootCause(e),
-							"retry delay: {}, exchange={}, routingKey={}, message={}", retryDelay, exchange,
-							routingKeyToUse, JsonUtils.getSupport().toJsonString(message));
+							"retry delay: {}, exchange={}, routingKey={}, message={}", retryDelay, exchange, message);
 					message.setDelay(retryDelay, TimeUnit.MILLISECONDS);
 					retryPush(routingKeyToUse, message);
 				}

diff --git a/amqp/src/main/java/io/basc/framework/amqp/Message.java b/amqp/src/main/java/io/basc/framework/amqp/Message.java
@@ -1,7 +1,13 @@
 package io.basc.framework.amqp;
 
 import io.basc.framework.util.Assert;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class Message<T> extends MessageProperties {
 	private static final long serialVersionUID = 1L;
 	private final T body;

diff --git a/amqp/src/main/java/io/basc/framework/amqp/MessageProperties.java b/amqp/src/main/java/io/basc/framework/amqp/MessageProperties.java
@@ -12,7 +12,9 @@
 import io.basc.framework.script.MathScriptEngine;
 import io.basc.framework.util.StringUtils;
 import io.basc.framework.value.Value;
+import lombok.Data;
 
+@Data
 public class MessageProperties implements Serializable, Cloneable {
 	private static final long serialVersionUID = 1L;
 	private static final String DELAY_MESSAGE = "framework.amqp.message.delay";
@@ -38,7 +40,7 @@ public class MessageProperties implements Serializable, Cloneable {
 	private String userId;
 	private String appId;
 	private String clusterId;
-	
+
 	public MessageProperties() {
 	}
 
@@ -66,122 +68,10 @@ public MessageProperties clone() {
 		return new MessageProperties(this);
 	}
 
-	public String getContentType() {
-		return contentType;
-	}
-
-	public void setContentType(String contentType) {
-		this.contentType = contentType;
-	}
-
-	public String getContentEncoding() {
-		return contentEncoding;
-	}
-
-	public void setContentEncoding(String contentEncoding) {
-		this.contentEncoding = contentEncoding;
-	}
-
-	public Map<String, Object> getHeaders() {
-		return headers;
-	}
-
-	public void setHeaders(Map<String, Object> headers) {
-		this.headers = headers;
-	}
-
-	public Integer getDeliveryMode() {
-		return deliveryMode;
-	}
-
-	public void setDeliveryMode(Integer deliveryMode) {
-		this.deliveryMode = deliveryMode;
-	}
-
-	public Integer getPriority() {
-		return priority;
-	}
-
-	public void setPriority(Integer priority) {
-		this.priority = priority;
-	}
-
-	public String getCorrelationId() {
-		return correlationId;
-	}
-
-	public void setCorrelationId(String correlationId) {
-		this.correlationId = correlationId;
-	}
-
-	public String getReplyTo() {
-		return replyTo;
-	}
-
-	public void setReplyTo(String replyTo) {
-		this.replyTo = replyTo;
-	}
-
-	public String getExpiration() {
-		return expiration;
-	}
-
-	public void setExpiration(Long expiration) {
+	public void setLongExpiration(Long expiration) {
 		this.expiration = expiration == null ? null : ("" + expiration);
 	}
 
-	public void setExpiration(String expiration) {
-		this.expiration = expiration;
-	}
-
-	public String getMessageId() {
-		return messageId;
-	}
-
-	public void setMessageId(String messageId) {
-		this.messageId = messageId;
-	}
-
-	public Date getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Date timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getAppId() {
-		return appId;
-	}
-
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-
-	public String getClusterId() {
-		return clusterId;
-	}
-
-	public void setClusterId(String clusterId) {
-		this.clusterId = clusterId;
-	}
-
 	public Object getHeader(String name) {
 		if (headers == null) {
 			return null;
@@ -226,7 +116,7 @@ public MessageProperties setDelay(long delay, TimeUnit timeUnit) {
 			removeHeader(DELAY_MESSAGE);
 			setExpiration((String) null);
 		} else {
-			setExpiration(timeUnit.toMillis(delay));
+			setLongExpiration(timeUnit.toMillis(delay));
 			setHeader(DELAY_MESSAGE, getExpiration());
 		}
 		return this;

diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>apollo-client</artifactId>
 	<dependencies>

diff --git a/apollo-client/src/main/java/io/basc/framework/apollo/client/ApolloClientPropertyFactory.java b/apollo-client/src/main/java/io/basc/framework/apollo/client/ApolloClientPropertyFactory.java
@@ -9,7 +9,7 @@
 
 import io.basc.framework.context.annotation.Provider;
 import io.basc.framework.event.ChangeEvent;
-import io.basc.framework.event.EventTypes;
+import io.basc.framework.event.ChangeType;
 import io.basc.framework.event.support.StandardBroadcastEventDispatcher;
 import io.basc.framework.value.PropertyFactory;
 import io.basc.framework.value.Value;
@@ -37,6 +37,6 @@ public Value get(String key) {
 
 	@Override
 	public void onChange(ConfigChangeEvent changeEvent) {
-		publishEvent(new ChangeEvent<Collection<String>>(EventTypes.UPDATE, changeEvent.changedKeys()));
+		publishEvent(new ChangeEvent<Collection<String>>(ChangeType.UPDATE, changeEvent.changedKeys()));
 	}
 }
diff --git a/boot/pom.xml b/boot/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>boot</artifactId>
 	<dependencies>

diff --git a/boot/src/main/java/io/basc/framework/boot/support/DefaultApplication.java b/boot/src/main/java/io/basc/framework/boot/support/DefaultApplication.java
@@ -90,7 +90,7 @@ public void startServer() {
 
 	@Override
 	public void destroy() {
-		getLogger().info(new SplitLine("Start destroying application[{}]"), this);
+		getLogger().info(new SplitLine("Start destroying application[{}]").toString(), this);
 		super.destroy();
 	}
 

diff --git a/cloud/pom.xml b/cloud/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>cloud</artifactId>
 

diff --git a/consistency/pom.xml b/consistency/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>consistency</artifactId>
 	<dependencies>

diff --git a/console/pom.xml b/console/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>console</artifactId>
 

diff --git a/context/pom.xml b/context/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>context</artifactId>
 	<dependencies>

diff --git a/context/src/main/java/io/basc/framework/context/ioc/IocProcessor.java b/context/src/main/java/io/basc/framework/context/ioc/IocProcessor.java
@@ -9,7 +9,6 @@
 import io.basc.framework.logger.Logger;
 import io.basc.framework.logger.LoggerFactory;
 import io.basc.framework.mapper.Field;
-import io.basc.framework.mapper.MapperUtils;
 
 public abstract class IocProcessor implements BeanPostProcessor {
 	protected static Logger logger = LoggerFactory.getLogger(IocProcessor.class);
@@ -41,10 +40,5 @@ public void checkField(Object obj, Field field) {
 			logger.warn("class [{}] field [{}] is a static", field.getSetter().getDeclaringClass(),
 					field.getSetter().getName());
 		}
-
-		if (MapperUtils.isExistValue(field, obj)) {
-			logger.warn("class[{}] fieldName[{}] existence default value", field.getSetter().getDeclaringClass(),
-					field.getSetter().getName());
-		}
 	}
 }
diff --git a/context/src/main/java/io/basc/framework/context/xml/XmlBeanDefinition.java b/context/src/main/java/io/basc/framework/context/xml/XmlBeanDefinition.java
@@ -56,11 +56,10 @@ public XmlBeanDefinition(Context context, Class<?> targetClass, Node beanNode) t
 		setSingleton(XmlBeanUtils.isSingleton(beanNode));
 	}
 
-	@SuppressWarnings("unchecked")
 	protected Collection<String> getFilters(Node node) {
 		String filters = DomUtils.getNodeAttributeValue(node, "filters").getAsString();
 		if (StringUtils.isEmpty(filters)) {
-			return Collections.EMPTY_LIST;
+			return Collections.emptyList();
 		}
 
 		return Arrays.asList(StringUtils.splitToArray(filters));
@@ -84,7 +83,7 @@ public boolean isInstance() {
 			return super.isInstance();
 		}
 
-		for (ParameterDescriptors parameterDescriptors : this) { 
+		for (ParameterDescriptors parameterDescriptors : this) {
 			if (xmlParameterFactory.isAccept(parameterDescriptors)) {
 				return true;
 			}

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.basc.framework</groupId>
 		<artifactId>framework</artifactId>
-		<version>1.8.2</version>
+		<version>1.8.3</version>
 	</parent>
 	<artifactId>core</artifactId>
 	<dependencies>