Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java] Fix outputFolder in java-related server stub generators #4076

Merged
merged 2 commits into from
Oct 26, 2016

Conversation

wing328
Copy link
Contributor

@wing328 wing328 commented Oct 26, 2016

PR checklist

  • Read the contribution guildelines.
  • Ran the shell/batch script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)
  • Filed the PR against the correct branch: master for non-breaking changes and 2.3.0 branch for breaking (non-backward compatible) changes.

Description of the PR

Fix outputFolder in Java-related server stub generators

@wing328 wing328 added this to the v2.2.2 milestone Oct 26, 2016
@wing328 wing328 merged commit 4a1ef9d into swagger-api:master Oct 26, 2016
@wing328 wing328 deleted the fix_output_folder branch October 26, 2016 08:31
wing328 pushed a commit that referenced this pull request Nov 1, 2016
* hashCode and equals support for jdk6 for jersey2

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache

* add msf4j author

* [Java] Fix outputFolder in java-related server stub generators (#4076)

* fix outputFolder in java-related server stub generator

* fix style in JavaJAXRSCXFCDIServerCodegen

* hashCode and equals support for jdk6 for jersey2

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache
davidgri pushed a commit to davidgri/swagger-codegen that referenced this pull request May 11, 2017
…er-api#4076)

* fix outputFolder in java-related server stub generator

* fix style in JavaJAXRSCXFCDIServerCodegen
davidgri pushed a commit to davidgri/swagger-codegen that referenced this pull request May 11, 2017
* hashCode and equals support for jdk6 for jersey2

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache

* add msf4j author

* [Java] Fix outputFolder in java-related server stub generators (swagger-api#4076)

* fix outputFolder in java-related server stub generator

* fix style in JavaJAXRSCXFCDIServerCodegen

* hashCode and equals support for jdk6 for jersey2

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* fix for the build.

* supportJava6 moved to the base abstract class to support server side code generation,
supportJava6 flag was added to the server side model classes generators,
licenseInfo ttemplate was added to JavaJaxRS section,
javaJaxRS templates jdk6 suport was added,
shouldOverride method was commented out to allow server classes to be overriden - what if new methods or signatures changes?

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache

* Merge remote-tracking branch 'remotes/origin/master' into jdk6-jersey2-support

Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/pom.mustache
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant