diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 29d2dc4e1484..a5c4eedd7406 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -101,7 +101,7 @@
org.apache.maven.plugins
maven-release-plugin
- 2.1
+
org.apache.maven.plugins
@@ -256,7 +256,7 @@
org.testng
testng
- ${testng-version}
+
test
@@ -268,7 +268,7 @@
org.jmockit
jmockit
- ${jmockit-version}
+
test
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 6943057f558f..62567a2781cd 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
@@ -19,7 +19,7 @@ import static org.apache.commons.lang3.StringUtils.capitalize;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
public class DefaultGenerator extends AbstractGenerator implements Generator {
- Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
+ protected Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
protected CodegenConfig config;
protected ClientOptInput opts;
@@ -392,16 +392,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
}
File outputFile = new File(outputFilename);
OutputStream out = new FileOutputStream(outputFile, false);
- if (in != null && out != null) {
+ if (in != null) {
System.out.println("writing file " + outputFile);
IOUtils.copy(in, out);
} else {
- if (in == null) {
- System.out.println("can't open " + templateFile + " for input");
- }
- if (out == null) {
- System.out.println("can't open " + outputFile + " for output");
- }
+ System.out.println("can't open " + templateFile + " for input"); // FIXME: use LOGGER instead of standart output
}
files.add(outputFile);
}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
index bf4896ac5d8d..ec77888ec25b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
@@ -39,7 +39,7 @@ public class XmlExampleGenerator {
public XmlExampleGenerator(Map examples) {
this.examples = examples;
if (examples == null) {
- examples = new HashMap(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+ this.examples = new HashMap();
}
}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
index d57783080a6c..9b3f5ee48ca6 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -9,10 +9,6 @@ import java.io.File;
import org.apache.commons.lang.StringUtils;
public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig {
- @Override
- public CodegenType getTag() {
- return CodegenType.CLIENT;
- }
public AbstractTypeScriptClientCodegen() {
super();
@@ -56,6 +52,11 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
// mapped to String as a workaround
typeMapping.put("binary", "string");
}
+
+ @Override
+ public CodegenType getTag() {
+ return CodegenType.CLIENT;
+ }
@Override
public String escapeReservedWord(String name) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
index 0ab69bd54332..55a4abbf4173 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
@@ -22,7 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig {
- @SuppressWarnings("unused")
+ @SuppressWarnings({ "unused", "hiding" })
private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
protected boolean optionalAssemblyInfoFlag = true;
protected boolean optionalMethodArgumentFlag = true;