Skip to content

DefaultGenerator: fix NullPointerException #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmini merged 1 commit into from
May 20, 2018
Merged

DefaultGenerator: fix NullPointerException #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private void generateModels(List<File> files, List<Object> allModels, List<Strin
return;
}

final Map<String, Schema> schemas = this.openAPI.getComponents().getSchemas();
final Map<String, Schema> schemas = ModelUtils.getSchemas(this.openAPI);
if (schemas == null) {
return;
}
Expand Down
42 changes: 38 additions & 4 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

import com.google.common.collect.Sets;

import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.BooleanSchema;
Expand All @@ -38,10 +40,12 @@
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil;

import org.junit.rules.TemporaryFolder;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.ClientOpts;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
Expand Down Expand Up @@ -1104,24 +1108,54 @@ public void arrayOfArraySchemaTestInOperationResponse() {
Assert.assertTrue(co.imports.contains("Pet"));
}

@Test(enabled = false, description = "disabled since templates have been moved.")
@Test
public void generateModel() throws Exception {
String inputSpec = "src/test/resources/3_0/petstore.json";

folder.create();
final File output = folder.getRoot();
getClass().getClassLoader().getResourceAsStream("src/test/resources/3_0_0/petstore.json");
Assert.assertTrue(new File(inputSpec).exists());

final CodegenConfigurator configurator = new CodegenConfigurator()
.setLang("java")
.setLibrary("jersey2")
//.addAdditionalProperty("withXml", true)
.addAdditionalProperty(CodegenConstants.SERIALIZABLE_MODEL, true)
.setInputSpec("src/test/resources/3_0_0/petstore.json")
.setInputSpec(inputSpec)
.setOutputDir(output.getAbsolutePath());

final ClientOptInput clientOptInput = configurator.toClientOptInput();
new DefaultGenerator().opts(clientOptInput).generate();

File orderFile = new File(output, "src/main/java/io/swagger/client/model/Order.java");
File orderFile = new File(output, "src/main/java/org/openapitools/client/model/Order.java");
Assert.assertTrue(orderFile.exists());
folder.delete();
}

@Test
public void generateEmpty() throws Exception {
String inputSpec = "src/test/resources/3_0/ping.yaml";

folder.create();
final File output = folder.getRoot();
Assert.assertTrue(new File(inputSpec).exists());

JavaClientCodegen config = new org.openapitools.codegen.languages.JavaClientCodegen();
config.setJava8Mode(true);
config.setHideGenerationTimestamp(true);
config.setOutputDir(output.getAbsolutePath());

final OpenAPIParser openApiParser = new OpenAPIParser();
final ParseOptions options = new ParseOptions();
final OpenAPI openAPI = openApiParser.readLocation(inputSpec, null, options).getOpenAPI();

final ClientOptInput opts = new ClientOptInput();
opts.setConfig(config);
opts.setOpenAPI(openAPI);
opts.setOpts(new ClientOpts());
new DefaultGenerator().opts(opts).generate();

File orderFile = new File(output, "src/main/java/org/openapitools/client/api/DefaultApi.java");
Assert.assertTrue(orderFile.exists());
folder.delete();
}
Expand Down