loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix customized source folder in Java client (#1978)

Browse Source 
* fix customized source folder in java client

* update samples
This commit is contained in:
William Cheng 2019-01-25 21:05:13 +08:00 committed by GitHub
parent bc6997f0e5
commit 65d9e859be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -349,6 +349,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {
this.setSourceFolder((String) additionalProperties.get(CodegenConstants.SOURCE_FOLDER));
}
additionalProperties.put(CodegenConstants.SOURCE_FOLDER, sourceFolder);
if (additionalProperties.containsKey(CodegenConstants.LOCAL_VARIABLE_PREFIX)) {
this.setLocalVariablePrefix((String) additionalProperties.get(CodegenConstants.LOCAL_VARIABLE_PREFIX));

9
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
View File

@ -1,5 +1,8 @@
apply plugin: 'idea'
apply plugin: 'eclipse'
{{#sourceFolder}}
apply plugin: 'java'
{{/sourceFolder}}
group = '{{groupId}}'
version = '{{artifactVersion}}'
@ -18,8 +21,12 @@ buildscript {
repositories {
jcenter()
}
{{#sourceFolder}}
sourceSets {
main.java.srcDirs = ['{{sourceFolder}}']
}
{{/sourceFolder}}
if(hasProperty('target') && target == 'android') {
apply plugin: 'com.android.library'

6
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
View File

@ -121,8 +121,7 @@
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
<source>{{{sourceFolder}}}</source>
</sources>
</configuration>
</execution>
@ -134,8 +133,7 @@
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
<source>src/test/java</source>
</sources>
</configuration>
</execution>

5
samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
View File

@ -1,5 +1,6 @@
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'java'
group = 'org.openapitools'
version = '1.0.0'
@ -18,7 +19,9 @@ buildscript {
repositories {
jcenter()
}
sourceSets {
main.java.srcDirs = ['src/main/java']
}
if(hasProperty('target') && target == 'android') {

6
samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
View File

@ -114,8 +114,7 @@
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
@ -127,8 +126,7 @@
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
<source>src/test/java</source>
</sources>
</configuration>
</execution>

5
samples/client/petstore/java/okhttp-gson/build.gradle
View File

@ -1,5 +1,6 @@
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'java'
group = 'org.openapitools'
version = '1.0.0'
@ -18,7 +19,9 @@ buildscript {
repositories {
jcenter()
}
sourceSets {
main.java.srcDirs = ['src/main/java']
}
if(hasProperty('target') && target == 'android') {

6
samples/client/petstore/java/okhttp-gson/pom.xml
View File

@ -114,8 +114,7 @@
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
@ -127,8 +126,7 @@
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
<source>src/test/java</source>
</sources>
</configuration>
</execution>