Clean up file output handling#1895

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.

Sign up for GitHub

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

Merged
wing328 merged 6 commits into from
Jan 14, 2019
Merged

Clean up file output handling #1895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
481ba34
Clean up file output handling
jimschubert Jan 12, 2019
e97527d
Fix missed path separators in java codegen
jimschubert Jan 12, 2019
50bfd06
Merge branch 'master' into fix-path-cleaning-on-write
jimschubert Jan 12, 2019
27d93a9
Adjust Java codegen path replacements
jimschubert Jan 12, 2019
3285693
Convert / in full path replacements, as / is forbidden in Windows, an…
jimschubert Jan 12, 2019
113adda
Use Paths.get where files are written, to better handle Windows path …
jimschubert Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
generatePlainTextHelp(sb, config);

if (!isEmpty(outputFile)) {
File out = new File(outputFile);
File out = Paths.get(outputFile).toFile();
//noinspection ResultOfMethodCallIgnored
out.mkdirs();

Expand Down
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
@SuppressWarnings("static-method")
public File writeToFile(String filename, String contents) throws IOException {
LOGGER.info("writing file " + filename);
File output = new File(filename);

// Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
File output = Paths.get(filename).toFile();

if (output.getParent() != null && !new File(output.getParent()).exists()) {
File parent = new File(output.getParent());
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
}

protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
File outputFile = new File(filename);
File outputFile = java.nio.file.Paths.get(filename).toFile();
if (in != null) {
OutputStream out = new FileOutputStream(outputFile, false);
LOGGER.info("writing file " + outputFile);
Expand Down
12 changes: 6 additions & 6 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

@Override
public String apiFileFolder() {
return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
}

@Override
public String apiTestFileFolder() {
return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
}

@Override
public String modelTestFileFolder() {
return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
}

@Override
public String modelFileFolder() {
return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
}

@Override
public String apiDocFileFolder() {
return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
}

@Override
public String modelDocFileFolder() {
return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

@Override
public String apiFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

@Override
public String modelFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

@Override
public String apiFileFolder() {
return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

@Override
public String modelFileFolder() {
return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

@Override
public String apiFileFolder() {
return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

@Override
public String modelFileFolder() {
return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
}
}
4 changes: 2 additions & 2 deletions .../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

@Override
public String apiFileFolder() {
return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

@Override
public String modelFileFolder() {
return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
}
}
8 changes: 4 additions & 4 deletions ...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

@Override
public String apiFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

@Override
public String modelFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}

@Override
public String apiDocFileFolder() {
return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
}

@Override
public String modelDocFileFolder() {
return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

@Override
public String apiDocFileFolder() {
return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
}

@Override
public String modelDocFileFolder() {
return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
}

}
4 changes: 2 additions & 2 deletions ...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

@Override
public String apiDocFileFolder() {
return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
}

@Override
public String modelDocFileFolder() {
return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions .../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

@Override
public String apiFileFolder() {
return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
}

@Override
public String modelFileFolder() {
return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
//modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
//apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

@Override
public String apiFileFolder() {
return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
+ apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
}

@Override
public String modelFileFolder() {
return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
+ modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
}

Expand Down
4 changes: 2 additions & 2 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
*/
@Override
public String modelFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}

/**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
*/
@Override
public String apiFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

@Override
public String apiFileFolder() {
return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

public String modelFileFolder() {
return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
* instantiated
*/
public String modelFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
}

/**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
*/
@Override
public String apiFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
}

/**
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Clean up file output handling#1895

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.

 Sign up for GitHub

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

 Merged

wing328
merged 6 commits into

from

Jan 14, 2019
 Merged


Clean up file output handling
#1895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
481ba34

Clean up file output handling


jimschubert Jan 12, 2019
e97527d

Fix missed path separators in java codegen


jimschubert Jan 12, 2019
50bfd06

Merge branch 'master' into fix-path-cleaning-on-write


jimschubert Jan 12, 2019
27d93a9

Adjust Java codegen path replacements


jimschubert Jan 12, 2019
3285693

Convert / in full path replacements, as / is forbidden in Windows, an…


jimschubert Jan 12, 2019
113adda

Use Paths.get where files are written, to better handle Windows path …


jimschubert Jan 12, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,7 @@

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;

import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
Expand DownExpand Up@@ -65,7 +66,7 @@ public void run() {
 generatePlainTextHelp(sb, config);

 if (!isEmpty(outputFile)) {
 File out = new File(outputFile);
 File out = Paths.get(outputFile).toFile();
 //noinspection ResultOfMethodCallIgnored
 out.mkdirs();

Expand Down

5 changes: 4 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/AbstractGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.file.Paths;
import java.util.Scanner;
import java.util.regex.Pattern;

Expand All@@ -40,7 +41,9 @@ public abstract class AbstractGenerator {
 @SuppressWarnings("static-method")
 public File writeToFile(String filename, String contents) throws IOException {
 LOGGER.info("writing file " + filename);
 File output = new File(filename);

 // Use Paths.get here to normalize path (for Windows file separator, space escaping on Linux/Mac, etc)
 File output = Paths.get(filename).toFile();

 if (output.getParent() != null && !new File(output.getParent()).exists()) {
 File parent = new File(output.getParent());
Expand Down

2 changes: 1 addition & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ public Reader getTemplate(String name) {
 }

 protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws FileNotFoundException, IOException {
 File outputFile = new File(filename);
 File outputFile = java.nio.file.Paths.get(filename).toFile();
 if (in != null) {
 OutputStream out = new FileOutputStream(outputFile, false);
 LOGGER.info("writing file " + outputFile);
Expand Down

12 changes: 6 additions & 6 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -536,32 +536,32 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelTestFileFolder() {
 return (outputFolder + "/" + testFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + testFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return (outputFolder + File.separator + modelDocPath).replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,12 +174,12 @@ public String escape(String text) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...tor/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,12 +153,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -121,11 +121,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/AdaServerCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,11 +123,11 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/model/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + "model" + File.separator + modelPackage().replace('.', File.separatorChar);
 }
}

8 changes: 4 additions & 4 deletions
...napi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,22 +156,22 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enerator/src/main/java/org/openapitools/codegen/languages/CSharpDotNet2ClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,12 +130,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

}

4 changes: 2 additions & 2 deletions
...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -246,12 +246,12 @@ public String modelFileFolder() {

 @Override
 public String apiDocFileFolder() {
 return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar);
 }

 @Override
 public String modelDocFileFolder() {
 return (outputFolder + "/" + modelDocPath).replace('/', File.separatorChar);
 return outputFolder + File.separator + modelDocPath.replace('/', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,12 +314,12 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/src/Request/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Request/" + apiPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
 public String modelFileFolder() {
 return outputFolder + "/src/Data/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + ("/src/Data/" + modelPackage().replace('.', File.separatorChar)).replace("/", File.separator);
 }

 @Override
Expand Down

6 changes: 3 additions & 3 deletions
...penapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ public void processOpts() {
 //modelPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "model";
 //apiPackage = invokerPackage + File.separatorChar + "client" + File.separatorChar + "api";

 final String invokerFolder = (sourceFolder + File.separator + "src/" + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);
 final String invokerFolder = (sourceFolder + File.separator + "src" + File.separator + invokerPackage + File.separator).replace(".", File.separator).replace('.', File.separatorChar);

 supportingFiles.add(new SupportingFile("ApiInvoker.as", invokerFolder + "common", "ApiInvoker.as"));
 supportingFiles.add(new SupportingFile("ApiUrlHelper.as", invokerFolder + "common", "ApiUrlHelper.as"));
Expand DownExpand Up@@ -193,13 +193,13 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

 @Override
 public String modelFileFolder() {
 return (outputFolder + File.separatorChar + sourceFolder + File.separatorChar + "src/"
 return outputFolder + File.separatorChar + sourceFolder + File.separatorChar + ("src/"
 + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar);
 }

Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -149,7 +149,7 @@ public String escapeReservedWord(String name) {
 */
 @Override
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -158,7 +158,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down

4 changes: 2 additions & 2 deletions
...c/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,11 +167,11 @@ public String escapeReservedWord(String name) {

 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 public String modelFileFolder() {
 return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 @Override
Expand Down

4 changes: 2 additions & 2 deletions
...enapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -214,7 +214,7 @@ public String escapeReservedWord(String name) {
 * instantiated
 */
 public String modelFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
 }

 /**
Expand All@@ -223,7 +223,7 @@ public String modelFileFolder() {
 */
 @Override
 public String apiFileFolder() {
 return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
 return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
 }

 /**
Expand Down