From ce3dc45782406d694cf849486aca15474230aef3 Mon Sep 17 00:00:00 2001 From: Hugo Mercado Date: Mon, 3 Sep 2018 05:46:41 -0500 Subject: [PATCH 1/2] added helper to check if a collection is empty. --- .../v3/generators/DefaultCodegenConfig.java | 2 ++ .../generators/handlebars/NotEmptyHelper.java | 26 +++++++++++++++++++ src/main/resources/v2/JavaJaxRS/pojo.mustache | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java index ab76454842..eba888db66 100644 --- a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java +++ b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java @@ -22,6 +22,7 @@ import io.swagger.codegen.v3.generators.handlebars.HasNotHelper; import io.swagger.codegen.v3.generators.handlebars.IsHelper; import io.swagger.codegen.v3.generators.handlebars.IsNotHelper; +import io.swagger.codegen.v3.generators.handlebars.NotEmptyHelper; import io.swagger.codegen.v3.generators.handlebars.StringUtilHelper; import io.swagger.codegen.v3.templates.HandlebarTemplateEngine; import io.swagger.codegen.v3.templates.TemplateEngine; @@ -3336,6 +3337,7 @@ public void addHandlebarHelpers(Handlebars handlebars) { handlebars.registerHelper(HasNotHelper.NAME, new HasNotHelper()); handlebars.registerHelper(BracesHelper.NAME, new BracesHelper()); handlebars.registerHelper(BaseItemsHelper.NAME, new BaseItemsHelper()); + handlebars.registerHelper(NotEmptyHelper.NAME, new NotEmptyHelper()); handlebars.registerHelpers(new StringUtilHelper()); } diff --git a/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java b/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java new file mode 100644 index 0000000000..3e6eddcdb2 --- /dev/null +++ b/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java @@ -0,0 +1,26 @@ +package io.swagger.codegen.v3.generators.handlebars; + +import com.github.jknack.handlebars.Helper; +import com.github.jknack.handlebars.Options; + +import java.io.IOException; +import java.util.Collection; + +public class NotEmptyHelper implements Helper { + public static final String NAME = "notEmpty"; + + @Override + public Object apply(Collection collection, Options options) throws IOException { + final Options.Buffer buffer = options.buffer(); + + System.out.println("------------------------ collection:"); + System.out.println(collection); + + if (collection == null || collection.isEmpty()) { + buffer.append(options.inverse()); + } else { + buffer.append(options.fn()); + } + return buffer; + } +} diff --git a/src/main/resources/v2/JavaJaxRS/pojo.mustache b/src/main/resources/v2/JavaJaxRS/pojo.mustache index 8c66dbb4a6..cbb7e17d23 100644 --- a/src/main/resources/v2/JavaJaxRS/pojo.mustache +++ b/src/main/resources/v2/JavaJaxRS/pojo.mustache @@ -113,7 +113,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali @Override public int hashCode() { - return Objects.hash({{#vars}}{{name}}{{#has this 'more'}}, {{/has}}{{/vars}}{{#parentModel}}{{#has this 'vars'}}, {{/has}}super.hashCode(){{/parentModel}}); + return Objects.hash({{#vars}}{{name}}{{#has this 'more'}}, {{/has}}{{/vars}}{{#parentModel}}{{#has ../this 'vars'}}, {{/has}}super.hashCode(){{/parentModel}}); } {{/supportJava6}} From bf93df5dca69691a3f950111a7fc83fffadca72f Mon Sep 17 00:00:00 2001 From: Hugo Mercado Date: Mon, 3 Sep 2018 05:48:01 -0500 Subject: [PATCH 2/2] removed print --- .../codegen/v3/generators/handlebars/NotEmptyHelper.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java b/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java index 3e6eddcdb2..f59a419a1c 100644 --- a/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java +++ b/src/main/java/io/swagger/codegen/v3/generators/handlebars/NotEmptyHelper.java @@ -13,9 +13,6 @@ public class NotEmptyHelper implements Helper { public Object apply(Collection collection, Options options) throws IOException { final Options.Buffer buffer = options.buffer(); - System.out.println("------------------------ collection:"); - System.out.println(collection); - if (collection == null || collection.isEmpty()) { buffer.append(options.inverse()); } else {