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

[Java] use Files.createTempFile instead (#8787)

Browse Source 
* use Files.createTempFile

* fix import

* add missing import
This commit is contained in:
William Cheng 2021-02-23 11:40:37 +08:00 committed by GitHub
parent d85f61ff0c
commit 1b6cabb97d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 66 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache vendored
View File

@ -35,6 +35,7 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
import java.util.logging.Level; import java.util.logging.Level;
@ -1027,15 +1028,15 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

10
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache vendored
View File

@ -41,6 +41,8 @@ import java.lang.reflect.Type;
import java.net.URI; import java.net.URI;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -578,7 +580,7 @@ public class ApiClient {
* with file response. The default value is <code>null</code>, i.e. using * with file response. The default value is <code>null</code>, i.e. using
* the system's default tempopary folder. * the system's default tempopary folder.
* *
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a> * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
* @return Temporary folder path * @return Temporary folder path
*/ */
public String getTempFolderPath() { public String getTempFolderPath() {
@ -1077,15 +1079,15 @@ public class ApiClient {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

9
modules/openapi-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache vendored
View File

@ -8,6 +8,7 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -278,7 +279,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* the system's default tempopary folder. * the system's default tempopary folder.
* *
* @return the temporary folder path * @return the temporary folder path
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)"></a> * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
*/ */
public String getTempFolderPath() { public String getTempFolderPath() {
return tempFolderPath; return tempFolderPath;
@ -596,15 +597,15 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

7
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/ApiClient.mustache vendored
View File

@ -5,6 +5,7 @@ import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.*; import java.util.*;
@ -202,9 +203,9 @@ public class ApiClient {
@Override @Override
public File convert(ResponseBody value) throws IOException { public File convert(ResponseBody value) throws IOException {
File file = File.createTempFile("retrofit-file", ".tmp"); Path path = Files.createTempFile("retrofit-file", ".tmp");
Files.write(Paths.get(file.getPath()), value.bytes()); Files.write(path, value.bytes());
return file; return path.toFile();
} }
}; };
} }

7
samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -33,6 +33,7 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
import java.util.logging.Level; import java.util.logging.Level;
@ -943,15 +944,15 @@ public class ApiClient extends JavaTimeFormatter {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

7
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -33,6 +33,7 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
import java.util.logging.Level; import java.util.logging.Level;
@ -943,15 +944,15 @@ public class ApiClient extends JavaTimeFormatter {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

10
samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -41,6 +41,8 @@ import java.lang.reflect.Type;
import java.net.URI; import java.net.URI;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -524,7 +526,7 @@ public class ApiClient {
* with file response. The default value is <code>null</code>, i.e. using * with file response. The default value is <code>null</code>, i.e. using
* the system's default tempopary folder. * the system's default tempopary folder.
* *
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a> * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
* @return Temporary folder path * @return Temporary folder path
*/ */
public String getTempFolderPath() { public String getTempFolderPath() {
@ -968,15 +970,15 @@ public class ApiClient {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

10
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -35,6 +35,8 @@ import java.lang.reflect.Type;
import java.net.URI; import java.net.URI;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -513,7 +515,7 @@ public class ApiClient {
* with file response. The default value is <code>null</code>, i.e. using * with file response. The default value is <code>null</code>, i.e. using
* the system's default tempopary folder. * the system's default tempopary folder.
* *
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a> * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
* @return Temporary folder path * @return Temporary folder path
*/ */
public String getTempFolderPath() { public String getTempFolderPath() {
@ -969,15 +971,15 @@ public class ApiClient {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

10
samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -35,6 +35,8 @@ import java.lang.reflect.Type;
import java.net.URI; import java.net.URI;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -513,7 +515,7 @@ public class ApiClient {
* with file response. The default value is <code>null</code>, i.e. using * with file response. The default value is <code>null</code>, i.e. using
* the system's default tempopary folder. * the system's default tempopary folder.
* *
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile">createTempFile</a> * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
* @return Temporary folder path * @return Temporary folder path
*/ */
public String getTempFolderPath() { public String getTempFolderPath() {
@ -969,15 +971,15 @@ public class ApiClient {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

9
samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -8,6 +8,7 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -267,7 +268,7 @@ public class ApiClient extends JavaTimeFormatter {
* the system's default tempopary folder. * the system's default tempopary folder.
* *
* @return the temporary folder path * @return the temporary folder path
* @see <a href="https://docs.oracle.com/javase/7/docs/api/java/io/File.html#createTempFile(java.lang.String,%20java.lang.String,%20java.io.File)"></a> * @see <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/Files.html#createTempFile(java.lang.String,%20java.lang.String,%20java.nio.file.attribute.FileAttribute...)">createTempFile</a>
*/ */
public String getTempFolderPath() { public String getTempFolderPath() {
return tempFolderPath; return tempFolderPath;
@ -585,15 +586,15 @@ public class ApiClient extends JavaTimeFormatter {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

7
samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -5,6 +5,7 @@ import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.*; import java.util.*;
@ -199,9 +200,9 @@ public class ApiClient {
@Override @Override
public File convert(ResponseBody value) throws IOException { public File convert(ResponseBody value) throws IOException {
File file = File.createTempFile("retrofit-file", ".tmp"); Path path = Files.createTempFile("retrofit-file", ".tmp");
Files.write(Paths.get(file.getPath()), value.bytes()); Files.write(path, value.bytes());
return file; return path.toFile();
} }
}; };
} }

7
samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -32,6 +32,7 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
import java.util.logging.Level; import java.util.logging.Level;
@ -879,15 +880,15 @@ public class ApiClient extends JavaTimeFormatter {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

7
samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -32,6 +32,7 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
import java.util.logging.Level; import java.util.logging.Level;
@ -824,15 +825,15 @@ public class ApiClient extends JavaTimeFormatter {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**

7
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -33,6 +33,7 @@ import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
import java.util.logging.Level; import java.util.logging.Level;
@ -1027,15 +1028,15 @@ public class ApiClient extends JavaTimeFormatter {
prefix = filename.substring(0, pos) + "-"; prefix = filename.substring(0, pos) + "-";
suffix = filename.substring(pos); suffix = filename.substring(pos);
} }
// File.createTempFile requires the prefix to be at least three characters long // Files.createTempFile requires the prefix to be at least three characters long
if (prefix.length() < 3) if (prefix.length() < 3)
prefix = "download-"; prefix = "download-";
} }
if (tempFolderPath == null) if (tempFolderPath == null)
return File.createTempFile(prefix, suffix); return Files.createTempFile(prefix, suffix).toFile();
else else
return File.createTempFile(prefix, suffix, new File(tempFolderPath)); return Files.createTempFile(Paths.get(tempFolderPath), prefix, suffix).toFile();
} }
/** /**