Rename elementId to id in AbstractSchema and JSON schema generation

Author: christiangoerdes

annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java

@@ -134,7 +134,7 @@ private static AbstractSchema<?> tagElementId(AbstractSchema<?> schema, ElementI
         String id = elementInfo.getId();
         if (id == null || id.isBlank()) return schema;
 
-        ((AbstractSchema) schema).elementId(id);
+        ((AbstractSchema) schema).id(id);
         return schema;
     }
 

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/model/AbstractSchema.java

@@ -25,7 +25,7 @@ public abstract class AbstractSchema<T extends AbstractSchema<T>> implements ISc
 
     protected String title;
     protected String name;
-    protected String elementId;
+    protected String id;
     protected String type;
     protected String description;
     protected List<String> typeList;
@@ -77,8 +77,8 @@ public T name(String name) {
         return self();
     }
 
-    public T elementId(String id) {
-        this.elementId = id;
+    public T id(String id) {
+        this.id = id;
         return self();
     }
 
@@ -110,8 +110,8 @@ public ObjectNode json(ObjectNode node) {
             node.put("type", type);
         }
 
-        if (elementId != null && !elementId.isBlank()) {
-            node.put("x-element-id", elementId);
+        if (id != null && !id.isBlank()) {
+            node.put("id", id);
         }
 
         return node;