Merge pull request #18 from OpenAPITools/14-fix-global-property-usage

Fixes global property usage

Author: spacether

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -494,13 +494,13 @@ public String apiFilename(String templateName, String tag) {
         return apiFileFolder() + File.separator + toApiFilename(tag) + suffix;
     }
 
-    private void generateFiles(List<List<Object>> processTemplateToFileInfos, String skippedByOption) {
+    private void generateFiles(List<List<Object>> processTemplateToFileInfos, boolean shouldGenerate, String skippedByOption) {
         for (List<Object> processTemplateToFileInfo: processTemplateToFileInfos) {
             Map<String, Object> templateData = (Map<String, Object>) processTemplateToFileInfo.get(0);
             String templateName = (String) processTemplateToFileInfo.get(1);
             String outputFilename = (String) processTemplateToFileInfo.get(2);
             try {
-                processTemplateToFile(templateData, templateName, outputFilename, true, skippedByOption);
+                processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption);
             } catch (IOException e) {
                 LOGGER.error("Error when writing template file {}", e.toString());
             }
@@ -664,9 +664,11 @@ protected void generateEndpoints(OperationsMap objs) {
             outputFilename = packageFilename(Arrays.asList("apis", "paths", pathModule + ".py"));
             apisFiles.add(Arrays.asList(operationMap, "apis_path_module.handlebars", outputFilename));
         }
-        generateFiles(pathsFiles, CodegenConstants.APIS);
-        generateFiles(apisFiles, CodegenConstants.APIS);
-        generateFiles(testFiles, CodegenConstants.API_TESTS);
+        boolean shouldGenerateApis = (boolean) additionalProperties().get(CodegenConstants.GENERATE_APIS);
+        boolean shouldGenerateApiTests = (boolean) additionalProperties().get(CodegenConstants.GENERATE_API_TESTS);
+        generateFiles(pathsFiles, shouldGenerateApis, CodegenConstants.APIS);
+        generateFiles(apisFiles, shouldGenerateApis, CodegenConstants.APIS);
+        generateFiles(testFiles, shouldGenerateApiTests, CodegenConstants.API_TESTS);
     }
 
     /*

modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java

@@ -21,13 +21,20 @@
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.*;
 import org.openapitools.codegen.*;
+import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.languages.PythonClientCodegen;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 @SuppressWarnings("static-method")
 public class PythonClientTest {
@@ -116,4 +123,45 @@ private void testEndpointExampleValue(String endpoint, String specFilePath, Stri
 
     }
 
+    @Test
+    public void testApiTestsNotGenerated() throws Exception {
+        File output = Files.createTempDirectory("test").toFile();
+
+        Map<String, String> globalProperties = Collections.singletonMap("apiTests", "false");
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGlobalProperties(globalProperties)
+                .setGeneratorName("python")
+                .setInputSpec("src/test/resources/3_0/petstore.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(clientOptInput).generate();
+        Assert.assertTrue(files.size() > 0);
+
+        Path pathThatShouldNotExist = output.toPath().resolve("openapi_client/test/test_paths");
+        Assert.assertFalse(Files.isDirectory(pathThatShouldNotExist));
+        output.deleteOnExit();
+    }
+
+    @Test
+    public void testApisNotGenerated() throws Exception {
+        File output = Files.createTempDirectory("test").toFile();
+
+        Map<String, String> globalProperties = Collections.singletonMap("models", "");
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGlobalProperties(globalProperties)
+                .setGeneratorName("python")
+                .setInputSpec("src/test/resources/3_0/petstore.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(clientOptInput).generate();
+        Assert.assertTrue(files.size() > 0);
+
+        Path pathThatShouldNotExist = output.toPath().resolve("openapi_client/paths");
+        Assert.assertFalse(Files.isDirectory(pathThatShouldNotExist));
+        output.deleteOnExit();
+    }
 }