Add remove methods for lists

Implementation for eclipse/microprofile-open-api#240 Microprofile on commit: jmini/microprofile-open-api@33b0214
jmini · Sep 20, 2018 · e2c5264 · e2c5264
1 parent 0c5ce89
commit e2c5264
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 6 deletions.
diff --git a/empoa-generator/src/main/java/fr/jmini/empoa/simple/SimpleGenerator.java b/empoa-generator/src/main/java/fr/jmini/empoa/simple/SimpleGenerator.java
@@ -155,6 +155,13 @@ private void generateMember(StringBuilder sb, Member member) {
             sb.append("        return this;\n");
             sb.append("    }\n");
             sb.append("\n");
+            sb.append("    @Override\n");
+            sb.append("    public void " + listMember.removeName + "(" + listMember.itemFqType + " " + itemVarName + ") {\n");
+            sb.append("        if (" + memberName + " != null) {\n");
+            sb.append("            " + memberName + ".remove(" + itemVarName + ");\n");
+            sb.append("        }\n");
+            sb.append("    }\n");
+            sb.append("\n");
         }
     }
 

diff --git a/empoa-generator/src/main/java/fr/jmini/empoa/specs/ListMember.java b/empoa-generator/src/main/java/fr/jmini/empoa/specs/ListMember.java
@@ -6,19 +6,21 @@ public class ListMember extends Member {
 
     public final String itemFqType;
     public final String addName;
+    public final String removeName;
 
     public ListMember(String name, String itemFqType) {
-        this(name, itemFqType, "add" + StringUtil.capitalize(StringUtil.singular(name)));
+        this(name, itemFqType, "add" + StringUtil.capitalize(StringUtil.singular(name)), "remove" + StringUtil.capitalize(StringUtil.singular(name)));
     }
 
-    public ListMember(String name, String itemFqType, String addName) {
-        this(name, itemFqType, "set" + StringUtil.capitalize(name), "get" + StringUtil.capitalize(name), StringUtil.decapitalize(name), addName, true);
+    public ListMember(String name, String itemFqType, String addName, String removeName) {
+        this(name, itemFqType, "set" + StringUtil.capitalize(name), "get" + StringUtil.capitalize(name), StringUtil.decapitalize(name), addName, removeName, true);
     }
 
-    public ListMember(String name, String itemFqType, String setterName, String gettterName, String builderName, String addName, boolean hasBuilder) {
+    public ListMember(String name, String itemFqType, String setterName, String gettterName, String builderName, String addName, String removeName, boolean hasBuilder) {
         super(name, "java.util.List<" + itemFqType + ">", setterName, gettterName, builderName, true, true, true, hasBuilder);
         this.itemFqType = itemFqType;
         this.addName = addName;
+        this.removeName = removeName;
     }
 
 }
diff --git a/empoa-generator/src/main/java/fr/jmini/empoa/specs/OpenAPISpec.java b/empoa-generator/src/main/java/fr/jmini/empoa/specs/OpenAPISpec.java
@@ -166,7 +166,7 @@ public static Element createOpenAPI() {
         members.add(new Member("Info", Info.class.getCanonicalName()));
         members.add(new Member("ExternalDocs", ExternalDocumentation.class.getCanonicalName()));
         members.add(new ListMember("Servers", Server.class.getCanonicalName()));
-        members.add(new ListMember("Security", SecurityRequirement.class.getCanonicalName(), "addSecurityRequirement"));
+        members.add(new ListMember("Security", SecurityRequirement.class.getCanonicalName(), "addSecurityRequirement", "removeSecurityRequirement"));
         members.add(new ListMember("Tags", Tag.class.getCanonicalName()));
         members.add(new Member("Paths", Paths.class.getCanonicalName()));
         members.add(new AdditionalMethod(Type.OpenAPI_path));
@@ -186,7 +186,7 @@ public static Element createOperation() {
         members.add(new Member("Responses", APIResponses.class.getCanonicalName()));
         members.add(new MapMember("Callbacks", Callback.class.getCanonicalName(), true, true));
         members.add(new Member("Deprecated", Boolean.class.getSimpleName()));
-        members.add(new ListMember("Security", SecurityRequirement.class.getName(), "addSecurityRequirement"));
+        members.add(new ListMember("Security", SecurityRequirement.class.getName(), "addSecurityRequirement", "removeSecurityRequirement"));
         members.add(new ListMember("Servers", Server.class.getCanonicalName()));
         return new Element(Operation.class.getName(), true, false, members);
     }

diff --git a/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/OpenAPIImpl.java b/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/OpenAPIImpl.java
@@ -106,6 +106,13 @@ public OpenAPI addServer(org.eclipse.microprofile.openapi.models.servers.Server
         return this;
     }
 
+    @Override
+    public void removeServer(org.eclipse.microprofile.openapi.models.servers.Server server) {
+        if (_servers != null) {
+            _servers.remove(server);
+        }
+    }
+
     private java.util.List<org.eclipse.microprofile.openapi.models.security.SecurityRequirement> _security;
 
     @Override
@@ -133,6 +140,13 @@ public OpenAPI addSecurityRequirement(org.eclipse.microprofile.openapi.models.se
         return this;
     }
 
+    @Override
+    public void removeSecurityRequirement(org.eclipse.microprofile.openapi.models.security.SecurityRequirement securityRequirement) {
+        if (_security != null) {
+            _security.remove(securityRequirement);
+        }
+    }
+
     private java.util.List<org.eclipse.microprofile.openapi.models.tags.Tag> _tags;
 
     @Override
@@ -160,6 +174,13 @@ public OpenAPI addTag(org.eclipse.microprofile.openapi.models.tags.Tag tag) {
         return this;
     }
 
+    @Override
+    public void removeTag(org.eclipse.microprofile.openapi.models.tags.Tag tag) {
+        if (_tags != null) {
+            _tags.remove(tag);
+        }
+    }
+
     private org.eclipse.microprofile.openapi.models.Paths _paths;
 
     @Override

diff --git a/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/OperationImpl.java b/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/OperationImpl.java
@@ -52,6 +52,13 @@ public Operation addTag(String string) {
         return this;
     }
 
+    @Override
+    public void removeTag(String string) {
+        if (_tags != null) {
+            _tags.remove(string);
+        }
+    }
+
     private String _summary;
 
     @Override
@@ -151,6 +158,13 @@ public Operation addParameter(org.eclipse.microprofile.openapi.models.parameters
         return this;
     }
 
+    @Override
+    public void removeParameter(org.eclipse.microprofile.openapi.models.parameters.Parameter parameter) {
+        if (_parameters != null) {
+            _parameters.remove(parameter);
+        }
+    }
+
     private org.eclipse.microprofile.openapi.models.parameters.RequestBody _requestBody;
 
     @Override
@@ -259,6 +273,13 @@ public Operation addSecurityRequirement(org.eclipse.microprofile.openapi.models.
         return this;
     }
 
+    @Override
+    public void removeSecurityRequirement(org.eclipse.microprofile.openapi.models.security.SecurityRequirement securityRequirement) {
+        if (_security != null) {
+            _security.remove(securityRequirement);
+        }
+    }
+
     private java.util.List<org.eclipse.microprofile.openapi.models.servers.Server> _servers;
 
     @Override
@@ -286,4 +307,11 @@ public Operation addServer(org.eclipse.microprofile.openapi.models.servers.Serve
         return this;
     }
 
+    @Override
+    public void removeServer(org.eclipse.microprofile.openapi.models.servers.Server server) {
+        if (_servers != null) {
+            _servers.remove(server);
+        }
+    }
+
 }
diff --git a/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/PathItemImpl.java b/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/PathItemImpl.java
@@ -284,6 +284,13 @@ public PathItem addServer(org.eclipse.microprofile.openapi.models.servers.Server
         return this;
     }
 
+    @Override
+    public void removeServer(org.eclipse.microprofile.openapi.models.servers.Server server) {
+        if (_servers != null) {
+            _servers.remove(server);
+        }
+    }
+
     private java.util.List<org.eclipse.microprofile.openapi.models.parameters.Parameter> _parameters;
 
     @Override
@@ -311,4 +318,11 @@ public PathItem addParameter(org.eclipse.microprofile.openapi.models.parameters.
         return this;
     }
 
+    @Override
+    public void removeParameter(org.eclipse.microprofile.openapi.models.parameters.Parameter parameter) {
+        if (_parameters != null) {
+            _parameters.remove(parameter);
+        }
+    }
+
 }
diff --git a/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/media/SchemaImpl.java b/empoa-simple-models-impl/src/main/java/fr/jmini/empoa/internal/models/media/SchemaImpl.java
@@ -128,6 +128,13 @@ public Schema addEnumeration(Object object) {
         return this;
     }
 
+    @Override
+    public void removeEnumeration(Object object) {
+        if (_enumeration != null) {
+            _enumeration.remove(object);
+        }
+    }
+
     private java.math.BigDecimal _multipleOf;
 
     @Override
@@ -389,6 +396,13 @@ public Schema addRequired(String string) {
         return this;
     }
 
+    @Override
+    public void removeRequired(String string) {
+        if (_required != null) {
+            _required.remove(string);
+        }
+    }
+
     private SchemaType _type;
 
     @Override
@@ -688,6 +702,13 @@ public Schema addAllOf(org.eclipse.microprofile.openapi.models.media.Schema sche
         return this;
     }
 
+    @Override
+    public void removeAllOf(org.eclipse.microprofile.openapi.models.media.Schema schema) {
+        if (_allOf != null) {
+            _allOf.remove(schema);
+        }
+    }
+
     private java.util.List<org.eclipse.microprofile.openapi.models.media.Schema> _anyOf;
 
     @Override
@@ -715,6 +736,13 @@ public Schema addAnyOf(org.eclipse.microprofile.openapi.models.media.Schema sche
         return this;
     }
 
+    @Override
+    public void removeAnyOf(org.eclipse.microprofile.openapi.models.media.Schema schema) {
+        if (_anyOf != null) {
+            _anyOf.remove(schema);
+        }
+    }
+
     private java.util.List<org.eclipse.microprofile.openapi.models.media.Schema> _oneOf;
 
     @Override
@@ -742,4 +770,11 @@ public Schema addOneOf(org.eclipse.microprofile.openapi.models.media.Schema sche
         return this;
     }
 
+    @Override
+    public void removeOneOf(org.eclipse.microprofile.openapi.models.media.Schema schema) {
+        if (_oneOf != null) {
+            _oneOf.remove(schema);
+        }
+    }
+
 }
diff --git a/...-models-impl/src/main/java/fr/jmini/empoa/internal/models/servers/ServerVariableImpl.java b/...-models-impl/src/main/java/fr/jmini/empoa/internal/models/servers/ServerVariableImpl.java
@@ -52,6 +52,13 @@ public ServerVariable addEnumeration(String string) {
         return this;
     }
 
+    @Override
+    public void removeEnumeration(String string) {
+        if (_enumeration != null) {
+            _enumeration.remove(string);
+        }
+    }
+
     private String _defaultValue;
 
     @Override