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

resolve merge conflicts in the core generator files

Browse Source
This commit is contained in:
William Cheng
2020-04-17 16:10:10 +08:00
parent faf6f197be
commit 8fa76843d0
9 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator-cli/pom.xml
View File

@@ -4,11 +4,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId> <artifactId>openapi-generator-project</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>

4
modules/openapi-generator-core/pom.xml
View File

@@ -6,11 +6,7 @@
<artifactId>openapi-generator-project</artifactId> <artifactId>openapi-generator-project</artifactId>
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>

4
modules/openapi-generator-gradle-plugin/gradle.properties
View File

@@ -1,9 +1,5 @@
# RELEASE_VERSION # RELEASE_VERSION
<<<<<<< HEAD
openApiGeneratorVersion=5.0.0-SNAPSHOT openApiGeneratorVersion=5.0.0-SNAPSHOT
=======
openApiGeneratorVersion=4.3.1-SNAPSHOT
>>>>>>> origin/master
# /RELEASE_VERSION # /RELEASE_VERSION
# BEGIN placeholders # BEGIN placeholders

4
modules/openapi-generator-gradle-plugin/pom.xml
View File

@@ -4,11 +4,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId> <artifactId>openapi-generator-project</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>

4
modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
View File

@@ -19,11 +19,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId> <artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<dependencies> <dependencies>
<dependency> <dependency>

4
modules/openapi-generator-maven-plugin/pom.xml
View File

@@ -5,11 +5,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId> <artifactId>openapi-generator-project</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>

4
modules/openapi-generator-online/pom.xml
View File

@@ -4,11 +4,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId> <artifactId>openapi-generator-project</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>

4
modules/openapi-generator/pom.xml
View File

@@ -4,11 +4,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId> <artifactId>openapi-generator-project</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
=======
<version>4.3.1-SNAPSHOT</version>
>>>>>>> origin/master
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>

22
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View File

@@ -783,12 +783,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
continue; continue;
} }
<<<<<<< HEAD
File targetedFile = new File(outputFilename);
if (ignoreProcessor.allowsFile(targetedFile)) {
if (targetedFile.exists() && !support.canOverwrite) {
LOGGER.info("Skipped overwriting " + support.destinationFilename + " as the file already exists.");
=======
if (ignoreProcessor.allowsFile(new File(outputFilename))) { if (ignoreProcessor.allowsFile(new File(outputFilename))) {
// support.templateFile is the unmodified/original supporting file name (e.g. build.sh.mustache) // support.templateFile is the unmodified/original supporting file name (e.g. build.sh.mustache)
// templatingEngine.templateExists dispatches resolution to this, performing template-engine specific inspect of support file extensions. // templatingEngine.templateExists dispatches resolution to this, performing template-engine specific inspect of support file extensions.
@@ -800,7 +794,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
if (config.isEnablePostProcessFile()) { if (config.isEnablePostProcessFile()) {
config.postProcessFile(written, "supporting-mustache"); config.postProcessFile(written, "supporting-mustache");
} }
>>>>>>> origin/master
} else { } else {
if (Arrays.stream(templatingEngine.getFileExtensions()).anyMatch(templateFile::endsWith)) { if (Arrays.stream(templatingEngine.getFileExtensions()).anyMatch(templateFile::endsWith)) {
String templateContent = templatingEngine.compileTemplate(this, bundle, support.templateFile); String templateContent = templatingEngine.compileTemplate(this, bundle, support.templateFile);
@@ -813,7 +806,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
} else { } else {
InputStream in = null; InputStream in = null;
<<<<<<< HEAD
try { try {
in = new FileInputStream(templateFile); in = new FileInputStream(templateFile);
} catch (Exception e) { } catch (Exception e) {
@@ -827,20 +819,6 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
if (config.isEnablePostProcessFile()) { if (config.isEnablePostProcessFile()) {
config.postProcessFile(outputFile, "supporting-common"); config.postProcessFile(outputFile, "supporting-common");
} }
=======
try {
in = new FileInputStream(templateFile);
} catch (Exception e) {
// continue
}
if (in == null) {
in = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(templateFile));
}
File outputFile = writeInputStreamToFile(outputFilename, in, templateFile);
files.add(outputFile);
if (config.isEnablePostProcessFile() && !dryRun) {
config.postProcessFile(outputFile, "supporting-common");
>>>>>>> origin/master
} }
} }