javax.annotation包迁移至org.redkale.annotation; javax.persistence包迁移至org.redkale.persistence

src/test/java/org/redkale/test/convert/BsonMainTest.java

@@ -9,14 +9,16 @@ import java.io.*;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.redkale.annotation.ConstructorParameters;
 import org.redkale.convert.bson.BsonByteBufferWriter;
 import org.redkale.convert.bson.BsonFactory;
+import org.redkale.persistence.Id;
+import org.redkale.persistence.Transient;
 import org.redkale.util.Utility;
 import org.redkale.convert.bson.BsonConvert;
 
 import java.nio.*;
 import java.util.*;
-import javax.persistence.*;
 
 import org.redkale.convert.json.*;
 import org.redkale.util.*;

src/test/java/org/redkale/test/convert/Fortune.java

@@ -5,7 +5,7 @@
  */
 package org.redkale.test.convert;
 
-import javax.persistence.Id;
+import org.redkale.persistence.Id;
 import org.redkale.convert.json.JsonConvert;
 
 /**

src/test/java/org/redkale/test/convert/World.java

@@ -5,7 +5,7 @@
  */
 package org.redkale.test.convert;
 
-import javax.persistence.Id;
+import org.redkale.persistence.Id;
 import org.redkale.convert.json.JsonConvert;
 
 /**

src/test/java/org/redkale/test/rest/HelloEntity.java

@@ -1,10 +1,10 @@
 package org.redkale.test.rest;
 
 import java.util.Map;
-import javax.persistence.Id;
+import org.redkale.persistence.Id;
 import org.redkale.convert.json.JsonFactory;
 import org.redkale.net.http.*;
-import org.redkale.source.VirtualEntity;
+import org.redkale.persistence.VirtualEntity;
 
 @VirtualEntity
 public class HelloEntity {

src/test/java/org/redkale/test/rest/HelloService.java

@@ -3,7 +3,7 @@ package org.redkale.test.rest;
 import java.nio.channels.CompletionHandler;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.*;
 
 import org.redkale.service.*;

src/test/java/org/redkale/test/rest/HelloService2.java

@@ -5,7 +5,7 @@
  */
 package org.redkale.test.rest;
 
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.service.*;
 import org.redkale.source.*;

src/test/java/org/redkale/test/rest/SimpleRestServlet.java

@@ -1,7 +1,7 @@
 package org.redkale.test.rest;
 
 import java.io.IOException;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 
 import org.redkale.net.http.*;
 import org.redkale.service.RetResult;

src/test/java/org/redkale/test/rest/UserInfo.java

@@ -1,6 +1,6 @@
 package org.redkale.test.rest;
 
-import javax.persistence.Id;
+import org.redkale.persistence.Id;
 import org.redkale.convert.json.JsonFactory;
 
 /**

src/test/java/org/redkale/test/rest/_DynHelloRestServlet1.java

@@ -2,7 +2,7 @@ package org.redkale.test.rest;
 
 import java.io.IOException;
 import java.util.*;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.service.RetResult;
 import org.redkale.source.Flipper;

src/test/java/org/redkale/test/rest/_DynHelloRestServlet2.java

@@ -7,7 +7,7 @@ package org.redkale.test.rest;
 
 import java.io.IOException;
 import java.util.Map;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.service.RetResult;
 import org.redkale.source.Flipper;

src/test/java/org/redkale/test/service/ABMainService.java

@@ -12,7 +12,7 @@ import java.nio.channels.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.logging.*;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.convert.bson.BsonConvert;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.net.*;

src/test/java/org/redkale/test/service/BCService.java

@@ -6,7 +6,7 @@
 package org.redkale.test.service;
 
 import java.nio.channels.CompletionHandler;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.service.*;
 import org.redkale.util.*;
 

src/test/java/org/redkale/test/sncp/SncpTestBean.java

@@ -6,9 +6,9 @@
 package org.redkale.test.sncp;
 
 import org.redkale.convert.bson.BsonFactory;
+import org.redkale.persistence.Id;
 import org.redkale.util.Utility;
 import org.redkale.source.FilterBean;
-import javax.persistence.*;
 import org.redkale.convert.json.*;
 
 /**

src/test/java/org/redkale/test/sncp/SncpTestServiceImpl.java

@@ -9,6 +9,8 @@ import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.nio.channels.CompletionHandler;
 import java.util.concurrent.*;
+
+import org.redkale.annotation.ResourceType;
 import org.redkale.net.*;
 import org.redkale.net.sncp.*;
 import org.redkale.service.*;

src/test/java/org/redkale/test/sncp/_DynLocalSncpTestService.java

@@ -6,7 +6,7 @@
 package org.redkale.test.sncp;
 
 import org.redkale.net.sncp.*;
-import org.redkale.util.ResourceType;
+import org.redkale.annotation.ResourceType;
 
 /**
  *

src/test/java/org/redkale/test/source/CacheTestBean.java

@@ -9,8 +9,9 @@ import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
-import javax.persistence.Id;
+import org.redkale.persistence.Id;
 import org.redkale.convert.json.JsonConvert;
+import org.redkale.persistence.VirtualEntity;
 import org.redkale.source.*;
 
 /**

src/test/java/org/redkale/test/source/FilterNodeTest.java

@@ -5,8 +5,11 @@
  */
 package org.redkale.test.source;
 
+import org.redkale.persistence.Cacheable;
+import org.redkale.persistence.Id;
+import org.redkale.persistence.Transient;
 import org.redkale.source.*;
-import org.redkale.util.AutoLoad;
+import org.redkale.annotation.AutoLoad;
 
 import static org.redkale.source.FilterExpress.*;
 
@@ -14,7 +17,6 @@ import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.*;
-import javax.persistence.*;
 
 import org.redkale.convert.json.*;
 

src/test/java/org/redkale/test/source/JsonRecord.java

@@ -7,8 +7,10 @@ package org.redkale.test.source;
 
 import java.io.Serializable;
 import java.util.*;
-import javax.persistence.*;
+
 import org.redkale.convert.json.JsonConvert;
+import org.redkale.persistence.Column;
+import org.redkale.persistence.Id;
 import org.redkale.source.*;
 import org.redkale.util.AnyValue.DefaultAnyValue;
 

src/test/java/org/redkale/test/source/LoginRecord.java

@@ -6,7 +6,10 @@
 package org.redkale.test.source;
 
 import java.io.Serializable;
-import javax.persistence.*;
+
+import org.redkale.persistence.Column;
+import org.redkale.source.DistributeTable;
+import org.redkale.persistence.Id;
 import org.redkale.source.*;
 import org.redkale.util.Utility;
 

src/test/java/org/redkale/test/source/LoginTestRecord.java

@@ -5,8 +5,8 @@
  */
 package org.redkale.test.source;
 
-import javax.persistence.*;
 import org.redkale.convert.json.*;
+import org.redkale.persistence.Id;
 
 /**
  * CREATE TABLE `LoginTestRecord` (

src/test/java/org/redkale/test/source/LoginUserRecord.java

@@ -6,7 +6,10 @@
 package org.redkale.test.source;
 
 import java.io.Serializable;
-import javax.persistence.*;
+
+import org.redkale.persistence.Column;
+import org.redkale.source.DistributeTable;
+import org.redkale.persistence.Id;
 import org.redkale.source.*;
 
 /**

src/test/java/org/redkale/test/source/TestSourceCache.java

@@ -7,7 +7,10 @@ package org.redkale.test.source;
 
 import java.lang.reflect.Method;
 import java.util.*;
-import org.redkale.source.VirtualEntity;
+
+import org.redkale.persistence.Cacheable;
+import org.redkale.persistence.Id;
+import org.redkale.persistence.VirtualEntity;
 import org.redkale.source.FilterNodeBean;
 import org.redkale.source.FilterExpress;
 import org.redkale.source.FilterColumn;
@@ -18,7 +21,7 @@ import org.redkale.source.EntityInfo;
 import org.redkale.source.FilterNode;
 import java.util.concurrent.*;
 import java.util.function.BiFunction;
-import javax.persistence.*;
+
 import org.redkale.convert.json.*;
 import org.redkale.source.*;
 

src/test/java/org/redkale/test/source/UserDetail.java

@@ -6,8 +6,11 @@
 package org.redkale.test.source;
 
 import java.io.Serializable;
-import javax.persistence.*;
+
 import org.redkale.convert.*;
+import org.redkale.persistence.Column;
+import org.redkale.source.DistributeTable;
+import org.redkale.persistence.Id;
 import org.redkale.source.*;
 
 /**

src/test/java/org/redkale/test/util/CreatorRecord.java

@@ -5,6 +5,7 @@
  */
 package org.redkale.test.util;
 
+import org.redkale.annotation.ConstructorParameters;
 import org.redkale.convert.json.*;
 import org.redkale.util.*;
 

src/test/java/org/redkale/test/util/ResourceListenerTest.java

@@ -4,8 +4,9 @@ package org.redkale.test.util;
 
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.junit.jupiter.api.*;
+import org.redkale.annotation.ResourceListener;
 import org.redkale.util.*;
 
 /**

src/test/java/org/redkale/test/util/ResourceLoaderTest.java

@@ -2,7 +2,7 @@
  */
 package org.redkale.test.util;
 
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.junit.jupiter.api.*;
 import org.redkale.convert.json.JsonFactory;
 import org.redkale.util.*;

src/test/java/org/redkale/test/util/ResourceTest.java

@@ -7,8 +7,10 @@ package org.redkale.test.util;
 
 import java.math.*;
 import java.util.Properties;
-import javax.annotation.*;
+import org.redkale.annotation.*;
 import org.junit.jupiter.api.Test;
+import org.redkale.annotation.ConstructorParameters;
+import org.redkale.annotation.ResourceListener;
 import org.redkale.util.*;
 
 /**

src/test/java/org/redkale/test/websocket/ChatWebSocketServlet.java

@@ -9,7 +9,7 @@ import org.redkale.net.http.WebServlet;
 import org.redkale.net.http.WebSocketServlet;
 import org.redkale.net.http.WebSocket;
 import java.util.concurrent.CompletableFuture;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.test.rest.*;
 import org.redkale.util.*;

src/test/java/org/redkale/test/ws/ChatService.java

@@ -8,10 +8,10 @@ package org.redkale.test.ws;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.WebSocketNode;
 import org.redkale.service.*;
-import org.redkale.util.Comment;
+import org.redkale.annotation.Comment;
 
 /**
  *

src/test/java/org/redkale/test/ws/ChatWebSocket.java

@@ -7,7 +7,7 @@ package org.redkale.test.ws;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.service.RetResult;
 import org.redkale.test.rest.*;

src/test/java/org/redkale/test/wsdync/_DyncChatWebSocketServlet.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.util.*;
 import java.util.function.BiConsumer;
-import javax.annotation.Resource;
+import org.redkale.annotation.Resource;
 import org.redkale.convert.ConvertDisabled;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.net.http.*;