Merge branch '1.2.0-coding'

# Conflicts: # README.md
zjn-zjn · Apr 10, 2023 · 1fbeae0 · 1fbeae0
2 parents b343527 + 0796265
commit 1fbeae0
Show file tree

Hide file tree

Showing 83 changed files with 2,073 additions and 715 deletions.
diff --git a/ice-client-spring-boot-autoconfigure/pom.xml b/ice-client-spring-boot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </parent>
  <packaging>jar</packaging>
  <artifactId>ice-client-spring-boot-autoconfigure</artifactId>
@@ -16,7 +16,7 @@
  <dependency>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice-client</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </dependency>
  </dependencies>
 

diff --git a/ice-client-spring-boot-starter/pom.xml b/ice-client-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </parent>
  <packaging>jar</packaging>
  <artifactId>ice-client-spring-boot-starter</artifactId>
@@ -16,7 +16,7 @@
  <dependency>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice-client-spring-boot-autoconfigure</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/ice-client/pom.xml b/ice-client/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </parent>
  <packaging>jar</packaging>
  <artifactId>ice-client</artifactId>
@@ -16,7 +16,7 @@
  <dependency>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice-core</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/ice-client/src/main/java/com/ice/client/config/IceNioClientInit.java b/ice-client/src/main/java/com/ice/client/config/IceNioClientInit.java
@@ -8,8 +8,6 @@
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * waiting ice nio client init
  *
