diff --git a/storage/src/test/java/com/zfoo/storage/ApplicationTest.java b/storage/src/test/java/com/zfoo/storage/ApplicationTest.java index 0bf40684..8cdccf6b 100644 --- a/storage/src/test/java/com/zfoo/storage/ApplicationTest.java +++ b/storage/src/test/java/com/zfoo/storage/ApplicationTest.java @@ -23,7 +23,6 @@ import com.zfoo.storage.resource.StudentResource; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.ClassPathXmlApplicationContext; import java.util.List; @@ -38,13 +37,6 @@ public class ApplicationTest { private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); - @Autowired - public String testSpringInject(IStorage studentStorage) { - StudentResource resource = studentStorage.get(1001); - - return resource.getName(); - } - // storage教程 @Test public void startStorageTest() { diff --git a/storage/src/test/java/com/zfoo/storage/StudentResource.java b/storage/src/test/java/com/zfoo/storage/StudentResource.java deleted file mode 100644 index ed17b72b..00000000 --- a/storage/src/test/java/com/zfoo/storage/StudentResource.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zfoo.storage; - -import com.zfoo.storage.anno.AliasFieldName; -import com.zfoo.storage.anno.Id; -import com.zfoo.storage.anno.Index; -import com.zfoo.storage.anno.Storage; -import com.zfoo.storage.resource.User; - -import java.util.List; - -/** - * @author veione - */ -@Storage -public record StudentResource( - @Id - int id, - @Index(unique = true) - String idCard, - @Index - String name, - @AliasFieldName("年龄") - int age, - float score, - String[] courses, - User[] users, - List userList, - User user -) { -} diff --git a/storage/src/test/java/com/zfoo/storage/resource/TeacherResource.java b/storage/src/test/java/com/zfoo/storage/resource/TeacherResource.java new file mode 100644 index 00000000..75ff84f7 --- /dev/null +++ b/storage/src/test/java/com/zfoo/storage/resource/TeacherResource.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 The zfoo Authors + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package com.zfoo.storage.resource; + +import com.zfoo.storage.anno.AliasFieldName; +import com.zfoo.storage.anno.Id; +import com.zfoo.storage.anno.Index; +import com.zfoo.storage.anno.Storage; + +import java.util.List; + +/** + * @author veione + */ +@Storage +public record TeacherResource( + @Id + int id, + @Index(unique = true) + String idCard, + @Index + String name, + @AliasFieldName("年龄") + int age, + float score, + String[] courses, + User[] users, + List userList, + User user +) { +} diff --git a/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java b/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java index 948cac88..24d6a947 100644 --- a/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java +++ b/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java @@ -1,6 +1,6 @@ package com.zfoo.storage.util.lambda; -import com.zfoo.storage.StudentResource; +import com.zfoo.storage.resource.TeacherResource; import com.zfoo.storage.util.LambdaUtils; import com.zfoo.storage.util.function.Func1; import org.junit.Test; @@ -15,7 +15,7 @@ public class TestLambdaFunction { //https://blog.csdn.net/iteye_19045/article/details/119299015 @Test public void testFuncSerialization() throws Exception { - Func1 func = StudentResource::name; + Func1 func = TeacherResource::name; Object object = getObject(func); System.out.println(object); diff --git a/storage/src/test/resources/excel/TeacherResource.xlsx b/storage/src/test/resources/excel/TeacherResource.xlsx new file mode 100644 index 00000000..8ac64b66 Binary files /dev/null and b/storage/src/test/resources/excel/TeacherResource.xlsx differ