- more tests

- writePropertyBack("useSpringSecurity", ..)

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

@@ -52,6 +52,7 @@
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static org.openapitools.codegen.utils.OnceLogger.once;
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java

@@ -342,6 +342,7 @@ public void processOpts() {
         if (additionalProperties.containsKey(USE_SPRING_SECURITY)) {
             this.setUseSpringSecurity(Boolean.valueOf(additionalProperties.get(USE_SPRING_SECURITY).toString()));
         }
+        writePropertyBack(USE_SPRING_SECURITY, this.useSpringSecurity);
 
         typeMapping.put("file", "Resource");
         importMapping.put("Resource", "org.springframework.core.io.Resource");

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -546,6 +546,32 @@ public void testPreAuthorizeOnOauth() throws IOException {
                 "@PreAuthorize(\"(hasAuthority('write_pets') and hasAuthority('rw_pets') or (hasAuthority('read_pets')\")");
     }
 
+    @Test
+    public void testPreAuthorizeOnGlobalOauth() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+        String outputPath = output.getAbsolutePath().replace('\\', '/');
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/security-oauth.yaml", null, new ParseOptions()).getOpenAPI();
+
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true");
+        codegen.additionalProperties().put(SpringCodegen.USE_SPRING_SECURITY, "true");
+
+        ClientOptInput input = new ClientOptInput();
+        input.setOpenAPI(openAPI);
+        input.setConfig(codegen);
+
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(input).generate();
+
+        String path = outputPath + "/src/main/java/org/openapitools/api/PetsApi.java";
+        checkFileContains(generator, path,
+                "@PreAuthorize(\"(hasAuthority('read_pets')\")");
+    }
+
     @Test
     public void testDisableSpringSecurityForOauth() throws IOException {
         File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
@@ -626,4 +652,30 @@ public void testDisableSpringSecurityForJwtAuth() throws IOException {
         checkFileNotContains(generator, path,
                 "@PreAuthorize(\"hasAuthority('scope:another') or hasAuthority('scope:specific')\")");
     }
+
+    @Test
+    public void testPreAuthorizeOnGlobalJwtAuth() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+        String outputPath = output.getAbsolutePath().replace('\\', '/');
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/security-oauth-bearer.yaml", null, new ParseOptions()).getOpenAPI();
+
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true");
+        codegen.additionalProperties().put(SpringCodegen.USE_SPRING_SECURITY, "true");
+
+        ClientOptInput input = new ClientOptInput();
+        input.setOpenAPI(openAPI);
+        input.setConfig(codegen);
+
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(input).generate();
+
+        String path = outputPath + "/src/main/java/org/openapitools/api/PetsApi.java";
+        checkFileContains(generator, path,
+                "@PreAuthorize(\"hasAuthority('scope:global')\")");
+    }
 }

modules/openapi-generator/src/test/resources/3_0/security-oauth-bearer.yaml

@@ -30,4 +30,5 @@ paths:
           - "scope:specific"
         - anotherAuth:
           - "scope:another"
-    post:
+    post:
+      summary: make the pet

modules/openapi-generator/src/test/resources/3_0/security-oauth.yaml

@@ -34,6 +34,8 @@ security:
 
 paths:
   /pets:
+    get:
+      summary: Get the pet
     patch:
       summary: Add a new pet
       security: