Merge pull request xjtu-enre#57 from ba1man/main

add 'location' property for Enum Constant entity in result
AlbertMZhou · Nov 9, 2023 · 774dbf1 · 774dbf1
1 parent e9d419b
commit 774dbf1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/src/main/java/entity/adapter/EntityDTOAdapter.java b/src/main/java/entity/adapter/EntityDTOAdapter.java
@@ -169,7 +169,6 @@ protected void write(JsonWriter out, EnumEntityDTO value) throws IOException {
   protected void write(JsonWriter out, EnumConstantEntityDTO value) throws IOException {
     writeFile(out, value.getFile());
     writeAdditionalBinDTO(out, value.getAdditionalBin());
-    writeLocationDTO(out, value.getLocation(), "location");
     writeHidden(out, value.getHidden());
   }
 

diff --git a/src/main/java/entity/dto/EnumConstantEntityDTO.java b/src/main/java/entity/dto/EnumConstantEntityDTO.java
@@ -7,7 +7,6 @@ public class EnumConstantEntityDTO extends InternalEntityDTO {
   private String File;
   private String hidden;
   private AdditionalBinDTO additionalBin;
-  private LocationDTO location;
 
   public EnumConstantEntityDTO() {
   }
@@ -32,21 +31,6 @@ public EnumConstantEntityDTO(
     this.additionalBin = additionalBin;
   }
 
-  public EnumConstantEntityDTO(int id,
-                               String name,
-                               String qualifiedName,
-                               int parentId,
-                               String file,
-                               String hidden,
-                               AdditionalBinDTO additionalBin,
-                               LocationDTO location) {
-    super(id, name, qualifiedName, parentId, "Enum Constant");
-    this.File = file;
-    this.hidden = hidden;
-    this.additionalBin = additionalBin;
-    this.location = location;
-  }
-
   public EnumConstantEntityDTO(
       int id,
       String name,
@@ -83,12 +67,4 @@ public String getHidden() {
   public void setHidden(String hidden) {
     this.hidden = hidden;
   }
-
-  public LocationDTO getLocation() {
-    return location;
-  }
-
-  public void setLocation(LocationDTO location) {
-    this.location = location;
-  }
 }
diff --git a/src/main/java/util/EnreFormatParser.java b/src/main/java/util/EnreFormatParser.java
@@ -277,7 +277,7 @@ private static EntityDTO parseEntityDTO(JSONObject variableObj) {
           break;
         case "Enum Constant":
           res =
-              new EnumConstantEntityDTO(id, name, qualifiedName, parentId, file, hidden, additionalBinDTO, locationDTO);
+              new EnumConstantEntityDTO(id, name, qualifiedName, parentId, file, hidden, additionalBinDTO);
           break;
         case "Annotation":
           res =