@@ -19,7 +17,7 @@
 @DependsOn("iceSpringBeanFactory")
 public class IceNioClientInit implements InitializingBean, DisposableBean {
 
- @Resource
+ @Autowired
  private IceClientProperties properties;
 
  private IceNioClient iceNioClient;

diff --git a/ice-client/src/main/java/com/ice/client/config/IceSpringBeanFactory.java b/ice-client/src/main/java/com/ice/client/config/IceSpringBeanFactory.java
@@ -9,6 +9,7 @@
 /**
  * use AutowireCapableBeanFactory
  * for autowired spring beans for leaf node
+ *
  * @author waitmoon
  */
 @Component

diff --git a/ice-common/pom.xml b/ice-common/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </parent>
 
  <artifactId>ice-common</artifactId>

diff --git a/ice-common/src/main/java/com/ice/common/constant/Constant.java b/ice-common/src/main/java/com/ice/common/constant/Constant.java
@@ -0,0 +1,12 @@
+package com.ice.common.constant;
+
+public final class Constant {
+ public static final String REGEX_COMMA = ",";
+
+ public static String removeLast(StringBuilder sb) {
+ if (sb == null || sb.length() == 0) {
+ return "";
+ }
+ return sb.substring(0, sb.length() - 1);
+ }
+}
diff --git a/ice-common/src/main/java/com/ice/common/dto/IceConfDto.java b/ice-common/src/main/java/com/ice/common/dto/IceConfDto.java
@@ -28,6 +28,8 @@ public final class IceConfDto {
 
  private Byte debug;
 
+ private Byte errorState;
+
  private Boolean inverse;
 
  private String name;

diff --git a/ice-common/src/main/java/com/ice/common/enums/NodeRunStateEnum.java b/ice-common/src/main/java/com/ice/common/enums/NodeRunStateEnum.java
@@ -41,7 +41,11 @@ public enum NodeRunStateEnum {
  this.state = state;
  }
 
- public static NodeRunStateEnum getEnum(byte state) {
+ public static NodeRunStateEnum getEnumDefaultShutdown(Byte state) {
+ if (state == null) {
+ //default shutdown
+ return SHUT_DOWN;
+ }
  return MAP.get(state);
  }
 

diff --git a/ice-common/src/main/java/com/ice/common/model/IceShowNode.java b/ice-common/src/main/java/com/ice/common/model/IceShowNode.java
@@ -1,6 +1,5 @@
 package com.ice.common.model;
 
-import com.ice.common.enums.NodeRunStateEnum;
 import lombok.Data;
 
 import java.util.List;
@@ -11,7 +10,7 @@
 @Data
 public class IceShowNode {
 
- private NodeConf showConf;
+ private NodeShowConf showConf;
 
  private IceShowNode forward;
 
@@ -33,20 +32,20 @@ public class IceShowNode {
 
  private Byte timeType;
 
- private Boolean edit;
-
  /**
  * @author waitmoon
  */
  @Data
- public static final class NodeConf {
+ public static final class NodeShowConf {
+ private String uniqueKey;
+
  private Long nodeId;
 
  private Boolean debug;
 
- private Boolean inverse;
+ private Byte errorState;
 
- private NodeRunStateEnum errorStateEnum;
+ private Boolean inverse;
 
  private Byte nodeType;
 
@@ -57,5 +56,11 @@ public static final class NodeConf {
  private String confName;
 
  private String confField;
+ //updating or not
+ private Boolean updating;
+
+ private Boolean haveMeta;
+
+ private LeafNodeInfo nodeInfo;
  }
 }
diff --git a/ice-common/src/main/java/com/ice/common/model/LeafNodeInfo.java b/ice-common/src/main/java/com/ice/common/model/LeafNodeInfo.java
@@ -9,17 +9,15 @@
  */
 @Data
 public final class LeafNodeInfo {
- private byte type;
+ private Byte type;
  private String clazz;
  private String name;
  private String desc;
- private List<FieldInfo> fields;
+ private List<IceFieldInfo> iceFields;
+ private List<IceFieldInfo> hideFields;
 
- /**
- * @author waitmoon
- */
  @Data
- public static class FieldInfo {
+ public static class IceFieldInfo {
  //field name
  private String field;
  //name
@@ -28,7 +26,9 @@ public static class FieldInfo {
  private String desc;
  //client type clazz name, first from config, then declared type
  private String type;
- //value of json while show client conf
- private String value;
+
+ //assemble in server admin node conf
+ private Object value; //json value for web
+ private Boolean valueNull;
  }
 }
diff --git a/ice-common/src/main/java/com/ice/common/utils/JacksonUtils.java b/ice-common/src/main/java/com/ice/common/utils/JacksonUtils.java
diff --git a/ice-core/pom.xml b/ice-core/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </parent>
  <packaging>jar</packaging>
  <artifactId>ice-core</artifactId>
@@ -16,7 +16,7 @@
  <dependency>
  <groupId>com.waitmoon.ice</groupId>
  <artifactId>ice-common</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
  </dependency>
  <dependency>
  <groupId>org.slf4j</groupId>

diff --git a/ice-core/src/main/java/com/ice/core/IceDispatcher.java b/ice-core/src/main/java/com/ice/core/IceDispatcher.java
@@ -1,7 +1,6 @@
 package com.ice.core;
 
 
-import com.ice.common.utils.JacksonUtils;
 import com.ice.core.base.BaseNode;
 import com.ice.core.cache.IceConfCache;
 import com.ice.core.cache.IceHandlerCache;
@@ -10,6 +9,7 @@
 import com.ice.core.context.IceRoam;
 import com.ice.core.handler.IceHandler;
 import com.ice.core.utils.IceExecutor;
+import com.ice.core.utils.JacksonUtils;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/ice-core/src/main/java/com/ice/core/annotation/IceIgnore.java b/ice-core/src/main/java/com/ice/core/annotation/IceIgnore.java
@@ -0,0 +1,15 @@
+package com.ice.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author waitmoon
+ * ignore node/filed
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE})
+public @interface IceIgnore {
+}
diff --git a/ice-core/src/main/java/com/ice/core/base/BaseLeaf.java b/ice-core/src/main/java/com/ice/core/base/BaseLeaf.java
@@ -27,7 +27,4 @@ protected NodeRunStateEnum processNode(IceContext ctx) {
  * process leaf
  */
  protected abstract NodeRunStateEnum doLeaf(IceContext ctx);
-
- public void afterPropertiesSet() {
- }
 }