From 2161907a8f30f9620385edba4d3bdb7459abd00f Mon Sep 17 00:00:00 2001 From: JULIEN MASNADA Date: Mon, 11 Jan 2016 22:15:10 +0100 Subject: [PATCH 1/7] Using logger instead of System.out --- .../src/main/java/config/ConfigParser.java | 11 +++++-- .../io/swagger/codegen/AbstractGenerator.java | 13 +++++--- .../main/java/io/swagger/codegen/Codegen.java | 32 +++++++++++-------- .../io/swagger/codegen/DefaultCodegen.java | 2 +- .../io/swagger/codegen/DefaultGenerator.java | 12 ++++--- .../io/swagger/codegen/MetaGenerator.java | 14 +++++--- .../io/swagger/codegen/auth/AuthParser.java | 9 +++++- .../languages/FlaskConnexionCodegen.java | 10 +++++- .../languages/JavaInflectorServerCodegen.java | 12 +++++-- .../languages/NodeJSServerCodegen.java | 8 ++++- .../languages/SinatraServerCodegen.java | 9 +++++- .../codegen/languages/SwaggerGenerator.java | 16 +++++++--- .../languages/SwaggerYamlGenerator.java | 16 +++++++--- .../swagger/generator/online/Generator.java | 2 +- 14 files changed, 118 insertions(+), 48 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/config/ConfigParser.java b/modules/swagger-codegen/src/main/java/config/ConfigParser.java index 101fbb0d256..abcabca9aea 100644 --- a/modules/swagger-codegen/src/main/java/config/ConfigParser.java +++ b/modules/swagger-codegen/src/main/java/config/ConfigParser.java @@ -7,11 +7,16 @@ import java.io.File; import java.util.Iterator; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class ConfigParser { + private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class); + public static Config read(String location) { - System.out.println("reading config from " + location); + LOG.debug("reading config from " + location); ObjectMapper mapper = new ObjectMapper(); @@ -27,11 +32,11 @@ public class ConfigParser { if (optionNode.getValue().isValueNode()) { config.setOption(optionNode.getKey(), optionNode.getValue().asText()); } else { - System.out.println("omitting non-value node " + optionNode.getKey()); + LOG.warn("omitting non-value node " + optionNode.getKey()); } } } catch (Exception e) { - System.out.println(e.getMessage()); + LOG.error(e.getMessage()); return null; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java index 467d6e40b90..28d13b72647 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -10,13 +10,18 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; +import java.util.Scanner; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public abstract class AbstractGenerator { + private static final Logger LOG = LoggerFactory.getLogger(AbstractGenerator.class); @SuppressWarnings("static-method") public File writeToFile(String filename, String contents) throws IOException { - System.out.println("writing file " + filename); + LOG.debug("writing file " + filename); File output = new File(filename); if (output.getParent() != null && !new File(output.getParent()).exists()) { @@ -37,10 +42,10 @@ public abstract class AbstractGenerator { if (reader == null) { throw new RuntimeException("no file found"); } - java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A"); + Scanner s = new Scanner(reader).useDelimiter("\\A"); return s.hasNext() ? s.next() : ""; } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getMessage()); } throw new RuntimeException("can't load template " + name); } @@ -53,7 +58,7 @@ public abstract class AbstractGenerator { } return new InputStreamReader(is); } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getMessage()); } throw new RuntimeException("can't load template " + name); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java index 3168808e5b1..b5aab099e08 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java @@ -1,15 +1,5 @@ package io.swagger.codegen; -import config.Config; -import config.ConfigParser; -import io.swagger.models.Swagger; -import io.swagger.parser.SwaggerParser; -import org.apache.commons.cli.BasicParser; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -17,12 +7,28 @@ import java.util.List; import java.util.Map; import java.util.ServiceLoader; +import org.apache.commons.cli.BasicParser; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import config.Config; +import config.ConfigParser; +import io.swagger.models.Swagger; +import io.swagger.parser.SwaggerParser; + /** * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator} * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547 */ @Deprecated public class Codegen extends DefaultGenerator { + + private static final Logger LOG = LoggerFactory.getLogger(Codegen.class); + static Map configs = new HashMap(); static String configString; static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" + @@ -111,7 +117,7 @@ public class Codegen extends DefaultGenerator { .swagger(swagger); new Codegen().opts(clientOptInput).generate(); } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } @@ -136,9 +142,9 @@ public class Codegen extends DefaultGenerator { } else { // see if it's a class try { - System.out.println("loading class " + name); + LOG.debug("loading class " + name); Class customClass = Class.forName(name); - System.out.println("loaded"); + LOG.debug("loaded"); return (CodegenConfig) customClass.newInstance(); } catch (Exception e) { throw new RuntimeException("can't load class " + name); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 968fbae5381..434e0914e85 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -689,7 +689,7 @@ public class DefaultCodegen { } catch (Exception e) { LOGGER.warn("Error obtaining the datatype from RefProperty:" + p + ". Datatype default to Object"); datatype = "Object"; - e.printStackTrace(); + LOGGER.error(e.getMessage(), e); } } else { if (p != null) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 263adc05cf8..89320a3b37c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -240,7 +240,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } if (System.getProperty("debugModels") != null) { - System.out.println("############ Model info ############"); + LOGGER.debug("############ Model info ############"); Json.prettyPrint(allModels); } @@ -340,7 +340,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } if (System.getProperty("debugOperations") != null) { - System.out.println("############ Operation info ############"); + LOGGER.debug("############ Operation info ############"); Json.prettyPrint(allOperations); } @@ -379,7 +379,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.postProcessSupportingFileData(bundle); if (System.getProperty("debugSupportingFiles") != null) { - System.out.println("############ Supporting file info ############"); + LOGGER.debug("############ Supporting file info ############"); Json.prettyPrint(bundle); } @@ -439,10 +439,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { File outputFile = new File(outputFilename); OutputStream out = new FileOutputStream(outputFile, false); if (in != null) { - System.out.println("writing file " + outputFile); + LOGGER.info("writing file " + outputFile); IOUtils.copy(in, out); } else { - System.out.println("can't open " + templateFile + " for input"); // FIXME: use LOGGER instead of standart output + if (in == null) { + LOGGER.error("can't open " + templateFile + " for input"); + } } files.add(outputFile); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java index e528fb51f52..223eff3e7d5 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java @@ -8,8 +8,11 @@ import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; +import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; @@ -24,6 +27,9 @@ import java.util.ServiceLoader; */ @Deprecated public class MetaGenerator extends AbstractGenerator { + + private static final Logger LOG = LoggerFactory.getLogger(MetaGenerator.class); + static Map configs = new HashMap(); static String configString; @@ -99,7 +105,7 @@ public class MetaGenerator extends AbstractGenerator { usage(options); return; } - System.out.println("writing to folder " + outputFolder); + LOG.info("writing to folder " + outputFolder); File outputFolderLocation = new File(outputFolder); if (!outputFolderLocation.exists()) { outputFolderLocation.mkdirs(); @@ -163,11 +169,11 @@ public class MetaGenerator extends AbstractGenerator { } else { String template = readTemplate(templateDir + File.separator + support.templateFile); FileUtils.writeStringToFile(new File(outputFilename), template); - System.out.println("copying file to " + outputFilename); + LOG.info("copying file to " + outputFilename); files.add(new File(outputFilename)); } - } catch (java.io.IOException e) { - e.printStackTrace(); + } catch (IOException e) { + LOG.error(e.getMessage(), e); } } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java index 4fb39517cd4..eb51e78095a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java @@ -7,9 +7,16 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import config.ConfigParser; + import static org.apache.commons.lang3.StringUtils.isNotEmpty; public class AuthParser { + + private static final Logger LOG = LoggerFactory.getLogger(AuthParser.class); public static List parse(String urlEncodedAuthStr) { List auths = new ArrayList(); @@ -38,7 +45,7 @@ public class AuthParser { .append(URLEncoder.encode(v.getValue(), "UTF-8")); } catch (Exception e) { // continue - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } return b.toString(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index 25f72bc26c5..d2a166bcc8c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; + +import config.ConfigParser; import io.swagger.codegen.*; import io.swagger.models.HttpMethod; import io.swagger.models.Operation; @@ -14,7 +16,13 @@ import io.swagger.util.Yaml; import java.io.File; import java.util.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConfig { + + private static final Logger LOG = LoggerFactory.getLogger(FlaskConnexionCodegen.class); + public static final String CONTROLLER_PACKAGE = "controllerPackage"; public static final String DEFAULT_CONTROLLER = "defaultController"; @@ -289,7 +297,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf try { objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); } catch (JsonProcessingException e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } for (Map operations : getOperations(objs)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index 32164f6f92c..3546a69d6ad 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -11,8 +11,14 @@ import io.swagger.util.Yaml; import java.util.*; -public class JavaInflectorServerCodegen extends JavaClientCodegen { - protected String title = "Swagger Inflector"; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig { + + private static final Logger LOG = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); + + protected String title = "Swagger Inflector"; public JavaInflectorServerCodegen() { super(); @@ -164,7 +170,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen { try { objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); } catch (JsonProcessingException e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } return super.postProcessSupportingFileData(objs); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index 6fa031050bb..44c540eb0de 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -20,7 +20,13 @@ import java.math.BigDecimal; import java.util.*; import java.util.Map.Entry; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig { + + private static final Logger LOG = LoggerFactory.getLogger(NodeJSServerCodegen.class); + protected String apiVersion = "1.0.0"; protected int serverPort = 8080; protected String projectName = "swagger-server"; @@ -284,7 +290,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig }); objs.put("swagger-yaml", Yaml.mapper().registerModule(module).writeValueAsString(swagger)); } catch (JsonProcessingException e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } for (Map operations : getOperations(objs)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java index 92f524f7ed4..bc336f29dc4 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java @@ -17,7 +17,14 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfig { + + private static final Logger LOG = LoggerFactory.getLogger(SinatraServerCodegen.class); + protected String gemName; protected String moduleName; protected String gemVersion = "1.0.0"; @@ -230,7 +237,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi try { objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); } catch (JsonProcessingException e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } return super.postProcessSupportingFileData(objs); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java index a98d5fc5b13..7a02140cc91 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java @@ -1,16 +1,22 @@ package io.swagger.codegen.languages; +import java.io.File; + +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; import io.swagger.models.Swagger; import io.swagger.util.Json; -import org.apache.commons.io.FileUtils; - -import java.io.File; public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { + + private static final Logger LOG = LoggerFactory.getLogger(SwaggerGenerator.class); + public SwaggerGenerator() { super(); embeddedTemplateDir = templateDir = "swagger"; @@ -41,9 +47,9 @@ public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { try { String outputFile = outputFolder + File.separator + "swagger.json"; FileUtils.writeStringToFile(new File(outputFile), swaggerString); - System.out.println("wrote file to " + outputFile); + LOG.debug("wrote file to " + outputFile); } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java index 9c4680112e9..9dd2f1ab96d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java @@ -1,16 +1,22 @@ package io.swagger.codegen.languages; +import java.io.File; + +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.CodegenType; import io.swagger.codegen.DefaultCodegen; import io.swagger.codegen.SupportingFile; import io.swagger.models.Swagger; import io.swagger.util.Yaml; -import org.apache.commons.io.FileUtils; - -import java.io.File; public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig { + + private static final Logger LOG = LoggerFactory.getLogger(SwaggerYamlGenerator.class); + public SwaggerYamlGenerator() { super(); embeddedTemplateDir = templateDir = "swagger"; @@ -40,9 +46,9 @@ public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfi String swaggerString = Yaml.mapper().writeValueAsString(swagger); String outputFile = outputFolder + File.separator + "swagger.yaml"; FileUtils.writeStringToFile(new File(outputFile), swaggerString); - System.out.println("wrote file to " + outputFile); + LOG.debug("wrote file to " + outputFile); } catch (Exception e) { - e.printStackTrace(); + LOG.error(e.getMessage(), e); } } } \ No newline at end of file diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java index c04ea920089..9b721d36a4f 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java @@ -122,7 +122,7 @@ public class Generator { List files = new Codegen().opts(clientOptInput).generate(); if (files.size() > 0) { List filesToAdd = new ArrayList(); - System.out.println("adding to " + outputFolder); + LOGGER.debug("adding to " + outputFolder); filesToAdd.add(new File(outputFolder)); ZipUtil zip = new ZipUtil(); zip.compressFiles(filesToAdd, outputFilename); From 2a9ead870cdf4b1b3e46e9110a20389a450ef248 Mon Sep 17 00:00:00 2001 From: JULIEN MASNADA Date: Wed, 13 Jan 2016 00:19:41 +0100 Subject: [PATCH 2/7] Use LOGGER instead of LOG Use spaces instead of tabs --- .../src/main/java/io/swagger/codegen/cmd/Meta.java | 8 ++++---- .../src/main/java/config/ConfigParser.java | 8 ++++---- .../main/java/io/swagger/codegen/AbstractGenerator.java | 8 ++++---- .../src/main/java/io/swagger/codegen/Codegen.java | 8 ++++---- .../src/main/java/io/swagger/codegen/MetaGenerator.java | 8 ++++---- .../src/main/java/io/swagger/codegen/auth/AuthParser.java | 4 ++-- .../io/swagger/codegen/config/CodegenConfigurator.java | 6 +++--- .../swagger/codegen/languages/FlaskConnexionCodegen.java | 4 ++-- .../codegen/languages/JavaInflectorServerCodegen.java | 4 ++-- .../io/swagger/codegen/languages/NodeJSServerCodegen.java | 4 ++-- .../swagger/codegen/languages/SinatraServerCodegen.java | 4 ++-- .../io/swagger/codegen/languages/SwaggerGenerator.java | 6 +++--- .../swagger/codegen/languages/SwaggerYamlGenerator.java | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java index 348c94d92b0..c2dffbe6200 100644 --- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java @@ -33,7 +33,7 @@ import static com.google.common.base.Joiner.on; "specify, and includes default templates to include.") public class Meta implements Runnable { - private static final Logger LOG = LoggerFactory.getLogger(Meta.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Meta.class); private static final String TEMPLATE_DIR_CLASSPATH = "codegen"; private static final String MUSTACHE_EXTENSION = ".mustache"; @@ -53,7 +53,7 @@ public class Meta implements Runnable { @Override public void run() { final File targetDir = new File(outputFolder); - LOG.info("writing to folder [{}]", targetDir.getAbsolutePath()); + LOGGER.info("writing to folder [{}]", targetDir.getAbsolutePath()); String mainClass = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, name) + "Generator"; @@ -108,13 +108,13 @@ public class Meta implements Runnable { String formatted = template; if (support.templateFile.endsWith(MUSTACHE_EXTENSION)) { - LOG.info("writing file to {}", outputFile.getAbsolutePath()); + LOGGER.info("writing file to {}", outputFile.getAbsolutePath()); formatted = Mustache.compiler().withLoader(loader(generator)) .defaultValue("") .compile(template) .execute(data); } else { - LOG.info("copying file to {}", outputFile.getAbsolutePath()); + LOGGER.info("copying file to {}", outputFile.getAbsolutePath()); } FileUtils.writeStringToFile(outputFile, formatted); diff --git a/modules/swagger-codegen/src/main/java/config/ConfigParser.java b/modules/swagger-codegen/src/main/java/config/ConfigParser.java index abcabca9aea..0d0d7de8f8a 100644 --- a/modules/swagger-codegen/src/main/java/config/ConfigParser.java +++ b/modules/swagger-codegen/src/main/java/config/ConfigParser.java @@ -12,11 +12,11 @@ import org.slf4j.LoggerFactory; public class ConfigParser { - private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConfigParser.class); public static Config read(String location) { - LOG.debug("reading config from " + location); + LOGGER.debug("reading config from " + location); ObjectMapper mapper = new ObjectMapper(); @@ -32,11 +32,11 @@ public class ConfigParser { if (optionNode.getValue().isValueNode()) { config.setOption(optionNode.getKey(), optionNode.getValue().asText()); } else { - LOG.warn("omitting non-value node " + optionNode.getKey()); + LOGGER.warn("omitting non-value node " + optionNode.getKey()); } } } catch (Exception e) { - LOG.error(e.getMessage()); + LOGGER.error(e.getMessage()); return null; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java index 28d13b72647..10664861a3a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -17,11 +17,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public abstract class AbstractGenerator { - private static final Logger LOG = LoggerFactory.getLogger(AbstractGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractGenerator.class); @SuppressWarnings("static-method") public File writeToFile(String filename, String contents) throws IOException { - LOG.debug("writing file " + filename); + LOGGER.debug("writing file " + filename); File output = new File(filename); if (output.getParent() != null && !new File(output.getParent()).exists()) { @@ -45,7 +45,7 @@ public abstract class AbstractGenerator { Scanner s = new Scanner(reader).useDelimiter("\\A"); return s.hasNext() ? s.next() : ""; } catch (Exception e) { - LOG.error(e.getMessage()); + LOGGER.error(e.getMessage()); } throw new RuntimeException("can't load template " + name); } @@ -58,7 +58,7 @@ public abstract class AbstractGenerator { } return new InputStreamReader(is); } catch (Exception e) { - LOG.error(e.getMessage()); + LOGGER.error(e.getMessage()); } throw new RuntimeException("can't load template " + name); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java index b5aab099e08..5750b6341ac 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java @@ -27,7 +27,7 @@ import io.swagger.parser.SwaggerParser; @Deprecated public class Codegen extends DefaultGenerator { - private static final Logger LOG = LoggerFactory.getLogger(Codegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Codegen.class); static Map configs = new HashMap(); static String configString; @@ -117,7 +117,7 @@ public class Codegen extends DefaultGenerator { .swagger(swagger); new Codegen().opts(clientOptInput).generate(); } catch (Exception e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } @@ -142,9 +142,9 @@ public class Codegen extends DefaultGenerator { } else { // see if it's a class try { - LOG.debug("loading class " + name); + LOGGER.debug("loading class " + name); Class customClass = Class.forName(name); - LOG.debug("loaded"); + LOGGER.debug("loaded"); return (CodegenConfig) customClass.newInstance(); } catch (Exception e) { throw new RuntimeException("can't load class " + name); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java index 223eff3e7d5..7403b191bc2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java @@ -28,7 +28,7 @@ import java.util.ServiceLoader; @Deprecated public class MetaGenerator extends AbstractGenerator { - private static final Logger LOG = LoggerFactory.getLogger(MetaGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MetaGenerator.class); static Map configs = new HashMap(); static String configString; @@ -105,7 +105,7 @@ public class MetaGenerator extends AbstractGenerator { usage(options); return; } - LOG.info("writing to folder " + outputFolder); + LOGGER.info("writing to folder " + outputFolder); File outputFolderLocation = new File(outputFolder); if (!outputFolderLocation.exists()) { outputFolderLocation.mkdirs(); @@ -169,11 +169,11 @@ public class MetaGenerator extends AbstractGenerator { } else { String template = readTemplate(templateDir + File.separator + support.templateFile); FileUtils.writeStringToFile(new File(outputFilename), template); - LOG.info("copying file to " + outputFilename); + LOGGER.info("copying file to " + outputFilename); files.add(new File(outputFilename)); } } catch (IOException e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java index eb51e78095a..65896dc5933 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthParser.java @@ -16,7 +16,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty; public class AuthParser { - private static final Logger LOG = LoggerFactory.getLogger(AuthParser.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AuthParser.class); public static List parse(String urlEncodedAuthStr) { List auths = new ArrayList(); @@ -45,7 +45,7 @@ public class AuthParser { .append(URLEncoder.encode(v.getValue(), "UTF-8")); } catch (Exception e) { // continue - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } return b.toString(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java index cc9b0ab5d8a..c4b275e8eeb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java @@ -36,7 +36,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty; */ public class CodegenConfigurator { - public static final Logger LOG = LoggerFactory.getLogger(CodegenConfigurator.class); + public static final Logger LOGGER = LoggerFactory.getLogger(CodegenConfigurator.class); private String lang; private String inputSpec; @@ -349,7 +349,7 @@ public class CodegenConfigurator { if (!verbose) { return; } - LOG.info("\nVERBOSE MODE: ON. Additional debug options are injected" + + LOGGER.info("\nVERBOSE MODE: ON. Additional debug options are injected" + "\n - [debugSwagger] prints the swagger specification as interpreted by the codegen" + "\n - [debugModels] prints models passed to the template engine" + "\n - [debugOperations] prints operations passed to the template engine" + @@ -392,7 +392,7 @@ public class CodegenConfigurator { try { return Json.mapper().readValue(new File(configFile), CodegenConfigurator.class); } catch (IOException e) { - LOG.error("Unable to deserialize config file: " + configFile, e); + LOGGER.error("Unable to deserialize config file: " + configFile, e); } } return null; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index d2a166bcc8c..1dd90dada48 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory; public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConfig { - private static final Logger LOG = LoggerFactory.getLogger(FlaskConnexionCodegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FlaskConnexionCodegen.class); public static final String CONTROLLER_PACKAGE = "controllerPackage"; public static final String DEFAULT_CONTROLLER = "defaultController"; @@ -297,7 +297,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf try { objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); } catch (JsonProcessingException e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } for (Map operations : getOperations(objs)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index 3546a69d6ad..2608c8ac429 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory; public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig { - private static final Logger LOG = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); protected String title = "Swagger Inflector"; @@ -170,7 +170,7 @@ public class JavaInflectorServerCodegen extends JavaClientCodegen implements Cod try { objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); } catch (JsonProcessingException e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } return super.postProcessSupportingFileData(objs); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java index 44c540eb0de..cd2f8980c15 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig { - private static final Logger LOG = LoggerFactory.getLogger(NodeJSServerCodegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(NodeJSServerCodegen.class); protected String apiVersion = "1.0.0"; protected int serverPort = 8080; @@ -290,7 +290,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig }); objs.put("swagger-yaml", Yaml.mapper().registerModule(module).writeValueAsString(swagger)); } catch (JsonProcessingException e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } for (Map operations : getOperations(objs)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java index bc336f29dc4..ace38574b5c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfig { - private static final Logger LOG = LoggerFactory.getLogger(SinatraServerCodegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SinatraServerCodegen.class); protected String gemName; protected String moduleName; @@ -237,7 +237,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi try { objs.put("swagger-yaml", Yaml.mapper().writeValueAsString(swagger)); } catch (JsonProcessingException e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } return super.postProcessSupportingFileData(objs); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java index 7a02140cc91..936576de177 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java @@ -15,7 +15,7 @@ import io.swagger.util.Json; public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { - private static final Logger LOG = LoggerFactory.getLogger(SwaggerGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerGenerator.class); public SwaggerGenerator() { super(); @@ -47,9 +47,9 @@ public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { try { String outputFile = outputFolder + File.separator + "swagger.json"; FileUtils.writeStringToFile(new File(outputFile), swaggerString); - LOG.debug("wrote file to " + outputFile); + LOGGER.debug("wrote file to " + outputFile); } catch (Exception e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java index 9dd2f1ab96d..460da716c3a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java @@ -15,7 +15,7 @@ import io.swagger.util.Yaml; public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig { - private static final Logger LOG = LoggerFactory.getLogger(SwaggerYamlGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerYamlGenerator.class); public SwaggerYamlGenerator() { super(); @@ -46,9 +46,9 @@ public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfi String swaggerString = Yaml.mapper().writeValueAsString(swagger); String outputFile = outputFolder + File.separator + "swagger.yaml"; FileUtils.writeStringToFile(new File(outputFile), swaggerString); - LOG.debug("wrote file to " + outputFile); + LOGGER.debug("wrote file to " + outputFile); } catch (Exception e) { - LOG.error(e.getMessage(), e); + LOGGER.error(e.getMessage(), e); } } } \ No newline at end of file From 68dc407f1de3e831f9b780116fdddba340cf8f7c Mon Sep 17 00:00:00 2001 From: JULIEN MASNADA Date: Wed, 13 Jan 2016 00:24:22 +0100 Subject: [PATCH 3/7] Fiexd some indentation problem --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 434e0914e85..a66ef6db810 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1090,7 +1090,7 @@ public class DefaultCodegen { ArrayProperty ap = (ArrayProperty) p; CodegenProperty cp = fromProperty(property.name, ap.getItems()); if (cp == null) { - LOGGER.warn("skipping invalid property " + Json.pretty(p)); + LOGGER.warn("skipping invalid property " + Json.pretty(p)); } else { property.baseType = getSwaggerType(p); if (!languageSpecificPrimitives.contains(cp.baseType)) { From 10a9316d7557aabf08a5880b7b9713aa8d49d4e6 Mon Sep 17 00:00:00 2001 From: JULIEN MASNADA Date: Wed, 13 Jan 2016 00:27:31 +0100 Subject: [PATCH 4/7] Fixed some more indentations problems --- .../main/java/io/swagger/codegen/DefaultGenerator.java | 8 ++++---- .../codegen/languages/JavaInflectorServerCodegen.java | 6 +++--- .../io/swagger/codegen/languages/SwaggerGenerator.java | 2 +- .../swagger/codegen/languages/SwaggerYamlGenerator.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 89320a3b37c..4a47d57772b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -240,7 +240,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } if (System.getProperty("debugModels") != null) { - LOGGER.debug("############ Model info ############"); + LOGGER.debug("############ Model info ############"); Json.prettyPrint(allModels); } @@ -340,7 +340,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } if (System.getProperty("debugOperations") != null) { - LOGGER.debug("############ Operation info ############"); + LOGGER.debug("############ Operation info ############"); Json.prettyPrint(allOperations); } @@ -379,7 +379,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.postProcessSupportingFileData(bundle); if (System.getProperty("debugSupportingFiles") != null) { - LOGGER.debug("############ Supporting file info ############"); + LOGGER.debug("############ Supporting file info ############"); Json.prettyPrint(bundle); } @@ -443,7 +443,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { IOUtils.copy(in, out); } else { if (in == null) { - LOGGER.error("can't open " + templateFile + " for input"); + LOGGER.error("can't open " + templateFile + " for input"); } } files.add(outputFile); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java index 2608c8ac429..c21859d7d62 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java @@ -16,9 +16,9 @@ import org.slf4j.LoggerFactory; public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); - - protected String title = "Swagger Inflector"; + private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); + + protected String title = "Swagger Inflector"; public JavaInflectorServerCodegen() { super(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java index 936576de177..b34e6bba5ab 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java @@ -15,7 +15,7 @@ import io.swagger.util.Json; public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerGenerator.class); public SwaggerGenerator() { super(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java index 460da716c3a..5442000280f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java @@ -15,7 +15,7 @@ import io.swagger.util.Yaml; public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerYamlGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerYamlGenerator.class); public SwaggerYamlGenerator() { super(); From 8c3bd60a53042d8804bc82f8dc11c208fc642047 Mon Sep 17 00:00:00 2001 From: JULIEN MASNADA Date: Wed, 13 Jan 2016 00:29:28 +0100 Subject: [PATCH 5/7] Some more... --- .../src/main/java/io/swagger/codegen/Codegen.java | 2 +- .../src/main/java/io/swagger/codegen/MetaGenerator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java index 5750b6341ac..649f068d16c 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java @@ -27,7 +27,7 @@ import io.swagger.parser.SwaggerParser; @Deprecated public class Codegen extends DefaultGenerator { - private static final Logger LOGGER = LoggerFactory.getLogger(Codegen.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Codegen.class); static Map configs = new HashMap(); static String configString; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java index 7403b191bc2..6bbc02130c7 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java @@ -28,7 +28,7 @@ import java.util.ServiceLoader; @Deprecated public class MetaGenerator extends AbstractGenerator { - private static final Logger LOGGER = LoggerFactory.getLogger(MetaGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MetaGenerator.class); static Map configs = new HashMap(); static String configString; From 16f9c8f7ddf1e7280bb28cb60352f566fdd740e2 Mon Sep 17 00:00:00 2001 From: N090536 Date: Mon, 25 Jan 2016 12:50:05 +0100 Subject: [PATCH 6/7] Changing to INFO level in order for the following switches to work as expected: -DdebugModels -DdebugOperations -DdebugSupportingFiles --- .../main/java/io/swagger/codegen/DefaultGenerator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 4a47d57772b..6da8958fe13 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -240,7 +240,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } if (System.getProperty("debugModels") != null) { - LOGGER.debug("############ Model info ############"); + LOGGER.info("############ Model info ############"); Json.prettyPrint(allModels); } @@ -340,7 +340,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } if (System.getProperty("debugOperations") != null) { - LOGGER.debug("############ Operation info ############"); + LOGGER.info("############ Operation info ############"); Json.prettyPrint(allOperations); } @@ -379,7 +379,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.postProcessSupportingFileData(bundle); if (System.getProperty("debugSupportingFiles") != null) { - LOGGER.debug("############ Supporting file info ############"); + LOGGER.info("############ Supporting file info ############"); Json.prettyPrint(bundle); } @@ -552,7 +552,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { public void processOperation(String resourcePath, String httpMethod, Operation operation, Map> operations, Path path) { if (operation != null) { if (System.getProperty("debugOperations") != null) { - LOGGER.debug("processOperation: resourcePath= " + resourcePath + "\t;" + httpMethod + " " + operation + "\n"); + LOGGER.info("processOperation: resourcePath= " + resourcePath + "\t;" + httpMethod + " " + operation + + "\n"); } List tags = operation.getTags(); if (tags == null) { From f8b82e14fe58f47c02a4cfa9cd0ce27d0ed1ee45 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 28 Jan 2016 11:25:11 +0800 Subject: [PATCH 7/7] use logger.info to display command line result --- modules/swagger-codegen/src/main/java/config/ConfigParser.java | 2 +- .../src/main/java/io/swagger/codegen/AbstractGenerator.java | 2 +- .../petstore/php/SwaggerClient-php/lib/ObjectSerializer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/config/ConfigParser.java b/modules/swagger-codegen/src/main/java/config/ConfigParser.java index 0d0d7de8f8a..68cbb613f3a 100644 --- a/modules/swagger-codegen/src/main/java/config/ConfigParser.java +++ b/modules/swagger-codegen/src/main/java/config/ConfigParser.java @@ -16,7 +16,7 @@ public class ConfigParser { public static Config read(String location) { - LOGGER.debug("reading config from " + location); + LOGGER.info("reading config from " + location); ObjectMapper mapper = new ObjectMapper(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java index 10664861a3a..5ed07851338 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java @@ -21,7 +21,7 @@ public abstract class AbstractGenerator { @SuppressWarnings("static-method") public File writeToFile(String filename, String contents) throws IOException { - LOGGER.debug("writing file " + filename); + LOGGER.info("writing file " + filename); File output = new File(filename); if (output.getParent() != null && !new File(output.getParent()).exists()) { diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php index a4a1d061185..7b3509b5856 100644 --- a/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php @@ -153,7 +153,7 @@ class ObjectSerializer */ public function toFormValue($value) { - if ($value instanceof SplFileObject) { + if ($value instanceof \SplFileObject) { return $value->getRealPath(); } else { return $this->toString($value);