From 995869f4d5b8d2ebcfadc3b6bb457880b6bde89b Mon Sep 17 00:00:00 2001 From: Erik van Zijst Date: Fri, 8 Jan 2016 11:07:18 -0800 Subject: [PATCH] Java Class Name Clashes with java.lang.* A swagger file that contains a definition named "object" compiles into a class named Object. This is technically not a problem as it lives in a different package than java.lang.Object, but this requires the templates to refer to Java's Object using its fully qualified name. --- modules/swagger-codegen/src/main/resources/Java/pojo.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache index eea33d346d4..1af6e50242c 100644 --- a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache @@ -27,7 +27,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali {{/vars}} @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -59,7 +59,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; }