diff --git a/modules/swagger-codegen/src/main/java/config/ConfigParser.java b/modules/swagger-codegen/src/main/java/config/ConfigParser.java index 101fbb0d25..abcabca9ae 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 467d6e40b9..28d13b7264 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 3168808e5b..b5aab099e0 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 968fbae538..434e0914e8 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 263adc05cf..89320a3b37 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 e528fb51f5..223eff3e7d 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 4fb39517cd..eb51e78095 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 25f72bc26c..d2a166bcc8 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 32164f6f92..3546a69d6a 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 6fa031050b..44c540eb0d 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 92f524f7ed..bc336f29dc 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 a98d5fc5b1..7a02140cc9 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 9c4680112e..9dd2f1ab96 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 c04ea92008..9b721d36a4 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);