Skip to content

Commit 989fcbd

Browse files
committed
add dependency of codegen templates project and deprecated java client/inflector classes.
1 parent 0c9eb34 commit 989fcbd

File tree

6 files changed

+20
-4
lines changed

6 files changed

+20
-4
lines changed

modules/swagger-codegen-cli/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@
7979
<artifactId>swagger-codegen</artifactId>
8080
<version>${project.version}</version>
8181
</dependency>
82+
<dependency>
83+
<groupId>io.swagger</groupId>
84+
<artifactId>swagger-codegen-templates</artifactId>
85+
<version>1.0-SNAPSHOT</version>
86+
</dependency>
8287
<dependency>
8388
<groupId>io.swagger.core.v3</groupId>
8489
<artifactId>swagger-core</artifactId>

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
4848
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
4949

50-
50+
/**
51+
* new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-templates
52+
*/
53+
@Deprecated
5154
public abstract class AbstractJavaCodegen extends DefaultCodegen implements CodegenConfig {
5255

5356
static Logger LOGGER = LoggerFactory.getLogger(AbstractJavaCodegen.class);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
import java.util.*;
2121
import java.util.regex.Pattern;
2222

23+
/**
24+
* new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-templates
25+
*/
26+
@Deprecated
2327
public class JavaClientCodegen extends AbstractJavaCodegen
2428
implements BeanValidationFeatures, PerformBeanValidationFeatures,
2529
GzipFeatures

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
2323
import static io.swagger.codegen.languages.helpers.ExtensionHelper.getBooleanValue;
2424

25+
/**
26+
* new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-templates
27+
*/
28+
@Deprecated
2529
public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
2630

2731
private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/helpers/JavaHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
public class JavaHelper {
1717

1818
public CharSequence getClassDefinition(CodegenModel codegenModel, Options options) throws IOException {
19-
final Boolean serializableModel = Boolean.valueOf(String.valueOf(options.get(CodegenConstants.SERIALIZABLE_MODEL)));
20-
final Boolean parceableModel = Boolean.valueOf(String.valueOf(options.get(JavaClientCodegen.PARCELABLE_MODEL)));
19+
final Boolean serializableModel = options.get(CodegenConstants.SERIALIZABLE_MODEL) != null ? options.get(CodegenConstants.SERIALIZABLE_MODEL) : Boolean.FALSE;
20+
final Boolean parceableModel = options.get(JavaClientCodegen.PARCELABLE_MODEL) != null ? options.get(JavaClientCodegen.PARCELABLE_MODEL) : Boolean.FALSE;
2121
final StringBuilder builder = new StringBuilder();
2222
builder.append(codegenModel.classname);
2323
if (StringUtils.isNotBlank(codegenModel.parent)) {

modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ io.swagger.codegen.languages.HaskellServantCodegen
2626
io.swagger.codegen.languages.JMeterCodegen
2727
io.swagger.codegen.languages.JavaCXFClientCodegen
2828
io.swagger.codegen.languages.JavaCXFServerCodegen
29-
io.swagger.codegen.languages.JavaClientCodegen
29+
io.swagger.codegen.languages.java.JavaClientCodegen
3030
io.swagger.codegen.languages.JavaInflectorServerCodegen
3131
io.swagger.codegen.languages.JavaJAXRSCXFCDIServerCodegen
3232
io.swagger.codegen.languages.JavaJAXRSSpecServerCodegen

0 commit comments

Comments
 (0)