diff --git a/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Player.java b/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Player.java index 8086ea0..4bf0662 100644 --- a/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Player.java +++ b/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Player.java @@ -4,10 +4,9 @@ // // This source code is licensed under Apache 2.0 License. -import org.nebula.contrib.ngbatis.annotations.base.GraphId; +import javax.persistence.Id; import org.nebula.contrib.ngbatis.annotations.base.Tag; import org.nebula.contrib.ngbatis.base.GraphBaseVertex; -import org.nebula.contrib.ngbatis.enums.IdType; /** @@ -19,7 +18,7 @@ @Tag(name = "player") public class Player extends GraphBaseVertex { - @GraphId(type = IdType.STRING) + @Id private String id; private String name; diff --git a/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Team.java b/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Team.java index a5fed5a..31e13bc 100644 --- a/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Team.java +++ b/ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/pojo/vertex/Team.java @@ -4,10 +4,9 @@ // // This source code is licensed under Apache 2.0 License. -import org.nebula.contrib.ngbatis.annotations.base.GraphId; +import javax.persistence.Id; import org.nebula.contrib.ngbatis.annotations.base.Tag; import org.nebula.contrib.ngbatis.base.GraphBaseVertex; -import org.nebula.contrib.ngbatis.enums.IdType; /** @@ -19,7 +18,7 @@ @Tag(name = "team") public class Team extends GraphBaseVertex { - @GraphId(type = IdType.STRING) + @Id private String id; private String name; diff --git a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java index 4e00d47..499ecf2 100644 --- a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java +++ b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java @@ -265,8 +265,8 @@ public void dynamicSpaceWithPage() { void assertSpaceFailed(Exception e) { e.printStackTrace(); String message = e.getMessage(); - Assert.isTrue(e instanceof QueryException && - (message.contains("SpaceNotFound") || (message.contains("create session failed."))) + Assert.isTrue(e instanceof QueryException + && (message.contains("SpaceNotFound") || (message.contains("create session failed."))) ); } diff --git a/src/main/java/org/nebula/contrib/ngbatis/annotations/base/GraphId.java b/src/main/java/org/nebula/contrib/ngbatis/annotations/base/GraphId.java index c5ae598..ad2182f 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/annotations/base/GraphId.java +++ b/src/main/java/org/nebula/contrib/ngbatis/annotations/base/GraphId.java @@ -10,7 +10,7 @@ * @author xYLiuuuuuu * @since 2024/9/8 10:14 */ - +@Deprecated @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface GraphId { diff --git a/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseExt.java b/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseExt.java index 653019e..981517c 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseExt.java +++ b/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseExt.java @@ -8,12 +8,12 @@ import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; +import javax.persistence.Id; import org.nebula.contrib.ngbatis.ArgsResolver; import org.nebula.contrib.ngbatis.Env; import org.nebula.contrib.ngbatis.ResultResolver; import org.nebula.contrib.ngbatis.SessionDispatcher; import org.nebula.contrib.ngbatis.annotations.base.EdgeType; -import org.nebula.contrib.ngbatis.annotations.base.GraphId; import org.nebula.contrib.ngbatis.annotations.base.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -155,8 +155,8 @@ public static Map getV2Property(T v2 continue; // 跳过初始值 } } - // 处理带有 @GraphId 注解的字段 - if (field.isAnnotationPresent(GraphId.class)) { + // 处理带有 @Id 注解的字段 + if (field.isAnnotationPresent(Id.class)) { result.put("id", fieldValue); } else { result.put(getNameByColumn(field), fieldValue); diff --git a/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseVertex.java b/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseVertex.java index 0dacb96..e921dba 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseVertex.java +++ b/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseVertex.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.nebula.contrib.ngbatis.annotations.base.GraphId; +import javax.persistence.Id; import org.nebula.contrib.ngbatis.annotations.base.Tag; import org.nebula.contrib.ngbatis.enums.Direction; import org.nebula.contrib.ngbatis.enums.IdType; @@ -355,8 +355,8 @@ protected Map getEntityProperties() { continue; // 跳过初始值 } } - // 处理带有 @GraphId 注解的字段 - if (field.isAnnotationPresent(GraphId.class)) { + // 处理带有 @Id 注解的字段 + if (field.isAnnotationPresent(Id.class)) { properties.put("id", value); } else { properties.put(getNameByColumn(field), value); @@ -377,14 +377,14 @@ private Object getVertexId() { for (Field field : declaredFields) { Annotation[] annotations = field.getAnnotations(); for (Annotation annotation : annotations) { - if (annotation instanceof GraphId) { + if (annotation instanceof Id) { id = getValue(this, field); specificTypeField = field.getType(); } } } if (id == null || isPrimitiveDefaultValue(specificTypeField,id)) { - throw new RuntimeException(entityClass.getSimpleName() + " does not have @GraphId"); + throw new RuntimeException(entityClass.getSimpleName() + " does not have @Id"); } return id; } @@ -398,8 +398,8 @@ private IdType getVertexIdType() { for (Field field : declaredFields) { Annotation[] annotations = field.getAnnotations(); for (Annotation annotation : annotations) { - if (annotation instanceof GraphId) { - return ((GraphId) annotation).type(); + if (annotation instanceof Id) { + return field.getType() == String.class ? IdType.STRING : IdType.INT64; } } } diff --git a/src/main/java/org/nebula/contrib/ngbatis/utils/ReflectUtil.java b/src/main/java/org/nebula/contrib/ngbatis/utils/ReflectUtil.java index 5a8532f..667bdeb 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/utils/ReflectUtil.java +++ b/src/main/java/org/nebula/contrib/ngbatis/utils/ReflectUtil.java @@ -27,7 +27,6 @@ import javax.persistence.Transient; import org.nebula.contrib.ngbatis.annotations.Space; import org.nebula.contrib.ngbatis.annotations.base.EdgeType; -import org.nebula.contrib.ngbatis.annotations.base.GraphId; import org.nebula.contrib.ngbatis.annotations.base.Tag; import org.nebula.contrib.ngbatis.exception.ParseException; import org.nebula.contrib.ngbatis.models.MethodModel; @@ -84,10 +83,6 @@ public static void setValue(Object o, String prop, Object value) declaredField = columnField; break; } - if (isGraphId(columnField) && prop.equals("@GraphId")) { - setValue(o, columnField, value); - return; - } } if (declaredField == null) { throw new NoSuchFieldException(prop); @@ -619,7 +614,7 @@ public static String schemaByEntityType(Class entityType) { public static boolean isGraphId(Field field) { Annotation[] annotations = field.getAnnotations(); for (Annotation annotation : annotations) { - if (annotation instanceof GraphId) { + if (annotation instanceof Id) { return true; } } diff --git a/src/main/java/org/nebula/contrib/ngbatis/utils/ResultSetUtil.java b/src/main/java/org/nebula/contrib/ngbatis/utils/ResultSetUtil.java index 1c2646d..45a855b 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/utils/ResultSetUtil.java +++ b/src/main/java/org/nebula/contrib/ngbatis/utils/ResultSetUtil.java @@ -425,7 +425,6 @@ public static void setAttrs(Object t, Node v, String tagName) { if (!v.tagNames().contains(tagName)) { return; } - ReflectUtil.setValue(t, "@GraphId", ResultSetUtil.getValue(v.getId())); List values = v.values(tagName); List keys = v.keys(tagName); for (int i = 0; i < keys.size(); i++) {