From 0477761fb4d3145453364d0c4291e9479839c54a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sat, 23 Mar 2024 15:47:40 -0700 Subject: [PATCH 1/9] Updates template sto use centralized securitySchemeInfo in apiConfiguration --- .../configurations/ApiConfiguration.java | 7 +- .../FakeDeleteSecurityRequirementObject0.java | 4 +- .../SecurityRequirementObject.java | 4 +- .../configurations/ApiConfiguration.hbs | 27 +++++++- .../packagename/paths/path/verb/Operation.hbs | 3 +- .../AuthApplier.hbs | 9 ++- .../SecurityInfo.hbs | 68 ++----------------- .../SecurityRequirementObject.hbs | 4 +- .../SecurityRequirementObjectN.hbs | 10 +-- 9 files changed, 56 insertions(+), 80 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java index 368ce8af2f2..a7c2a398370 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java @@ -2,6 +2,7 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; import org.openapijsonschematools.client.servers.Server; import org.openapijsonschematools.client.RootServerInfo; import org.openapijsonschematools.client.paths.foo.get.FooGetServerInfo; @@ -54,10 +55,14 @@ public ApiConfiguration() { timeout = null; } - public ApiConfiguration(ServerInfo serverInfo, SecurityInfo securityInfo, Duration timeout) { + public ApiConfiguration(ServerInfo serverInfo, SecurityInfo securityInfo, Duration timeout, List securitySchemes) { this.serverInfo = serverInfo; this.securityInfo = securityInfo; this.timeout = timeout; + Map, SecurityScheme> securitySchemeInfo = new HashMap<>(); + for (SecurityScheme securityScheme: securitySchemes) { + securitySchemeInfo.put(securityScheme.getClass(), securityScheme); + } } public static class ServerInfo { diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java index 65df1713556..b4f9ac2c15c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java @@ -16,8 +16,8 @@ public FakeDeleteSecurityRequirementObject0( ) { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + BearerTest.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java index c264cdd3fc8..bc0ffde6eed 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/SecurityRequirementObject.java @@ -6,9 +6,9 @@ import java.util.Map; public class SecurityRequirementObject { - public final Map> securitySchemeToScopes; + public final Map, List> securitySchemeToScopes; - public SecurityRequirementObject(Map> securitySchemeToScopes) { + public SecurityRequirementObject(Map, List> securitySchemeToScopes) { this.securitySchemeToScopes = securitySchemeToScopes; } } diff --git a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs index 27ddcbdd7a6..69b6fca7fc4 100644 --- a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs +++ b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs @@ -19,6 +19,9 @@ import {{{packageName}}}.{{subpackage}}.{{jsonPathPiece.pascalCase}}; import {{packageName}}.{{jsonPathPiece.pascalCase}}; {{/if}} {{/each}} +{{#if securitySchemes}} +import {{packageName}}.securityschemes.SecurityScheme; +{{/if}} import org.checkerframework.checker.nullness.qual.Nullable; import java.time.Duration; @@ -33,6 +36,9 @@ public class ApiConfiguration { private final SecurityInfo securityInfo; {{/gt}} private final @Nullable Duration timeout; + {{#if securitySchemes}} + private final Map, SecurityScheme> securitySchemeInfo; + {{/if}} public ApiConfiguration() { serverInfo = new ServerInfo(); @@ -43,14 +49,23 @@ public class ApiConfiguration { {{/each}} ); {{/gt}} + {{#if securitySchemes}} + securitySchemeInfo = new HashMap<>(); + {{/if}} timeout = null; } - public ApiConfiguration(ServerInfo serverInfo{{#gt allSecurity.size 0}}, SecurityInfo securityInfo{{/gt}}, Duration timeout) { + public ApiConfiguration(ServerInfo serverInfo{{#gt allSecurity.size 0}}, SecurityInfo securityInfo{{/gt}}{{#if securitySchemes}}, List securitySchemes{{/if}}, Duration timeout) { this.serverInfo = serverInfo; {{#gt allSecurity.size 0}} this.securityInfo = securityInfo; {{/gt}} + {{#if securitySchemes}} + securitySchemeInfo = new HashMap<>(); + for (SecurityScheme securityScheme: securitySchemes) { + securitySchemeInfo.put(securityScheme.getClass(), securityScheme); + } + {{/if}} this.timeout = timeout; } @@ -109,6 +124,16 @@ public class ApiConfiguration { } {{/each}} {{/gt}} + {{#if securitySchemes}} + + public SecurityScheme getSecurityScheme(Class securitySchemeClass) { + @Nullable SecurityScheme securityScheme = securitySchemeInfo.get(securitySchemeClass); + if (securityScheme == null) { + throw new RuntimeException("SecurityScheme of class " + securitySchemeClass + "cannot be returned because it is unset. Pass in an instance of it in securitySchemes when instantiating ApiConfiguration.") + } + return securityScheme; + } + {{/if}} public Map> getDefaultHeaders() { return new HashMap<>(); diff --git a/src/main/resources/java/src/main/java/packagename/paths/path/verb/Operation.hbs b/src/main/resources/java/src/main/java/packagename/paths/path/verb/Operation.hbs index 9004f3f6765..e74ca3bf4ac 100644 --- a/src/main/resources/java/src/main/java/packagename/paths/path/verb/Operation.hbs +++ b/src/main/resources/java/src/main/java/packagename/paths/path/verb/Operation.hbs @@ -162,7 +162,8 @@ public class {{jsonPathPiece.pascalCase}} { {{#and parametersInfo parametersInfo.pathParametersSchema}}updatedPath{{else}}{{#with ../pathItem}}{{jsonPathPiece.pascalCase}}.{{/with}}path{{/and}}, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); {{/eq}} {{/each}} diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/AuthApplier.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/AuthApplier.hbs index f5020888293..3b10e829d0d 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/AuthApplier.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/AuthApplier.hbs @@ -2,6 +2,7 @@ package {{{packageName}}}.securityrequirementobjects; import org.checkerframework.checker.nullness.qual.Nullable; import {{{packageName}}}.securityschemes.SecurityScheme; +import {{{packageName}}}.configurations.ApiConfiguration; import java.net.http.HttpRequest; import java.util.List; @@ -14,15 +15,17 @@ public class AuthApplier { String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, - Map queryMap + Map queryMap, + ApiConfiguration apiConfiguration ) { if (securityRequirementObject == null) { return; } // TODO change securityRequirementObject to be a map of enum to scopes // TODO store the SecurityScheme instances in a map in apiConfiguration - for (Map.Entry> entry: securityRequirementObject.securitySchemeToScopes.entrySet()) { - SecurityScheme securityScheme = entry.getKey(); + for (Map.Entry, List> entry: securityRequirementObject.securitySchemeToScopes.entrySet()) { + Class securitySchemeClass = entry.getKey(); + SecurityScheme securityScheme = apiConfiguration.getSecurityScheme(securitySchemeClass); List scopeNames = entry.getValue(); securityScheme.applyAuth( headers, diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs index 3496bfdd44b..024d0687023 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs @@ -13,75 +13,21 @@ import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObjectPro import {{{packageName}}}.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class {{security.jsonPathPiece.pascalCase}} implements SecurityRequirementObjectProvider<{{security.jsonPathPiece.pascalCase}}.SecurityIndex> { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public {{security.jsonPathPiece.pascalCase}}(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; - this.securityIndex = securityIndex; - } + public {{security.jsonPathPiece.pascalCase}}(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(new Map.ofEntries( {{#each security}} - - public interface SetterFor{{jsonPathPiece.pascalCase}} { - Map getInstance(); - T getBuilderAfter{{jsonPathPiece.pascalCase}}(Map instance); - {{> src/main/java/packagename/securityrequirementobjects/_SecurityRequirementObjectSetter methodName=jsonPathPiece.camelCase getBuilderMethod=(join "getBuilderAfter" jsonPathPiece.pascalCase "") }} - } + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}} {{/each}} -{{#each security.builders}} - - public static class {{className.pascalCase}} implements {{#unless @last}}GenericBuilder{{#gt keyToBuilder.size 0}}, {{/gt}}{{/unless}}{{#each keyToBuilder}}SetterFor{{@key.pascalCase}}<{{builder.className.pascalCase}}>{{#unless @last}}, {{/unless}}{{/each}} { - private final Map instance; - {{#if @last }} - public {{className.pascalCase}}() { - this.instance = new HashMap<>(); - } - {{else}} - public {{className.pascalCase}}(Map instance) { - this.instance = instance; - } - {{/if}} - {{#unless @last}} - public Securities build() { - return new Securities(instance); - } - {{/unless}} - {{#gt keyToBuilder.size 0}} - public Map getInstance() { - return instance; - } - {{/gt}} - {{#each keyToBuilder}} - public {{builder.className.pascalCase}} getBuilderAfter{{@key.pascalCase}}(Map instance) { - {{#eq builder ../this}} - {{! property in final builder }} - return this; - {{else}} - return new {{builder.className.pascalCase}}(instance); - {{/eq}} - } - {{/each}} - } -{{/each}} - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } + )); + this.securityIndex = securityIndex; } public enum SecurityIndex { diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs index fea1775089d..30eaf6f265d 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObject.hbs @@ -6,9 +6,9 @@ import java.util.List; import java.util.Map; public class SecurityRequirementObject { - public final Map> securitySchemeToScopes; + public final Map, List> securitySchemeToScopes; - public SecurityRequirementObject(Map> securitySchemeToScopes) { + public SecurityRequirementObject(Map, List> securitySchemeToScopes) { this.securitySchemeToScopes = securitySchemeToScopes; } } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs index 4f3a5b8fb93..87cab40e36b 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs @@ -18,16 +18,12 @@ import java.util.AbstractMap; public class {{securityRequirementObject.jsonPathPiece.pascalCase}} extends SecurityRequirementObject { - public {{securityRequirementObject.jsonPathPiece.pascalCase}}( - {{#each securityRequirementObject}} - {{refInfo.refClass}} securityScheme{{@index}}{{#unless @last}},{{/unless}} - {{/each}} - ) { + public {{securityRequirementObject.jsonPathPiece.pascalCase}}() { super( Map.ofEntries( {{#each securityRequirementObject}} - new AbstractMap.SimpleEntry>( - securityScheme{{@index}}, + new AbstractMap.SimpleEntry, List>( + {{refInfo.refClass}}.class, List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}}) ){{#unless @last}},{{/unless}} {{/each}} From ee63dc2989143709b865e0ef63f713dab2690129 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 24 Mar 2024 11:20:54 -0700 Subject: [PATCH 2/9] Adds and uses getSecurityScheme --- .../configurations/ApiConfiguration.java | 18 ++- .../client/paths/fake/Delete.java | 3 +- .../client/paths/fake/Post.java | 3 +- .../fake/delete/FakeDeleteSecurityInfo.java | 60 +------- .../FakeDeleteSecurityRequirementObject0.java | 4 +- .../paths/fake/post/FakePostSecurityInfo.java | 60 +------- .../FakePostSecurityRequirementObject0.java | 8 +- .../client/paths/fakeclassnametest/Patch.java | 3 +- .../FakeclassnametestPatchSecurityInfo.java | 60 +------- ...metestPatchSecurityRequirementObject0.java | 8 +- .../paths/fakemultiplesecurities/Get.java | 3 +- ...FakemultiplesecuritiesGetSecurityInfo.java | 135 ++---------------- ...curitiesGetSecurityRequirementObject1.java | 13 +- ...curitiesGetSecurityRequirementObject2.java | 8 +- .../Post.java | 3 +- ...imagewithrequiredfilePostSecurityInfo.java | 60 +------- ...redfilePostSecurityRequirementObject0.java | 8 +- .../client/paths/pet/Post.java | 3 +- .../client/paths/pet/Put.java | 3 +- .../paths/pet/post/PetPostSecurityInfo.java | 135 ++---------------- .../PetPostSecurityRequirementObject0.java | 8 +- .../PetPostSecurityRequirementObject1.java | 8 +- .../PetPostSecurityRequirementObject2.java | 8 +- .../paths/pet/put/PetPutSecurityInfo.java | 96 +------------ .../PetPutSecurityRequirementObject0.java | 8 +- .../PetPutSecurityRequirementObject1.java | 8 +- .../client/paths/petfindbystatus/Get.java | 3 +- .../get/PetfindbystatusGetSecurityInfo.java | 135 ++---------------- ...bystatusGetSecurityRequirementObject0.java | 8 +- ...bystatusGetSecurityRequirementObject1.java | 8 +- ...bystatusGetSecurityRequirementObject2.java | 8 +- .../client/paths/petfindbytags/Get.java | 3 +- .../get/PetfindbytagsGetSecurityInfo.java | 96 +------------ ...ndbytagsGetSecurityRequirementObject0.java | 8 +- ...ndbytagsGetSecurityRequirementObject1.java | 8 +- .../client/paths/petpetid/Delete.java | 3 +- .../client/paths/petpetid/Get.java | 3 +- .../client/paths/petpetid/Post.java | 3 +- .../delete/PetpetidDeleteSecurityInfo.java | 96 +------------ ...petidDeleteSecurityRequirementObject0.java | 8 +- ...petidDeleteSecurityRequirementObject1.java | 8 +- .../petpetid/get/PetpetidGetSecurityInfo.java | 60 +------- ...PetpetidGetSecurityRequirementObject0.java | 8 +- .../post/PetpetidPostSecurityInfo.java | 96 +------------ ...etpetidPostSecurityRequirementObject0.java | 8 +- ...etpetidPostSecurityRequirementObject1.java | 8 +- .../paths/petpetiduploadimage/Post.java | 3 +- .../PetpetiduploadimagePostSecurityInfo.java | 60 +------- ...adimagePostSecurityRequirementObject0.java | 8 +- .../client/paths/storeinventory/Get.java | 3 +- .../get/StoreinventoryGetSecurityInfo.java | 60 +------- ...nventoryGetSecurityRequirementObject0.java | 8 +- .../AuthApplier.java | 9 +- .../configurations/ApiConfiguration.hbs | 2 +- .../SecurityInfo.hbs | 4 +- 55 files changed, 213 insertions(+), 1256 deletions(-) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java index a7c2a398370..3a62228c479 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java @@ -2,7 +2,6 @@ import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; -import org.openapijsonschematools.client.securityschemes.SecurityScheme; import org.openapijsonschematools.client.servers.Server; import org.openapijsonschematools.client.RootServerInfo; import org.openapijsonschematools.client.paths.foo.get.FooGetServerInfo; @@ -21,6 +20,7 @@ import org.openapijsonschematools.client.paths.petpetid.post.PetpetidPostSecurityInfo; import org.openapijsonschematools.client.paths.petpetiduploadimage.post.PetpetiduploadimagePostSecurityInfo; import org.openapijsonschematools.client.paths.storeinventory.get.StoreinventoryGetSecurityInfo; +import org.openapijsonschematools.client.securityschemes.SecurityScheme; import org.checkerframework.checker.nullness.qual.Nullable; import java.time.Duration; @@ -33,6 +33,7 @@ public class ApiConfiguration { private final ServerInfo serverInfo; private final SecurityInfo securityInfo; private final @Nullable Duration timeout; + private final Map, SecurityScheme> securitySchemeInfo; public ApiConfiguration() { serverInfo = new ServerInfo(); @@ -52,17 +53,18 @@ public ApiConfiguration() { null, null ); + securitySchemeInfo = new HashMap<>(); timeout = null; } - public ApiConfiguration(ServerInfo serverInfo, SecurityInfo securityInfo, Duration timeout, List securitySchemes) { + public ApiConfiguration(ServerInfo serverInfo, SecurityInfo securityInfo, List securitySchemes, Duration timeout) { this.serverInfo = serverInfo; this.securityInfo = securityInfo; - this.timeout = timeout; - Map, SecurityScheme> securitySchemeInfo = new HashMap<>(); + securitySchemeInfo = new HashMap<>(); for (SecurityScheme securityScheme: securitySchemes) { securitySchemeInfo.put(securityScheme.getClass(), securityScheme); } + this.timeout = timeout; } public static class ServerInfo { @@ -245,6 +247,14 @@ public SecurityRequirementObject getSecurityRequirementObject(StoreinventoryGetS return securityInfoInstance.getSecurityRequirementObject(securityIndex); } + public SecurityScheme getSecurityScheme(Class securitySchemeClass) { + @Nullable SecurityScheme securityScheme = securitySchemeInfo.get(securitySchemeClass); + if (securityScheme == null) { + throw new RuntimeException("SecurityScheme of class " + securitySchemeClass + "cannot be returned because it is unset. Pass in an instance of it in securitySchemes when instantiating ApiConfiguration."); + } + return securityScheme; + } + public Map> getDefaultHeaders() { return new HashMap<>(); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Delete.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Delete.java index f78302365aa..06270fdd0cc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Delete.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Delete.java @@ -49,7 +49,8 @@ public static Responses.EndpointResponse delete( Fake.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Fake.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Post.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Post.java index 752dbde41af..5a370e1d851 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Post.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/Post.java @@ -54,7 +54,8 @@ public static Responses.EndpointResponse post( Fake.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Fake.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java index 4af8214fd64..2b76202e2df 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.fake.delete; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.fake.delete.security.FakeDeleteSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class FakeDeleteSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public FakeDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public FakeDeleteSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeDeleteSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForFakeDeleteSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterFakeDeleteSecurityRequirementObject0(Map instance); - default T fakeDeleteSecurityRequirementObject0(FakeDeleteSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterFakeDeleteSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForFakeDeleteSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterFakeDeleteSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java index b4f9ac2c15c..a615af7f968 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.java @@ -11,9 +11,7 @@ public class FakeDeleteSecurityRequirementObject0 extends SecurityRequirementObject { - public FakeDeleteSecurityRequirementObject0( - BearerTest securityScheme0 - ) { + public FakeDeleteSecurityRequirementObject0() { super( Map.ofEntries( new AbstractMap.SimpleEntry, List>( diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java index d24bb81c122..9175c0f748c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.fake.post; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.fake.post.security.FakePostSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class FakePostSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public FakePostSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public FakePostSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakePostSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForFakePostSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterFakePostSecurityRequirementObject0(Map instance); - default T fakePostSecurityRequirementObject0(FakePostSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterFakePostSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForFakePostSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterFakePostSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java index e23352dfc38..b1305742ad4 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class FakePostSecurityRequirementObject0 extends SecurityRequirementObject { - public FakePostSecurityRequirementObject0( - HttpBasicTest securityScheme0 - ) { + public FakePostSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + HttpBasicTest.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/Patch.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/Patch.java index 3662a57b64e..f718be09069 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/Patch.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/Patch.java @@ -50,7 +50,8 @@ public static Responses.EndpointResponse patch( Fakeclassnametest.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Fakeclassnametest.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java index d3dbb03abd3..7526e0e8106 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.fakeclassnametest.patch; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.fakeclassnametest.patch.security.FakeclassnametestPatchSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class FakeclassnametestPatchSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public FakeclassnametestPatchSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public FakeclassnametestPatchSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeclassnametestPatchSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForFakeclassnametestPatchSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterFakeclassnametestPatchSecurityRequirementObject0(Map instance); - default T fakeclassnametestPatchSecurityRequirementObject0(FakeclassnametestPatchSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterFakeclassnametestPatchSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForFakeclassnametestPatchSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterFakeclassnametestPatchSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java index 7ea4338462f..6b61b1b9a00 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class FakeclassnametestPatchSecurityRequirementObject0 extends SecurityRequirementObject { - public FakeclassnametestPatchSecurityRequirementObject0( - ApiKeyQuery securityScheme0 - ) { + public FakeclassnametestPatchSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKeyQuery.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/Get.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/Get.java index 163069e7d8b..b8228e447f7 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/Get.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/Get.java @@ -41,7 +41,8 @@ public static Responses.EndpointResponse get( Fakemultiplesecurities.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Fakemultiplesecurities.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java index 477a06e5f7b..84b11321176 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java @@ -1,148 +1,29 @@ package org.openapijsonschematools.client.paths.fakemultiplesecurities.get; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject0; import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject1; import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject2; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class FakemultiplesecuritiesGetSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public FakemultiplesecuritiesGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public FakemultiplesecuritiesGetSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakemultiplesecuritiesGetSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new FakemultiplesecuritiesGetSecurityRequirementObject1()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new FakemultiplesecuritiesGetSecurityRequirementObject2()) + )); this.securityIndex = securityIndex; } - public interface SetterForFakemultiplesecuritiesGetSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance); - default T fakemultiplesecuritiesGetSecurityRequirementObject0(FakemultiplesecuritiesGetSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(instance); - } - } - - public interface SetterForFakemultiplesecuritiesGetSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance); - default T fakemultiplesecuritiesGetSecurityRequirementObject1(FakemultiplesecuritiesGetSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(instance); - } - } - - public interface SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { - Map getInstance(); - T getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance); - default T fakemultiplesecuritiesGetSecurityRequirementObject2(FakemultiplesecuritiesGetSecurityRequirementObject2 security2) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_2, security2); - return getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(instance); - } - } - - public static class Securities011Builder implements GenericBuilder, SetterForFakemultiplesecuritiesGetSecurityRequirementObject1, SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { - private final Map instance; - public Securities011Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities011Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance) { - return this; - } - public Securities011Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance) { - return this; - } - } - - public static class Securities101Builder implements GenericBuilder, SetterForFakemultiplesecuritiesGetSecurityRequirementObject0, SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { - private final Map instance; - public Securities101Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities101Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance) { - return this; - } - public Securities101Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance) { - return this; - } - } - - public static class Securities110Builder implements GenericBuilder, SetterForFakemultiplesecuritiesGetSecurityRequirementObject0, SetterForFakemultiplesecuritiesGetSecurityRequirementObject1 { - private final Map instance; - public Securities110Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities110Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance) { - return this; - } - public Securities110Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForFakemultiplesecuritiesGetSecurityRequirementObject0, SetterForFakemultiplesecuritiesGetSecurityRequirementObject1, SetterForFakemultiplesecuritiesGetSecurityRequirementObject2 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities011Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject0(Map instance) { - return new Securities011Builder(instance); - } - public Securities101Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject1(Map instance) { - return new Securities101Builder(instance); - } - public Securities110Builder getBuilderAfterFakemultiplesecuritiesGetSecurityRequirementObject2(Map instance) { - return new Securities110Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java index 2b33f55bb18..4b2a7c9737a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.java @@ -12,18 +12,15 @@ public class FakemultiplesecuritiesGetSecurityRequirementObject1 extends SecurityRequirementObject { - public FakemultiplesecuritiesGetSecurityRequirementObject1( - HttpBasicTest securityScheme0, - ApiKey securityScheme1 - ) { + public FakemultiplesecuritiesGetSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + HttpBasicTest.class, List.of() ), - new AbstractMap.SimpleEntry>( - securityScheme1, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java index 7089b54db06..b59a0f9bb32 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.java @@ -11,13 +11,11 @@ public class FakemultiplesecuritiesGetSecurityRequirementObject2 extends SecurityRequirementObject { - public FakemultiplesecuritiesGetSecurityRequirementObject2( - PetstoreAuth securityScheme0 - ) { + public FakemultiplesecuritiesGetSecurityRequirementObject2() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/Post.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/Post.java index 84a6ac4eca7..9b74bbfdf80 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/Post.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/Post.java @@ -59,7 +59,8 @@ public static Responses.EndpointResponse post( updatedPath, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + updatedPath; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java index b21e776ae12..46dd81a5750 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.security.FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class FakepetiduploadimagewithrequiredfilePostSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public FakepetiduploadimagewithrequiredfilePostSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public FakepetiduploadimagewithrequiredfilePostSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(Map instance); - default T fakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterFakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java index fcb32e6dfca..d1c684c5779 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 extends SecurityRequirementObject { - public FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0( - PetstoreAuth securityScheme0 - ) { + public FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Post.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Post.java index 52f97d67235..4f3edb0706a 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Post.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Post.java @@ -50,7 +50,8 @@ public static Responses.EndpointResponse post( Pet.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Pet.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Put.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Put.java index b40eb7d0625..60f2021f717 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Put.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/Put.java @@ -50,7 +50,8 @@ public static Void put( Pet.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Pet.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java index 7f5e8981eff..1c271d3cff2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java @@ -1,148 +1,29 @@ package org.openapijsonschematools.client.paths.pet.post; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject0; import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject1; import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject2; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetPostSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetPostSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetPostSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPostSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPostSecurityRequirementObject1()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetPostSecurityRequirementObject2()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetPostSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetPostSecurityRequirementObject0(Map instance); - default T petPostSecurityRequirementObject0(PetPostSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetPostSecurityRequirementObject0(instance); - } - } - - public interface SetterForPetPostSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterPetPostSecurityRequirementObject1(Map instance); - default T petPostSecurityRequirementObject1(PetPostSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterPetPostSecurityRequirementObject1(instance); - } - } - - public interface SetterForPetPostSecurityRequirementObject2 { - Map getInstance(); - T getBuilderAfterPetPostSecurityRequirementObject2(Map instance); - default T petPostSecurityRequirementObject2(PetPostSecurityRequirementObject2 security2) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_2, security2); - return getBuilderAfterPetPostSecurityRequirementObject2(instance); - } - } - - public static class Securities011Builder implements GenericBuilder, SetterForPetPostSecurityRequirementObject1, SetterForPetPostSecurityRequirementObject2 { - private final Map instance; - public Securities011Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities011Builder getBuilderAfterPetPostSecurityRequirementObject1(Map instance) { - return this; - } - public Securities011Builder getBuilderAfterPetPostSecurityRequirementObject2(Map instance) { - return this; - } - } - - public static class Securities101Builder implements GenericBuilder, SetterForPetPostSecurityRequirementObject0, SetterForPetPostSecurityRequirementObject2 { - private final Map instance; - public Securities101Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities101Builder getBuilderAfterPetPostSecurityRequirementObject0(Map instance) { - return this; - } - public Securities101Builder getBuilderAfterPetPostSecurityRequirementObject2(Map instance) { - return this; - } - } - - public static class Securities110Builder implements GenericBuilder, SetterForPetPostSecurityRequirementObject0, SetterForPetPostSecurityRequirementObject1 { - private final Map instance; - public Securities110Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities110Builder getBuilderAfterPetPostSecurityRequirementObject0(Map instance) { - return this; - } - public Securities110Builder getBuilderAfterPetPostSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForPetPostSecurityRequirementObject0, SetterForPetPostSecurityRequirementObject1, SetterForPetPostSecurityRequirementObject2 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities011Builder getBuilderAfterPetPostSecurityRequirementObject0(Map instance) { - return new Securities011Builder(instance); - } - public Securities101Builder getBuilderAfterPetPostSecurityRequirementObject1(Map instance) { - return new Securities101Builder(instance); - } - public Securities110Builder getBuilderAfterPetPostSecurityRequirementObject2(Map instance) { - return new Securities110Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java index 2011933759d..b1e63c8cdde 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetPostSecurityRequirementObject0 extends SecurityRequirementObject { - public PetPostSecurityRequirementObject0( - ApiKey securityScheme0 - ) { + public PetPostSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java index 2b18e0ed204..3d9d95fe223 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject1.java @@ -11,13 +11,11 @@ public class PetPostSecurityRequirementObject1 extends SecurityRequirementObject { - public PetPostSecurityRequirementObject1( - HttpSignatureTest securityScheme0 - ) { + public PetPostSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + HttpSignatureTest.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java index 8035e52c8ae..81ac4bb60b1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityRequirementObject2.java @@ -11,13 +11,11 @@ public class PetPostSecurityRequirementObject2 extends SecurityRequirementObject { - public PetPostSecurityRequirementObject2( - PetstoreAuth securityScheme0 - ) { + public PetPostSecurityRequirementObject2() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java index bd36d2668be..d743efb9639 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java @@ -1,109 +1,27 @@ package org.openapijsonschematools.client.paths.pet.put; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.pet.put.security.PetPutSecurityRequirementObject0; import org.openapijsonschematools.client.paths.pet.put.security.PetPutSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetPutSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetPutSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetPutSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPutSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPutSecurityRequirementObject1()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetPutSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetPutSecurityRequirementObject0(Map instance); - default T petPutSecurityRequirementObject0(PetPutSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetPutSecurityRequirementObject0(instance); - } - } - - public interface SetterForPetPutSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterPetPutSecurityRequirementObject1(Map instance); - default T petPutSecurityRequirementObject1(PetPutSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterPetPutSecurityRequirementObject1(instance); - } - } - - public static class Securities01Builder implements GenericBuilder, SetterForPetPutSecurityRequirementObject1 { - private final Map instance; - public Securities01Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetPutSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class Securities10Builder implements GenericBuilder, SetterForPetPutSecurityRequirementObject0 { - private final Map instance; - public Securities10Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities10Builder getBuilderAfterPetPutSecurityRequirementObject0(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForPetPutSecurityRequirementObject0, SetterForPetPutSecurityRequirementObject1 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetPutSecurityRequirementObject0(Map instance) { - return new Securities01Builder(instance); - } - public Securities10Builder getBuilderAfterPetPutSecurityRequirementObject1(Map instance) { - return new Securities10Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java index 67b5f0b0e00..e1e15505dca 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetPutSecurityRequirementObject0 extends SecurityRequirementObject { - public PetPutSecurityRequirementObject0( - HttpSignatureTest securityScheme0 - ) { + public PetPutSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + HttpSignatureTest.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java index a31e5c26d7a..e2264fa535c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityRequirementObject1.java @@ -11,13 +11,11 @@ public class PetPutSecurityRequirementObject1 extends SecurityRequirementObject { - public PetPutSecurityRequirementObject1( - PetstoreAuth securityScheme0 - ) { + public PetPutSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/Get.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/Get.java index aaa8e3e9cb8..50f9742a8b3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/Get.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/Get.java @@ -44,7 +44,8 @@ public static Responses.EndpointResponse get( Petfindbystatus.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Petfindbystatus.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java index 46047669e5d..4355ad0b060 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java @@ -1,148 +1,29 @@ package org.openapijsonschematools.client.paths.petfindbystatus.get; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject0; import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject1; import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject2; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetfindbystatusGetSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetfindbystatusGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetfindbystatusGetSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbystatusGetSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbystatusGetSecurityRequirementObject1()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetfindbystatusGetSecurityRequirementObject2()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetfindbystatusGetSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance); - default T petfindbystatusGetSecurityRequirementObject0(PetfindbystatusGetSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(instance); - } - } - - public interface SetterForPetfindbystatusGetSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance); - default T petfindbystatusGetSecurityRequirementObject1(PetfindbystatusGetSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(instance); - } - } - - public interface SetterForPetfindbystatusGetSecurityRequirementObject2 { - Map getInstance(); - T getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance); - default T petfindbystatusGetSecurityRequirementObject2(PetfindbystatusGetSecurityRequirementObject2 security2) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_2, security2); - return getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(instance); - } - } - - public static class Securities011Builder implements GenericBuilder, SetterForPetfindbystatusGetSecurityRequirementObject1, SetterForPetfindbystatusGetSecurityRequirementObject2 { - private final Map instance; - public Securities011Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities011Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance) { - return this; - } - public Securities011Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance) { - return this; - } - } - - public static class Securities101Builder implements GenericBuilder, SetterForPetfindbystatusGetSecurityRequirementObject0, SetterForPetfindbystatusGetSecurityRequirementObject2 { - private final Map instance; - public Securities101Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities101Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance) { - return this; - } - public Securities101Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance) { - return this; - } - } - - public static class Securities110Builder implements GenericBuilder, SetterForPetfindbystatusGetSecurityRequirementObject0, SetterForPetfindbystatusGetSecurityRequirementObject1 { - private final Map instance; - public Securities110Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities110Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance) { - return this; - } - public Securities110Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForPetfindbystatusGetSecurityRequirementObject0, SetterForPetfindbystatusGetSecurityRequirementObject1, SetterForPetfindbystatusGetSecurityRequirementObject2 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities011Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject0(Map instance) { - return new Securities011Builder(instance); - } - public Securities101Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject1(Map instance) { - return new Securities101Builder(instance); - } - public Securities110Builder getBuilderAfterPetfindbystatusGetSecurityRequirementObject2(Map instance) { - return new Securities110Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1, diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java index 5f7963ea5d1..0f8bcbc46b0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetfindbystatusGetSecurityRequirementObject0 extends SecurityRequirementObject { - public PetfindbystatusGetSecurityRequirementObject0( - ApiKey securityScheme0 - ) { + public PetfindbystatusGetSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java index 25e4dde9cbc..d96864b78a1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.java @@ -11,13 +11,11 @@ public class PetfindbystatusGetSecurityRequirementObject1 extends SecurityRequirementObject { - public PetfindbystatusGetSecurityRequirementObject1( - HttpSignatureTest securityScheme0 - ) { + public PetfindbystatusGetSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + HttpSignatureTest.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java index 836c313499e..d5da83b6640 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.java @@ -11,13 +11,11 @@ public class PetfindbystatusGetSecurityRequirementObject2 extends SecurityRequirementObject { - public PetfindbystatusGetSecurityRequirementObject2( - PetstoreAuth securityScheme0 - ) { + public PetfindbystatusGetSecurityRequirementObject2() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/Get.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/Get.java index d9e2c809449..0ce665bc5e0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/Get.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/Get.java @@ -44,7 +44,8 @@ public static Responses.EndpointResponse get( Petfindbytags.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Petfindbytags.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java index c388438bf43..81a5c13f96e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java @@ -1,109 +1,27 @@ package org.openapijsonschematools.client.paths.petfindbytags.get; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.petfindbytags.get.security.PetfindbytagsGetSecurityRequirementObject0; import org.openapijsonschematools.client.paths.petfindbytags.get.security.PetfindbytagsGetSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetfindbytagsGetSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetfindbytagsGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetfindbytagsGetSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbytagsGetSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbytagsGetSecurityRequirementObject1()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetfindbytagsGetSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(Map instance); - default T petfindbytagsGetSecurityRequirementObject0(PetfindbytagsGetSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(instance); - } - } - - public interface SetterForPetfindbytagsGetSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(Map instance); - default T petfindbytagsGetSecurityRequirementObject1(PetfindbytagsGetSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(instance); - } - } - - public static class Securities01Builder implements GenericBuilder, SetterForPetfindbytagsGetSecurityRequirementObject1 { - private final Map instance; - public Securities01Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class Securities10Builder implements GenericBuilder, SetterForPetfindbytagsGetSecurityRequirementObject0 { - private final Map instance; - public Securities10Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities10Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForPetfindbytagsGetSecurityRequirementObject0, SetterForPetfindbytagsGetSecurityRequirementObject1 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject0(Map instance) { - return new Securities01Builder(instance); - } - public Securities10Builder getBuilderAfterPetfindbytagsGetSecurityRequirementObject1(Map instance) { - return new Securities10Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java index 54decd96811..5ce1d1f7054 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetfindbytagsGetSecurityRequirementObject0 extends SecurityRequirementObject { - public PetfindbytagsGetSecurityRequirementObject0( - HttpSignatureTest securityScheme0 - ) { + public PetfindbytagsGetSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + HttpSignatureTest.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java index 7988c93c67d..2f7ef1e7674 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.java @@ -11,13 +11,11 @@ public class PetfindbytagsGetSecurityRequirementObject1 extends SecurityRequirementObject { - public PetfindbytagsGetSecurityRequirementObject1( - PetstoreAuth securityScheme0 - ) { + public PetfindbytagsGetSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Delete.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Delete.java index f0713152345..4d3f69226eb 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Delete.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Delete.java @@ -53,7 +53,8 @@ public static Void delete( updatedPath, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + updatedPath; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Get.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Get.java index 288ef5378ab..f3dc2ac9e94 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Get.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Get.java @@ -46,7 +46,8 @@ public static Responses.EndpointResponse get( updatedPath, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + updatedPath; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Post.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Post.java index 48bb57707d8..0d1433ab2ae 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Post.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/Post.java @@ -59,7 +59,8 @@ public static Void post( updatedPath, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + updatedPath; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java index 139936218f3..3d3640a85ab 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java @@ -1,109 +1,27 @@ package org.openapijsonschematools.client.paths.petpetid.delete; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.petpetid.delete.security.PetpetidDeleteSecurityRequirementObject0; import org.openapijsonschematools.client.paths.petpetid.delete.security.PetpetidDeleteSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetpetidDeleteSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetpetidDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetpetidDeleteSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidDeleteSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidDeleteSecurityRequirementObject1()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetpetidDeleteSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetpetidDeleteSecurityRequirementObject0(Map instance); - default T petpetidDeleteSecurityRequirementObject0(PetpetidDeleteSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetpetidDeleteSecurityRequirementObject0(instance); - } - } - - public interface SetterForPetpetidDeleteSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterPetpetidDeleteSecurityRequirementObject1(Map instance); - default T petpetidDeleteSecurityRequirementObject1(PetpetidDeleteSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterPetpetidDeleteSecurityRequirementObject1(instance); - } - } - - public static class Securities01Builder implements GenericBuilder, SetterForPetpetidDeleteSecurityRequirementObject1 { - private final Map instance; - public Securities01Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class Securities10Builder implements GenericBuilder, SetterForPetpetidDeleteSecurityRequirementObject0 { - private final Map instance; - public Securities10Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities10Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject0(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForPetpetidDeleteSecurityRequirementObject0, SetterForPetpetidDeleteSecurityRequirementObject1 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject0(Map instance) { - return new Securities01Builder(instance); - } - public Securities10Builder getBuilderAfterPetpetidDeleteSecurityRequirementObject1(Map instance) { - return new Securities10Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java index f205d82aaa2..320b2cffa63 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetpetidDeleteSecurityRequirementObject0 extends SecurityRequirementObject { - public PetpetidDeleteSecurityRequirementObject0( - ApiKey securityScheme0 - ) { + public PetpetidDeleteSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java index c8fbefaa8ca..f7e6f70df99 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.java @@ -11,13 +11,11 @@ public class PetpetidDeleteSecurityRequirementObject1 extends SecurityRequirementObject { - public PetpetidDeleteSecurityRequirementObject1( - PetstoreAuth securityScheme0 - ) { + public PetpetidDeleteSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java index d67e543c3b0..3cc8fb8a3c9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.petpetid.get; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.petpetid.get.security.PetpetidGetSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetpetidGetSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetpetidGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetpetidGetSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidGetSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetpetidGetSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetpetidGetSecurityRequirementObject0(Map instance); - default T petpetidGetSecurityRequirementObject0(PetpetidGetSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetpetidGetSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForPetpetidGetSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterPetpetidGetSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java index 3d5379e04da..00903fe643c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetpetidGetSecurityRequirementObject0 extends SecurityRequirementObject { - public PetpetidGetSecurityRequirementObject0( - ApiKey securityScheme0 - ) { + public PetpetidGetSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java index 08d457e34c3..9dc8d070b95 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java @@ -1,109 +1,27 @@ package org.openapijsonschematools.client.paths.petpetid.post; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.petpetid.post.security.PetpetidPostSecurityRequirementObject0; import org.openapijsonschematools.client.paths.petpetid.post.security.PetpetidPostSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetpetidPostSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetpetidPostSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetpetidPostSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidPostSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidPostSecurityRequirementObject1()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetpetidPostSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetpetidPostSecurityRequirementObject0(Map instance); - default T petpetidPostSecurityRequirementObject0(PetpetidPostSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetpetidPostSecurityRequirementObject0(instance); - } - } - - public interface SetterForPetpetidPostSecurityRequirementObject1 { - Map getInstance(); - T getBuilderAfterPetpetidPostSecurityRequirementObject1(Map instance); - default T petpetidPostSecurityRequirementObject1(PetpetidPostSecurityRequirementObject1 security1) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_1, security1); - return getBuilderAfterPetpetidPostSecurityRequirementObject1(instance); - } - } - - public static class Securities01Builder implements GenericBuilder, SetterForPetpetidPostSecurityRequirementObject1 { - private final Map instance; - public Securities01Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetpetidPostSecurityRequirementObject1(Map instance) { - return this; - } - } - - public static class Securities10Builder implements GenericBuilder, SetterForPetpetidPostSecurityRequirementObject0 { - private final Map instance; - public Securities10Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - public Map getInstance() { - return instance; - } - public Securities10Builder getBuilderAfterPetpetidPostSecurityRequirementObject0(Map instance) { - return this; - } - } - - public static class SecuritiesBuilder implements SetterForPetpetidPostSecurityRequirementObject0, SetterForPetpetidPostSecurityRequirementObject1 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities01Builder getBuilderAfterPetpetidPostSecurityRequirementObject0(Map instance) { - return new Securities01Builder(instance); - } - public Securities10Builder getBuilderAfterPetpetidPostSecurityRequirementObject1(Map instance) { - return new Securities10Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0, SECURITY_1 diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java index eaecb4861a9..5362c41579c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetpetidPostSecurityRequirementObject0 extends SecurityRequirementObject { - public PetpetidPostSecurityRequirementObject0( - ApiKey securityScheme0 - ) { + public PetpetidPostSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java index adbd1378eef..377bdaffd38 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.java @@ -11,13 +11,11 @@ public class PetpetidPostSecurityRequirementObject1 extends SecurityRequirementObject { - public PetpetidPostSecurityRequirementObject1( - PetstoreAuth securityScheme0 - ) { + public PetpetidPostSecurityRequirementObject1() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/Post.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/Post.java index 90f77bee8f0..f628d4069c0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/Post.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/Post.java @@ -59,7 +59,8 @@ public static Responses.EndpointResponse post( updatedPath, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + updatedPath; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java index d0823b36732..9bd18667e2b 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.petpetiduploadimage.post; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.petpetiduploadimage.post.security.PetpetiduploadimagePostSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class PetpetiduploadimagePostSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public PetpetiduploadimagePostSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public PetpetiduploadimagePostSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetiduploadimagePostSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForPetpetiduploadimagePostSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterPetpetiduploadimagePostSecurityRequirementObject0(Map instance); - default T petpetiduploadimagePostSecurityRequirementObject0(PetpetiduploadimagePostSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterPetpetiduploadimagePostSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForPetpetiduploadimagePostSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterPetpetiduploadimagePostSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java index cab7673c4a9..2a6e237ed37 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class PetpetiduploadimagePostSecurityRequirementObject0 extends SecurityRequirementObject { - public PetpetiduploadimagePostSecurityRequirementObject0( - PetstoreAuth securityScheme0 - ) { + public PetpetiduploadimagePostSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + PetstoreAuth.class, List.of("write:pets", "read:pets") ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/Get.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/Get.java index 38171c89b84..d6aefad8f01 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/Get.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/Get.java @@ -41,7 +41,8 @@ public static Responses.EndpointResponse get( Storeinventory.path, method, bodyPublisher, - queryMap + queryMap, + apiConfiguration ); String url = host + Storeinventory.path; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java index 51a939b6530..8fef4c40096 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java @@ -1,73 +1,25 @@ package org.openapijsonschematools.client.paths.storeinventory.get; -import org.openapijsonschematools.client.exceptions.UnsetPropertyException; import org.openapijsonschematools.client.paths.storeinventory.get.security.StoreinventoryGetSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.openapijsonschematools.client.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; -import java.util.HashMap; +import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; public class StoreinventoryGetSecurityInfo implements SecurityRequirementObjectProvider { - final private Securities securities; + final private EnumMap securities; final private SecurityIndex securityIndex; - public StoreinventoryGetSecurityInfo(Securities securities, SecurityIndex securityIndex) { - this.securities = securities; + public StoreinventoryGetSecurityInfo(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new StoreinventoryGetSecurityRequirementObject0()) + )); this.securityIndex = securityIndex; } - public interface SetterForStoreinventoryGetSecurityRequirementObject0 { - Map getInstance(); - T getBuilderAfterStoreinventoryGetSecurityRequirementObject0(Map instance); - default T storeinventoryGetSecurityRequirementObject0(StoreinventoryGetSecurityRequirementObject0 security0) { - var instance = getInstance(); - instance.put(SecurityIndex.SECURITY_0, security0); - return getBuilderAfterStoreinventoryGetSecurityRequirementObject0(instance); - } - } - - public static class Securities0Builder implements GenericBuilder { - private final Map instance; - public Securities0Builder(Map instance) { - this.instance = instance; - } - public Securities build() { - return new Securities(instance); - } - } - - public static class SecuritiesBuilder implements SetterForStoreinventoryGetSecurityRequirementObject0 { - private final Map instance; - public SecuritiesBuilder() { - this.instance = new HashMap<>(); - } - public Map getInstance() { - return instance; - } - public Securities0Builder getBuilderAfterStoreinventoryGetSecurityRequirementObject0(Map instance) { - return new Securities0Builder(instance); - } - } - - public static class Securities { - private final EnumMap securities; - - Securities(Map securityMap) { - securities = new EnumMap<>(securityMap); - } - - public SecurityRequirementObject get(SecurityIndex securityIndex) { - if (securities.containsKey(securityIndex)) { - return get(securityIndex); - } - throw new UnsetPropertyException(securityIndex+" is unset"); - } - } - public enum SecurityIndex { SECURITY_0 } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java index 5ad3dab3eea..12e9ef453a2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.java @@ -11,13 +11,11 @@ public class StoreinventoryGetSecurityRequirementObject0 extends SecurityRequirementObject { - public StoreinventoryGetSecurityRequirementObject0( - ApiKey securityScheme0 - ) { + public StoreinventoryGetSecurityRequirementObject0() { super( Map.ofEntries( - new AbstractMap.SimpleEntry>( - securityScheme0, + new AbstractMap.SimpleEntry, List>( + ApiKey.class, List.of() ) ) diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/AuthApplier.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/AuthApplier.java index 3a9703e2fb8..7e92135dda0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/AuthApplier.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/securityrequirementobjects/AuthApplier.java @@ -2,6 +2,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.openapijsonschematools.client.securityschemes.SecurityScheme; +import org.openapijsonschematools.client.configurations.ApiConfiguration; import java.net.http.HttpRequest; import java.util.List; @@ -14,15 +15,17 @@ protected static void updateParamsForAuth( String resourcePath, String method, HttpRequest.BodyPublisher bodyPublisher, - Map queryMap + Map queryMap, + ApiConfiguration apiConfiguration ) { if (securityRequirementObject == null) { return; } // TODO change securityRequirementObject to be a map of enum to scopes // TODO store the SecurityScheme instances in a map in apiConfiguration - for (Map.Entry> entry: securityRequirementObject.securitySchemeToScopes.entrySet()) { - SecurityScheme securityScheme = entry.getKey(); + for (Map.Entry, List> entry: securityRequirementObject.securitySchemeToScopes.entrySet()) { + Class securitySchemeClass = entry.getKey(); + SecurityScheme securityScheme = apiConfiguration.getSecurityScheme(securitySchemeClass); List scopeNames = entry.getValue(); securityScheme.applyAuth( headers, diff --git a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs index 69b6fca7fc4..b39e508e66e 100644 --- a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs +++ b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs @@ -129,7 +129,7 @@ public class ApiConfiguration { public SecurityScheme getSecurityScheme(Class securitySchemeClass) { @Nullable SecurityScheme securityScheme = securitySchemeInfo.get(securitySchemeClass); if (securityScheme == null) { - throw new RuntimeException("SecurityScheme of class " + securitySchemeClass + "cannot be returned because it is unset. Pass in an instance of it in securitySchemes when instantiating ApiConfiguration.") + throw new RuntimeException("SecurityScheme of class " + securitySchemeClass + "cannot be returned because it is unset. Pass in an instance of it in securitySchemes when instantiating ApiConfiguration."); } return securityScheme; } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs index 024d0687023..ebe9dfcc96d 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs @@ -4,13 +4,11 @@ package {{{packageName}}}.{{security.subpackage}}; package {{{packageName}}}; {{/if}} -import {{{packageName}}}.exceptions.UnsetPropertyException; {{#each security}} import {{{packageName}}}.{{subpackage}}.{{jsonPathPiece.pascalCase}}; {{/each}} import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObject; import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObjectProvider; -import {{{packageName}}}.schemas.GenericBuilder; import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; @@ -22,7 +20,7 @@ public class {{security.jsonPathPiece.pascalCase}} implements SecurityRequiremen final private SecurityIndex securityIndex; public {{security.jsonPathPiece.pascalCase}}(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(new Map.ofEntries( + this.securities = new EnumMap<>(Map.ofEntries( {{#each security}} new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}} {{/each}} From a8166f14c4d4bbdd08f845af4be9d9583ee5d8be Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 25 Mar 2024 18:05:42 -0700 Subject: [PATCH 3/9] Updates securityinfo docs to show the securty map --- .../fake/delete/FakeDeleteSecurityInfo.md | 22 +++++++- .../paths/fake/post/FakePostSecurityInfo.md | 22 +++++++- .../FakeclassnametestPatchSecurityInfo.md | 22 +++++++- .../FakemultiplesecuritiesGetSecurityInfo.md | 22 +++++++- ...adimagewithrequiredfilePostSecurityInfo.md | 22 +++++++- .../paths/pet/post/PetPostSecurityInfo.md | 22 +++++++- .../docs/paths/pet/put/PetPutSecurityInfo.md | 22 +++++++- .../get/PetfindbystatusGetSecurityInfo.md | 22 +++++++- .../get/PetfindbytagsGetSecurityInfo.md | 22 +++++++- .../delete/PetpetidDeleteSecurityInfo.md | 22 +++++++- .../petpetid/get/PetpetidGetSecurityInfo.md | 22 +++++++- .../petpetid/post/PetpetidPostSecurityInfo.md | 22 +++++++- .../PetpetiduploadimagePostSecurityInfo.md | 22 +++++++- .../get/StoreinventoryGetSecurityInfo.md | 22 +++++++- .../configurations/ApiConfiguration.java | 56 +++++++++---------- .../fake/delete/FakeDeleteSecurityInfo.java | 32 ++++++----- .../paths/fake/post/FakePostSecurityInfo.java | 32 ++++++----- .../FakeclassnametestPatchSecurityInfo.java | 32 ++++++----- ...FakemultiplesecuritiesGetSecurityInfo.java | 36 ++++++------ ...imagewithrequiredfilePostSecurityInfo.java | 32 ++++++----- .../paths/pet/post/PetPostSecurityInfo.java | 36 ++++++------ .../paths/pet/put/PetPutSecurityInfo.java | 34 +++++------ .../get/PetfindbystatusGetSecurityInfo.java | 36 ++++++------ .../get/PetfindbytagsGetSecurityInfo.java | 34 +++++------ .../delete/PetpetidDeleteSecurityInfo.java | 34 +++++------ .../petpetid/get/PetpetidGetSecurityInfo.java | 32 ++++++----- .../post/PetpetidPostSecurityInfo.java | 34 +++++------ .../PetpetiduploadimagePostSecurityInfo.java | 32 ++++++----- .../get/StoreinventoryGetSecurityInfo.java | 32 ++++++----- .../configurations/ApiConfiguration.hbs | 4 +- .../SecurityInfo.hbs | 32 ++++++----- .../SecurityInfoDoc.hbs | 22 +++++++- 32 files changed, 610 insertions(+), 280 deletions(-) diff --git a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md index 97429e69cd3..60609deafdf 100644 --- a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md @@ -4,13 +4,33 @@ FakeDeleteSecurityInfo.java public class FakeDeleteSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [FakeDeleteSecurityInfo1](#fakedeletesecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakeDeleteSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## FakeDeleteSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakeDeleteSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeDeleteSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md index 5e668ecac51..cdf4746f9aa 100644 --- a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md @@ -4,13 +4,33 @@ FakePostSecurityInfo.java public class FakePostSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [FakePostSecurityInfo1](#fakepostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakePostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## FakePostSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakePostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakePostSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md index cae0e4d7607..73a5eb1ace6 100644 --- a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md @@ -4,13 +4,33 @@ FakeclassnametestPatchSecurityInfo.java public class FakeclassnametestPatchSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [FakeclassnametestPatchSecurityInfo1](#fakeclassnametestpatchsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakeclassnametestPatchSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## FakeclassnametestPatchSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakeclassnametestPatchSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeclassnametestPatchSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md index a930307b3a2..c739b40c99c 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md @@ -4,13 +4,33 @@ FakemultiplesecuritiesGetSecurityInfo.java public class FakemultiplesecuritiesGetSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [FakemultiplesecuritiesGetSecurityInfo1](#fakemultiplesecuritiesgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakemultiplesecuritiesGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## FakemultiplesecuritiesGetSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakemultiplesecuritiesGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakemultiplesecuritiesGetSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new FakemultiplesecuritiesGetSecurityRequirementObject1()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new FakemultiplesecuritiesGetSecurityRequirementObject2())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md index 70ee8165b1b..167a8b8e78b 100644 --- a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md @@ -4,13 +4,33 @@ FakepetiduploadimagewithrequiredfilePostSecurityInfo.java public class FakepetiduploadimagewithrequiredfilePostSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [FakepetiduploadimagewithrequiredfilePostSecurityInfo1](#fakepetiduploadimagewithrequiredfilepostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakepetiduploadimagewithrequiredfilePostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## FakepetiduploadimagewithrequiredfilePostSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakepetiduploadimagewithrequiredfilePostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md index 53ce732bda6..8fb533e9ffa 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md @@ -4,13 +4,33 @@ PetPostSecurityInfo.java public class PetPostSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetPostSecurityInfo1](#petpostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetPostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetPostSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPostSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPostSecurityRequirementObject1()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetPostSecurityRequirementObject2())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md index f205847659a..540627e900f 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md @@ -4,13 +4,33 @@ PetPutSecurityInfo.java public class PetPutSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetPutSecurityInfo1](#petputsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetPutSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetPutSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPutSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPutSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPutSecurityRequirementObject1())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md index 5643ff88dcd..239f36eb50b 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md @@ -4,13 +4,33 @@ PetfindbystatusGetSecurityInfo.java public class PetfindbystatusGetSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetfindbystatusGetSecurityInfo1](#petfindbystatusgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetfindbystatusGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetfindbystatusGetSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbystatusGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbystatusGetSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbystatusGetSecurityRequirementObject1()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetfindbystatusGetSecurityRequirementObject2())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md index d6a06267ead..9068311c1af 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md @@ -4,13 +4,33 @@ PetfindbytagsGetSecurityInfo.java public class PetfindbytagsGetSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetfindbytagsGetSecurityInfo1](#petfindbytagsgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetfindbytagsGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetfindbytagsGetSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbytagsGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbytagsGetSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbytagsGetSecurityRequirementObject1())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md index 5e3d99eae49..c8e9d074bd7 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md @@ -4,13 +4,33 @@ PetpetidDeleteSecurityInfo.java public class PetpetidDeleteSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetpetidDeleteSecurityInfo1](#petpetiddeletesecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetidDeleteSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetpetidDeleteSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidDeleteSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidDeleteSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidDeleteSecurityRequirementObject1())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md index 3e4b5e29773..570c9618022 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md @@ -4,13 +4,33 @@ PetpetidGetSecurityInfo.java public class PetpetidGetSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetpetidGetSecurityInfo1](#petpetidgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetidGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetpetidGetSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidGetSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md index 1f318aa5452..d4d21d4f85e 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md @@ -4,13 +4,33 @@ PetpetidPostSecurityInfo.java public class PetpetidPostSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetpetidPostSecurityInfo1](#petpetidpostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetidPostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetpetidPostSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidPostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidPostSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidPostSecurityRequirementObject1())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md index 8f276b7e043..b465b8d37df 100644 --- a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md @@ -4,13 +4,33 @@ PetpetiduploadimagePostSecurityInfo.java public class PetpetiduploadimagePostSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [PetpetiduploadimagePostSecurityInfo1](#petpetiduploadimagepostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetiduploadimagePostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## PetpetiduploadimagePostSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetiduploadimagePostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetiduploadimagePostSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md index 94c41d63d49..6bcc6bf6164 100644 --- a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md @@ -4,13 +4,33 @@ StoreinventoryGetSecurityInfo.java public class StoreinventoryGetSecurityInfo A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [StoreinventoryGetSecurityInfo1](#storeinventorygetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [StoreinventoryGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | +## StoreinventoryGetSecurityInfo1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| StoreinventoryGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new StoreinventoryGetSecurityRequirementObject0())
)); | + +### Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + ## SecurityIndex enum SecurityIndex
diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java index 3a62228c479..a98d24a2fb6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java @@ -100,36 +100,36 @@ public Server getServer(PetfindbystatusServerInfo. @Nullable ServerIndex serverI } public static class SecurityInfo { - protected final @Nullable FakeDeleteSecurityInfo fakeDeleteSecurityInfo; - protected final @Nullable FakePostSecurityInfo fakePostSecurityInfo; - protected final @Nullable FakemultiplesecuritiesGetSecurityInfo fakemultiplesecuritiesGetSecurityInfo; - protected final @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo fakepetiduploadimagewithrequiredfilePostSecurityInfo; - protected final @Nullable FakeclassnametestPatchSecurityInfo fakeclassnametestPatchSecurityInfo; - protected final @Nullable PetPostSecurityInfo petPostSecurityInfo; - protected final @Nullable PetPutSecurityInfo petPutSecurityInfo; - protected final @Nullable PetfindbystatusGetSecurityInfo petfindbystatusGetSecurityInfo; - protected final @Nullable PetfindbytagsGetSecurityInfo petfindbytagsGetSecurityInfo; - protected final @Nullable PetpetidDeleteSecurityInfo petpetidDeleteSecurityInfo; - protected final @Nullable PetpetidGetSecurityInfo petpetidGetSecurityInfo; - protected final @Nullable PetpetidPostSecurityInfo petpetidPostSecurityInfo; - protected final @Nullable PetpetiduploadimagePostSecurityInfo petpetiduploadimagePostSecurityInfo; - protected final @Nullable StoreinventoryGetSecurityInfo storeinventoryGetSecurityInfo; + protected final @Nullable FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1 fakeDeleteSecurityInfo; + protected final @Nullable FakePostSecurityInfo.FakePostSecurityInfo1 fakePostSecurityInfo; + protected final @Nullable FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1 fakemultiplesecuritiesGetSecurityInfo; + protected final @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1 fakepetiduploadimagewithrequiredfilePostSecurityInfo; + protected final @Nullable FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1 fakeclassnametestPatchSecurityInfo; + protected final @Nullable PetPostSecurityInfo.PetPostSecurityInfo1 petPostSecurityInfo; + protected final @Nullable PetPutSecurityInfo.PetPutSecurityInfo1 petPutSecurityInfo; + protected final @Nullable PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1 petfindbystatusGetSecurityInfo; + protected final @Nullable PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1 petfindbytagsGetSecurityInfo; + protected final @Nullable PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1 petpetidDeleteSecurityInfo; + protected final @Nullable PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1 petpetidGetSecurityInfo; + protected final @Nullable PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1 petpetidPostSecurityInfo; + protected final @Nullable PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1 petpetiduploadimagePostSecurityInfo; + protected final @Nullable StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1 storeinventoryGetSecurityInfo; public SecurityInfo( - @Nullable FakeDeleteSecurityInfo fakeDeleteSecurityInfo, - @Nullable FakePostSecurityInfo fakePostSecurityInfo, - @Nullable FakemultiplesecuritiesGetSecurityInfo fakemultiplesecuritiesGetSecurityInfo, - @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo fakepetiduploadimagewithrequiredfilePostSecurityInfo, - @Nullable FakeclassnametestPatchSecurityInfo fakeclassnametestPatchSecurityInfo, - @Nullable PetPostSecurityInfo petPostSecurityInfo, - @Nullable PetPutSecurityInfo petPutSecurityInfo, - @Nullable PetfindbystatusGetSecurityInfo petfindbystatusGetSecurityInfo, - @Nullable PetfindbytagsGetSecurityInfo petfindbytagsGetSecurityInfo, - @Nullable PetpetidDeleteSecurityInfo petpetidDeleteSecurityInfo, - @Nullable PetpetidGetSecurityInfo petpetidGetSecurityInfo, - @Nullable PetpetidPostSecurityInfo petpetidPostSecurityInfo, - @Nullable PetpetiduploadimagePostSecurityInfo petpetiduploadimagePostSecurityInfo, - @Nullable StoreinventoryGetSecurityInfo storeinventoryGetSecurityInfo + @Nullable FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1 fakeDeleteSecurityInfo, + @Nullable FakePostSecurityInfo.FakePostSecurityInfo1 fakePostSecurityInfo, + @Nullable FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1 fakemultiplesecuritiesGetSecurityInfo, + @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1 fakepetiduploadimagewithrequiredfilePostSecurityInfo, + @Nullable FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1 fakeclassnametestPatchSecurityInfo, + @Nullable PetPostSecurityInfo.PetPostSecurityInfo1 petPostSecurityInfo, + @Nullable PetPutSecurityInfo.PetPutSecurityInfo1 petPutSecurityInfo, + @Nullable PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1 petfindbystatusGetSecurityInfo, + @Nullable PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1 petfindbytagsGetSecurityInfo, + @Nullable PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1 petpetidDeleteSecurityInfo, + @Nullable PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1 petpetidGetSecurityInfo, + @Nullable PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1 petpetidPostSecurityInfo, + @Nullable PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1 petpetiduploadimagePostSecurityInfo, + @Nullable StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1 storeinventoryGetSecurityInfo ) { this.fakeDeleteSecurityInfo = fakeDeleteSecurityInfo; this.fakePostSecurityInfo = fakePostSecurityInfo; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java index 2b76202e2df..7f2272c18ce 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class FakeDeleteSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class FakeDeleteSecurityInfo { + public static class FakeDeleteSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public FakeDeleteSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeDeleteSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public FakeDeleteSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeDeleteSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java index 9175c0f748c..56431a133ef 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class FakePostSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class FakePostSecurityInfo { + public static class FakePostSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public FakePostSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakePostSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public FakePostSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakePostSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java index 7526e0e8106..30c221633e1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class FakeclassnametestPatchSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class FakeclassnametestPatchSecurityInfo { + public static class FakeclassnametestPatchSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public FakeclassnametestPatchSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeclassnametestPatchSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public FakeclassnametestPatchSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeclassnametestPatchSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java index 84b11321176..3bf2fad80fa 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java @@ -11,17 +11,26 @@ import java.util.Map; import java.util.EnumMap; -public class FakemultiplesecuritiesGetSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class FakemultiplesecuritiesGetSecurityInfo { + public static class FakemultiplesecuritiesGetSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public FakemultiplesecuritiesGetSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakemultiplesecuritiesGetSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new FakemultiplesecuritiesGetSecurityRequirementObject1()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new FakemultiplesecuritiesGetSecurityRequirementObject2()) - )); - this.securityIndex = securityIndex; + public FakemultiplesecuritiesGetSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakemultiplesecuritiesGetSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new FakemultiplesecuritiesGetSecurityRequirementObject1()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new FakemultiplesecuritiesGetSecurityRequirementObject2()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { @@ -29,11 +38,4 @@ public enum SecurityIndex { SECURITY_1, SECURITY_2 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java index 46dd81a5750..8fded7e9be5 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class FakepetiduploadimagewithrequiredfilePostSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class FakepetiduploadimagewithrequiredfilePostSecurityInfo { + public static class FakepetiduploadimagewithrequiredfilePostSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public FakepetiduploadimagewithrequiredfilePostSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public FakepetiduploadimagewithrequiredfilePostSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java index 1c271d3cff2..dd927f88b03 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java @@ -11,17 +11,26 @@ import java.util.Map; import java.util.EnumMap; -public class PetPostSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetPostSecurityInfo { + public static class PetPostSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetPostSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPostSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPostSecurityRequirementObject1()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetPostSecurityRequirementObject2()) - )); - this.securityIndex = securityIndex; + public PetPostSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPostSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPostSecurityRequirementObject1()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetPostSecurityRequirementObject2()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { @@ -29,11 +38,4 @@ public enum SecurityIndex { SECURITY_1, SECURITY_2 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java index d743efb9639..e5ba0e58e93 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java @@ -10,27 +10,29 @@ import java.util.Map; import java.util.EnumMap; -public class PetPutSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetPutSecurityInfo { + public static class PetPutSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetPutSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPutSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPutSecurityRequirementObject1()) - )); - this.securityIndex = securityIndex; + public PetPutSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPutSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPutSecurityRequirementObject1()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0, SECURITY_1 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java index 4355ad0b060..54cb3228eb9 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java @@ -11,17 +11,26 @@ import java.util.Map; import java.util.EnumMap; -public class PetfindbystatusGetSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetfindbystatusGetSecurityInfo { + public static class PetfindbystatusGetSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetfindbystatusGetSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbystatusGetSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbystatusGetSecurityRequirementObject1()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetfindbystatusGetSecurityRequirementObject2()) - )); - this.securityIndex = securityIndex; + public PetfindbystatusGetSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbystatusGetSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbystatusGetSecurityRequirementObject1()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetfindbystatusGetSecurityRequirementObject2()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { @@ -29,11 +38,4 @@ public enum SecurityIndex { SECURITY_1, SECURITY_2 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java index 81a5c13f96e..0ace3a65ba1 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java @@ -10,27 +10,29 @@ import java.util.Map; import java.util.EnumMap; -public class PetfindbytagsGetSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetfindbytagsGetSecurityInfo { + public static class PetfindbytagsGetSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetfindbytagsGetSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbytagsGetSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbytagsGetSecurityRequirementObject1()) - )); - this.securityIndex = securityIndex; + public PetfindbytagsGetSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbytagsGetSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbytagsGetSecurityRequirementObject1()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0, SECURITY_1 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java index 3d3640a85ab..47c182ba029 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java @@ -10,27 +10,29 @@ import java.util.Map; import java.util.EnumMap; -public class PetpetidDeleteSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetpetidDeleteSecurityInfo { + public static class PetpetidDeleteSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetpetidDeleteSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidDeleteSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidDeleteSecurityRequirementObject1()) - )); - this.securityIndex = securityIndex; + public PetpetidDeleteSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidDeleteSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidDeleteSecurityRequirementObject1()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0, SECURITY_1 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java index 3cc8fb8a3c9..9a837402745 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class PetpetidGetSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetpetidGetSecurityInfo { + public static class PetpetidGetSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetpetidGetSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidGetSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public PetpetidGetSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidGetSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java index 9dc8d070b95..34d16945400 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java @@ -10,27 +10,29 @@ import java.util.Map; import java.util.EnumMap; -public class PetpetidPostSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetpetidPostSecurityInfo { + public static class PetpetidPostSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetpetidPostSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidPostSecurityRequirementObject0()), - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidPostSecurityRequirementObject1()) - )); - this.securityIndex = securityIndex; + public PetpetidPostSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidPostSecurityRequirementObject0()), + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidPostSecurityRequirementObject1()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0, SECURITY_1 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java index 9bd18667e2b..21d045fa9d0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class PetpetiduploadimagePostSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class PetpetiduploadimagePostSecurityInfo { + public static class PetpetiduploadimagePostSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public PetpetiduploadimagePostSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetiduploadimagePostSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public PetpetiduploadimagePostSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetiduploadimagePostSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java index 8fef4c40096..d8d591ec4cd 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java @@ -9,25 +9,27 @@ import java.util.Map; import java.util.EnumMap; -public class StoreinventoryGetSecurityInfo implements SecurityRequirementObjectProvider { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class StoreinventoryGetSecurityInfo { + public static class StoreinventoryGetSecurityInfo1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public StoreinventoryGetSecurityInfo(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new StoreinventoryGetSecurityRequirementObject0()) - )); - this.securityIndex = securityIndex; + public StoreinventoryGetSecurityInfo1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new StoreinventoryGetSecurityRequirementObject0()) + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { SECURITY_0 } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs index b39e508e66e..4c752bfb97e 100644 --- a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs +++ b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs @@ -100,12 +100,12 @@ public class ApiConfiguration { public static class SecurityInfo { {{#each allSecurity}} - protected final @Nullable {{jsonPathPiece.pascalCase}} {{jsonPathPiece.camelCase}}; + protected final @Nullable {{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1 {{jsonPathPiece.camelCase}}; {{/each}} public SecurityInfo( {{#each allSecurity}} - @Nullable {{jsonPathPiece.pascalCase}} {{jsonPathPiece.camelCase}}{{#unless @last}},{{/unless}} + @Nullable {{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1 {{jsonPathPiece.camelCase}}{{#unless @last}},{{/unless}} {{/each}} ) { {{#each allSecurity}} diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs index ebe9dfcc96d..454ba322ca6 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs @@ -15,17 +15,26 @@ import java.util.AbstractMap; import java.util.Map; import java.util.EnumMap; -public class {{security.jsonPathPiece.pascalCase}} implements SecurityRequirementObjectProvider<{{security.jsonPathPiece.pascalCase}}.SecurityIndex> { - final private EnumMap securities; - final private SecurityIndex securityIndex; +public class {{security.jsonPathPiece.pascalCase}} { + public static class {{security.jsonPathPiece.pascalCase}}1 implements SecurityRequirementObjectProvider { + final public EnumMap securities; + final private SecurityIndex securityIndex; - public {{security.jsonPathPiece.pascalCase}}(SecurityIndex securityIndex) { - this.securities = new EnumMap<>(Map.ofEntries( + public {{security.jsonPathPiece.pascalCase}}1(SecurityIndex securityIndex) { + this.securities = new EnumMap<>(Map.ofEntries( {{#each security}} - new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}} + new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}} {{/each}} - )); - this.securityIndex = securityIndex; + )); + this.securityIndex = securityIndex; + } + + public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { + if (securityIndex == null) { + return securities.get(this.securityIndex); + } + return securities.get(securityIndex); + } } public enum SecurityIndex { @@ -33,11 +42,4 @@ public class {{security.jsonPathPiece.pascalCase}} implements SecurityRequiremen SECURITY_{{@index}}{{#unless @last}},{{/unless}} {{/each}} } - - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } - return securities.get(securityIndex); - } } \ No newline at end of file diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs index 46dc24e76df..46ae925e813 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs @@ -4,13 +4,33 @@ public class {{security.jsonPathPiece.pascalCase}} A class that provides a security requirement object, and any needed security info classes -- an enum class that stores security index values +- a class that stores a securityIndex and provides a SecurityRequirementsObject +- an enum class that describes security index values {{headerSize}}# Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | +| static class | [{{security.jsonPathPiece.pascalCase}}1](#{{security.jsonPathPiece.kebabCase}}1)
SecurityRequirementObjectProvider | enum | [{{security.jsonPathPiece.pascalCase}}.SecurityIndex](#securityindex)
class that stores a security index | +{{headerSize}}# {{security.jsonPathPiece.pascalCase}}1 +implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> + +{{headerSize}}## Constructor Summary +| Constructor and Description | +| --------------------------- | +| {{security.jsonPathPiece.pascalCase}}1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | + +{{headerSize}}## Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
{{#each security}}    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}}
{{/each}})); | + +{{headerSize}}## Method Summary +| Modifier and Type | Method and Description | +| ----------------- | ---------------------- | +| SecurityRequirementObject | getSecurityRequirementObject(@Nullable [SecurityIndex](#securityindex) securityIndex)
If null is input, then the instance's securityIndex will be used | + {{headerSize}}# SecurityIndex enum SecurityIndex
From 76d8cc2de6b93767c1574240eb38d26763654bc7 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 25 Mar 2024 18:19:55 -0700 Subject: [PATCH 4/9] Adds missing class's container class in docs --- .../java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md | 2 +- .../petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md | 2 +- .../patch/FakeclassnametestPatchSecurityInfo.md | 2 +- .../get/FakemultiplesecuritiesGetSecurityInfo.md | 2 +- .../FakepetiduploadimagewithrequiredfilePostSecurityInfo.md | 2 +- .../petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md | 2 +- .../petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md | 2 +- .../paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md | 2 +- .../paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md | 2 +- .../docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md | 2 +- .../java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md | 2 +- .../java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md | 2 +- .../post/PetpetiduploadimagePostSecurityInfo.md | 2 +- .../paths/storeinventory/get/StoreinventoryGetSecurityInfo.md | 2 +- .../packagename/securityrequirementobjects/SecurityInfoDoc.hbs | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md index 60609deafdf..9ba3b330f2f 100644 --- a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [FakeDeleteSecurityInfo1](#fakedeletesecurityinfo1)
SecurityRequirementObjectProvider +| static class | [FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1](#fakedeletesecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakeDeleteSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## FakeDeleteSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md index cdf4746f9aa..1f024664d78 100644 --- a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [FakePostSecurityInfo1](#fakepostsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [FakePostSecurityInfo.FakePostSecurityInfo1](#fakepostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakePostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## FakePostSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md index 73a5eb1ace6..c7c670f26d1 100644 --- a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [FakeclassnametestPatchSecurityInfo1](#fakeclassnametestpatchsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1](#fakeclassnametestpatchsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakeclassnametestPatchSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## FakeclassnametestPatchSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md index c739b40c99c..e28666afdea 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [FakemultiplesecuritiesGetSecurityInfo1](#fakemultiplesecuritiesgetsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1](#fakemultiplesecuritiesgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakemultiplesecuritiesGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## FakemultiplesecuritiesGetSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md index 167a8b8e78b..99055d37309 100644 --- a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [FakepetiduploadimagewithrequiredfilePostSecurityInfo1](#fakepetiduploadimagewithrequiredfilepostsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1](#fakepetiduploadimagewithrequiredfilepostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [FakepetiduploadimagewithrequiredfilePostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## FakepetiduploadimagewithrequiredfilePostSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md index 8fb533e9ffa..ef98ea8c461 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetPostSecurityInfo1](#petpostsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetPostSecurityInfo.PetPostSecurityInfo1](#petpostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetPostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetPostSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md index 540627e900f..e98aa18e922 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetPutSecurityInfo1](#petputsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetPutSecurityInfo.PetPutSecurityInfo1](#petputsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetPutSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetPutSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md index 239f36eb50b..03fc2bba7fb 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetfindbystatusGetSecurityInfo1](#petfindbystatusgetsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1](#petfindbystatusgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetfindbystatusGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetfindbystatusGetSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md index 9068311c1af..786c605bc39 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetfindbytagsGetSecurityInfo1](#petfindbytagsgetsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1](#petfindbytagsgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetfindbytagsGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetfindbytagsGetSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md index c8e9d074bd7..0b3b138d7ac 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetpetidDeleteSecurityInfo1](#petpetiddeletesecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1](#petpetiddeletesecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetidDeleteSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetpetidDeleteSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md index 570c9618022..3a0191f4fb3 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetpetidGetSecurityInfo1](#petpetidgetsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1](#petpetidgetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetidGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetpetidGetSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md index d4d21d4f85e..c359d24277d 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetpetidPostSecurityInfo1](#petpetidpostsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1](#petpetidpostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetidPostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetpetidPostSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md index b465b8d37df..23bc601766f 100644 --- a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [PetpetiduploadimagePostSecurityInfo1](#petpetiduploadimagepostsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1](#petpetiduploadimagepostsecurityinfo1)
SecurityRequirementObjectProvider | enum | [PetpetiduploadimagePostSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## PetpetiduploadimagePostSecurityInfo1 diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md index 6bcc6bf6164..ad744b0b02e 100644 --- a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf ## Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [StoreinventoryGetSecurityInfo1](#storeinventorygetsecurityinfo1)
SecurityRequirementObjectProvider +| static class | [StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1](#storeinventorygetsecurityinfo1)
SecurityRequirementObjectProvider | enum | [StoreinventoryGetSecurityInfo.SecurityIndex](#securityindex)
class that stores a security index | ## StoreinventoryGetSecurityInfo1 diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs index 46ae925e813..bd9cf32ae0d 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs @@ -10,7 +10,7 @@ A class that provides a security requirement object, and any needed security inf {{headerSize}}# Nested Class Summary | Modifier and Type | Class and Description | | ----------------- | --------------------- | -| static class | [{{security.jsonPathPiece.pascalCase}}1](#{{security.jsonPathPiece.kebabCase}}1)
SecurityRequirementObjectProvider +| static class | [{{security.jsonPathPiece.pascalCase}}.{{security.jsonPathPiece.pascalCase}}1](#{{security.jsonPathPiece.kebabCase}}1)
SecurityRequirementObjectProvider | enum | [{{security.jsonPathPiece.pascalCase}}.SecurityIndex](#securityindex)
class that stores a security index | {{headerSize}}# {{security.jsonPathPiece.pascalCase}}1 From 01897b2569eb73789114f2d4763fca4b4ab261ad Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 25 Mar 2024 21:49:01 -0700 Subject: [PATCH 5/9] Adds docs for security requirement objects --- .../petstore/java/.openapi-generator/FILES | 24 +++++++++++++++++++ .../FakeDeleteSecurityRequirementObject0.md | 15 ++++++++++++ .../FakePostSecurityRequirementObject0.md | 15 ++++++++++++ ...nametestPatchSecurityRequirementObject0.md | 15 ++++++++++++ ...securitiesGetSecurityRequirementObject0.md | 15 ++++++++++++ ...securitiesGetSecurityRequirementObject1.md | 15 ++++++++++++ ...securitiesGetSecurityRequirementObject2.md | 15 ++++++++++++ ...uiredfilePostSecurityRequirementObject0.md | 15 ++++++++++++ .../PetPostSecurityRequirementObject0.md | 15 ++++++++++++ .../PetPostSecurityRequirementObject1.md | 15 ++++++++++++ .../PetPostSecurityRequirementObject2.md | 15 ++++++++++++ .../PetPutSecurityRequirementObject0.md | 15 ++++++++++++ .../PetPutSecurityRequirementObject1.md | 15 ++++++++++++ ...ndbystatusGetSecurityRequirementObject0.md | 15 ++++++++++++ ...ndbystatusGetSecurityRequirementObject1.md | 15 ++++++++++++ ...ndbystatusGetSecurityRequirementObject2.md | 15 ++++++++++++ ...findbytagsGetSecurityRequirementObject0.md | 15 ++++++++++++ ...findbytagsGetSecurityRequirementObject1.md | 15 ++++++++++++ ...etpetidDeleteSecurityRequirementObject0.md | 15 ++++++++++++ ...etpetidDeleteSecurityRequirementObject1.md | 15 ++++++++++++ .../PetpetidGetSecurityRequirementObject0.md | 15 ++++++++++++ .../PetpetidPostSecurityRequirementObject0.md | 15 ++++++++++++ .../PetpetidPostSecurityRequirementObject1.md | 15 ++++++++++++ ...loadimagePostSecurityRequirementObject0.md | 15 ++++++++++++ ...einventoryGetSecurityRequirementObject0.md | 15 ++++++++++++ .../DefaultGeneratorRunner.java | 9 ++++--- .../generators/JavaClientGenerator.java | 6 +++++ .../SecurityRequirementObjectNDoc.hbs | 19 +++++++++++++++ 28 files changed, 415 insertions(+), 3 deletions(-) create mode 100644 samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md create mode 100644 samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md create mode 100644 samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md create mode 100644 samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md create mode 100644 samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md create mode 100644 samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md create mode 100644 src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES index 039892eb014..aa899ef9fe6 100644 --- a/samples/client/petstore/java/.openapi-generator/FILES +++ b/samples/client/petstore/java/.openapi-generator/FILES @@ -228,6 +228,7 @@ docs/paths/fake/delete/parameters/parameter3/Schema3.md docs/paths/fake/delete/parameters/parameter4/Schema4.md docs/paths/fake/delete/parameters/parameter5/Schema5.md docs/paths/fake/delete/responses/Code200Response.md +docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md docs/paths/fake/get/HeaderParameters.md docs/paths/fake/get/QueryParameters.md docs/paths/fake/get/RequestBody.md @@ -252,6 +253,7 @@ docs/paths/fake/post/Responses.md docs/paths/fake/post/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.md docs/paths/fake/post/responses/Code200Response.md docs/paths/fake/post/responses/Code404Response.md +docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md docs/paths/fakeadditionalpropertieswitharrayofenums/Get.md docs/paths/fakeadditionalpropertieswitharrayofenums/get/RequestBody.md docs/paths/fakeadditionalpropertieswitharrayofenums/get/Responses.md @@ -283,6 +285,7 @@ docs/paths/fakeclassnametest/patch/RequestBody.md docs/paths/fakeclassnametest/patch/Responses.md docs/paths/fakeclassnametest/patch/responses/Code200Response.md docs/paths/fakeclassnametest/patch/responses/code200response/content/applicationjson/ApplicationjsonSchema.md +docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md docs/paths/fakedeletecoffeeid/Delete.md docs/paths/fakedeletecoffeeid/delete/PathParameters.md docs/paths/fakedeletecoffeeid/delete/Responses.md @@ -343,6 +346,9 @@ docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md docs/paths/fakemultiplesecurities/get/Responses.md docs/paths/fakemultiplesecurities/get/responses/Code200Response.md docs/paths/fakemultiplesecurities/get/responses/code200response/content/applicationjson/ApplicationjsonSchema.md +docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.md +docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md +docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md docs/paths/fakeobjinquery/Get.md docs/paths/fakeobjinquery/get/QueryParameters.md docs/paths/fakeobjinquery/get/Responses.md @@ -392,6 +398,7 @@ docs/paths/fakepetiduploadimagewithrequiredfile/post/parameters/parameter0/Schem docs/paths/fakepetiduploadimagewithrequiredfile/post/requestbody/content/multipartformdata/MultipartformdataSchema.md docs/paths/fakepetiduploadimagewithrequiredfile/post/responses/Code200Response.md docs/paths/fakepetiduploadimagewithrequiredfile/post/responses/code200response/content/applicationjson/ApplicationjsonSchema.md +docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md docs/paths/fakequeryparamwithjsoncontenttype/Get.md docs/paths/fakequeryparamwithjsoncontenttype/get/QueryParameters.md docs/paths/fakequeryparamwithjsoncontenttype/get/Responses.md @@ -518,12 +525,17 @@ docs/paths/pet/post/RequestBody.md docs/paths/pet/post/Responses.md docs/paths/pet/post/responses/Code200Response.md docs/paths/pet/post/responses/Code405Response.md +docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md +docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md +docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md docs/paths/pet/put/PetPutSecurityInfo.md docs/paths/pet/put/RequestBody.md docs/paths/pet/put/Responses.md docs/paths/pet/put/responses/Code400Response.md docs/paths/pet/put/responses/Code404Response.md docs/paths/pet/put/responses/Code405Response.md +docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md +docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md docs/paths/petfindbystatus/Get.md docs/paths/petfindbystatus/PetfindbystatusServerInfo.md docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md @@ -532,6 +544,9 @@ docs/paths/petfindbystatus/get/Responses.md docs/paths/petfindbystatus/get/parameters/parameter0/Schema0.md docs/paths/petfindbystatus/get/responses/Code200Response.md docs/paths/petfindbystatus/get/responses/Code400Response.md +docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md +docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md +docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md docs/paths/petfindbytags/Get.md docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md docs/paths/petfindbytags/get/QueryParameters.md @@ -539,6 +554,8 @@ docs/paths/petfindbytags/get/Responses.md docs/paths/petfindbytags/get/parameters/parameter0/Schema0.md docs/paths/petfindbytags/get/responses/Code200Response.md docs/paths/petfindbytags/get/responses/Code400Response.md +docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md +docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md docs/paths/petpetid/Delete.md docs/paths/petpetid/Get.md docs/paths/petpetid/Post.md @@ -549,6 +566,8 @@ docs/paths/petpetid/delete/Responses.md docs/paths/petpetid/delete/parameters/parameter0/Schema0.md docs/paths/petpetid/delete/parameters/parameter1/Schema1.md docs/paths/petpetid/delete/responses/Code400Response.md +docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md +docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md docs/paths/petpetid/get/PathParameters.md docs/paths/petpetid/get/PetpetidGetSecurityInfo.md docs/paths/petpetid/get/Responses.md @@ -558,6 +577,7 @@ docs/paths/petpetid/get/responses/Code400Response.md docs/paths/petpetid/get/responses/Code404Response.md docs/paths/petpetid/get/responses/code200response/content/applicationjson/ApplicationjsonSchema.md docs/paths/petpetid/get/responses/code200response/content/applicationxml/ApplicationxmlSchema.md +docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md docs/paths/petpetid/post/PathParameters.md docs/paths/petpetid/post/PetpetidPostSecurityInfo.md docs/paths/petpetid/post/RequestBody.md @@ -565,6 +585,8 @@ docs/paths/petpetid/post/Responses.md docs/paths/petpetid/post/parameters/parameter0/Schema0.md docs/paths/petpetid/post/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.md docs/paths/petpetid/post/responses/Code405Response.md +docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md +docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md docs/paths/petpetiduploadimage/Post.md docs/paths/petpetiduploadimage/post/PathParameters.md docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md @@ -573,6 +595,7 @@ docs/paths/petpetiduploadimage/post/Responses.md docs/paths/petpetiduploadimage/post/parameters/parameter0/Schema0.md docs/paths/petpetiduploadimage/post/requestbody/content/multipartformdata/MultipartformdataSchema.md docs/paths/petpetiduploadimage/post/responses/Code200Response.md +docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md docs/paths/solidus/Get.md docs/paths/solidus/get/Responses.md docs/paths/solidus/get/responses/Code200Response.md @@ -580,6 +603,7 @@ docs/paths/storeinventory/Get.md docs/paths/storeinventory/get/Responses.md docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md docs/paths/storeinventory/get/responses/Code200Response.md +docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md docs/paths/storeorder/Post.md docs/paths/storeorder/post/RequestBody.md docs/paths/storeorder/post/Responses.md diff --git a/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md new file mode 100644 index 00000000000..889ed2d05a5 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# FakeDeleteSecurityRequirementObject0 +FakeDeleteSecurityRequirementObject0.java + +public class FakeDeleteSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakeDeleteSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        BearerTest.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md new file mode 100644 index 00000000000..888bfaf6eac --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# FakePostSecurityRequirementObject0 +FakePostSecurityRequirementObject0.java + +public class FakePostSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakePostSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpBasicTest.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md new file mode 100644 index 00000000000..a885ea3f034 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# FakeclassnametestPatchSecurityRequirementObject0 +FakeclassnametestPatchSecurityRequirementObject0.java + +public class FakeclassnametestPatchSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakeclassnametestPatchSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKeyQuery.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.md new file mode 100644 index 00000000000..e762a030213 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# FakemultiplesecuritiesGetSecurityRequirementObject0 +FakemultiplesecuritiesGetSecurityRequirementObject0.java + +public class FakemultiplesecuritiesGetSecurityRequirementObject0 +extends EmptySecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakemultiplesecuritiesGetSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries() | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md new file mode 100644 index 00000000000..70541c388a7 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# FakemultiplesecuritiesGetSecurityRequirementObject1 +FakemultiplesecuritiesGetSecurityRequirementObject1.java + +public class FakemultiplesecuritiesGetSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakemultiplesecuritiesGetSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpBasicTest.class,        List.of()    ),    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md new file mode 100644 index 00000000000..fa41b674d37 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md @@ -0,0 +1,15 @@ +# FakemultiplesecuritiesGetSecurityRequirementObject2 +FakemultiplesecuritiesGetSecurityRequirementObject2.java + +public class FakemultiplesecuritiesGetSecurityRequirementObject2 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakemultiplesecuritiesGetSecurityRequirementObject2()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md new file mode 100644 index 00000000000..008834f0342 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 +FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.java + +public class FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md new file mode 100644 index 00000000000..4a23cc34240 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetPostSecurityRequirementObject0 +PetPostSecurityRequirementObject0.java + +public class PetPostSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPostSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md new file mode 100644 index 00000000000..97c08455309 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# PetPostSecurityRequirementObject1 +PetPostSecurityRequirementObject1.java + +public class PetPostSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPostSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md new file mode 100644 index 00000000000..ea19e6e2ee6 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md @@ -0,0 +1,15 @@ +# PetPostSecurityRequirementObject2 +PetPostSecurityRequirementObject2.java + +public class PetPostSecurityRequirementObject2 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPostSecurityRequirementObject2()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md new file mode 100644 index 00000000000..7bffd1f658d --- /dev/null +++ b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetPutSecurityRequirementObject0 +PetPutSecurityRequirementObject0.java + +public class PetPutSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPutSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md new file mode 100644 index 00000000000..7eb50480d1a --- /dev/null +++ b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# PetPutSecurityRequirementObject1 +PetPutSecurityRequirementObject1.java + +public class PetPutSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetPutSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md new file mode 100644 index 00000000000..c413f7d4b0a --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetfindbystatusGetSecurityRequirementObject0 +PetfindbystatusGetSecurityRequirementObject0.java + +public class PetfindbystatusGetSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbystatusGetSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md new file mode 100644 index 00000000000..a176405b672 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# PetfindbystatusGetSecurityRequirementObject1 +PetfindbystatusGetSecurityRequirementObject1.java + +public class PetfindbystatusGetSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbystatusGetSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md new file mode 100644 index 00000000000..51aa090f7e5 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md @@ -0,0 +1,15 @@ +# PetfindbystatusGetSecurityRequirementObject2 +PetfindbystatusGetSecurityRequirementObject2.java + +public class PetfindbystatusGetSecurityRequirementObject2 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbystatusGetSecurityRequirementObject2()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md new file mode 100644 index 00000000000..baabebeaabb --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetfindbytagsGetSecurityRequirementObject0 +PetfindbytagsGetSecurityRequirementObject0.java + +public class PetfindbytagsGetSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbytagsGetSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md new file mode 100644 index 00000000000..c97b7b62cda --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# PetfindbytagsGetSecurityRequirementObject1 +PetfindbytagsGetSecurityRequirementObject1.java + +public class PetfindbytagsGetSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetfindbytagsGetSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md new file mode 100644 index 00000000000..cb51c37a240 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetpetidDeleteSecurityRequirementObject0 +PetpetidDeleteSecurityRequirementObject0.java + +public class PetpetidDeleteSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidDeleteSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md new file mode 100644 index 00000000000..bad1b4f9d40 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# PetpetidDeleteSecurityRequirementObject1 +PetpetidDeleteSecurityRequirementObject1.java + +public class PetpetidDeleteSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidDeleteSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md new file mode 100644 index 00000000000..85cf75a35ad --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetpetidGetSecurityRequirementObject0 +PetpetidGetSecurityRequirementObject0.java + +public class PetpetidGetSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidGetSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md new file mode 100644 index 00000000000..e38d88e2c65 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetpetidPostSecurityRequirementObject0 +PetpetidPostSecurityRequirementObject0.java + +public class PetpetidPostSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidPostSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md new file mode 100644 index 00000000000..44db520d4b1 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md @@ -0,0 +1,15 @@ +# PetpetidPostSecurityRequirementObject1 +PetpetidPostSecurityRequirementObject1.java + +public class PetpetidPostSecurityRequirementObject1 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetidPostSecurityRequirementObject1()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md new file mode 100644 index 00000000000..344d9c2f6ed --- /dev/null +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# PetpetiduploadimagePostSecurityRequirementObject0 +PetpetiduploadimagePostSecurityRequirementObject0.java + +public class PetpetiduploadimagePostSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| PetpetiduploadimagePostSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md new file mode 100644 index 00000000000..b1916b05c23 --- /dev/null +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md @@ -0,0 +1,15 @@ +# StoreinventoryGetSecurityRequirementObject0 +StoreinventoryGetSecurityRequirementObject0.java + +public class StoreinventoryGetSecurityRequirementObject0 +extends SecurityRequirementObject + +### Constructor Summary +| Constructor and Description | +| --------------------------- | +| StoreinventoryGetSecurityRequirementObject0()
Creates an instance | + +### Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | diff --git a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index baa1248f9a4..5619327129d 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -498,7 +498,7 @@ private void generatePathItem(List files, CodegenKey pathKey, CodegenPathI // paths.some_path.security.security_requirement_0.py if (operation.security != null) { String securityJsonPath = operationJsonPath + "/security"; - generateSecurity(files, operation.security, securityJsonPath); + generateSecurity(files, operation.security, securityJsonPath, "../../../"); } // paths.some_path.post.request_body.py, only written if there is no refModule @@ -1471,7 +1471,7 @@ private TreeMap getTags() { return tags; } - private void generateSecurity(List files, CodegenList security, String jsonPath) { + private void generateSecurity(List files, CodegenList security, String jsonPath, String docRoot) { if (security == null || security.isEmpty()) { return; } @@ -1493,6 +1493,9 @@ private void generateSecurity(List files, CodegenList generate() { TreeMap securitySchemes = generateSecuritySchemes(files); // security CodegenList security = generator.fromSecurity(openAPI.getSecurity(), "#/security"); - generateSecurity(files, security, "#/security"); + generateSecurity(files, security, "#/security", "../"); boolean schemasExist = (schemas != null && !schemas.isEmpty()); boolean requestBodiesExist = (requestBodies != null && !requestBodies.isEmpty()); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index e20537fb1de..2ea069c1667 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -3050,6 +3050,12 @@ public void setOpenAPI(OpenAPI openAPI) { put("src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectN.hbs", ".java"); }} ); + jsonPathDocTemplateFiles.put( + CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY, + new HashMap<>() {{ + put("src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs", ".md"); + }} + ); jsonPathTemplateFiles.put( CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITIES, new HashMap<>() {{ diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs new file mode 100644 index 00000000000..2da14083a18 --- /dev/null +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs @@ -0,0 +1,19 @@ +{{headerSize}} {{securityRequirementObject.jsonPathPiece.pascalCase}} +{{securityRequirementObject.jsonPathPiece.pascalCase}}.java + +public class {{securityRequirementObject.jsonPathPiece.pascalCase}} +{{#if securityRequirementObject.isEmpty }} +extends EmptySecurityRequirementObject +{{else}} +extends SecurityRequirementObject +{{/if}} + +{{headerSize}}## Constructor Summary +| Constructor and Description | +| --------------------------- | +| {{securityRequirementObject.jsonPathPiece.pascalCase}}()
Creates an instance | + +{{headerSize}}## Field Summary +| Modifier and Type | Field and Description | +| ----------------- | --------------------- | +| Map, List> | securitySchemeToScopes = Map.ofEntries({{#each securityRequirementObject}}    new AbstractMap.SimpleEntry, List>(        {{refInfo.refClass}}.class,        List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})    ){{#unless @last}},{{/unless}}{{/each}}) | From a749207b4dda0480d86384930238b165856aaac6 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Tue, 26 Mar 2024 12:06:23 -0700 Subject: [PATCH 6/9] Adds link from security requirement object doc to security scheme doc --- .../security/FakeDeleteSecurityRequirementObject0.md | 2 +- .../security/FakePostSecurityRequirementObject0.md | 2 +- ...akeclassnametestPatchSecurityRequirementObject0.md | 2 +- ...multiplesecuritiesGetSecurityRequirementObject1.md | 2 +- ...multiplesecuritiesGetSecurityRequirementObject2.md | 2 +- ...ewithrequiredfilePostSecurityRequirementObject0.md | 2 +- .../security/PetPostSecurityRequirementObject0.md | 2 +- .../security/PetPostSecurityRequirementObject1.md | 2 +- .../security/PetPostSecurityRequirementObject2.md | 2 +- .../put/security/PetPutSecurityRequirementObject0.md | 2 +- .../put/security/PetPutSecurityRequirementObject1.md | 2 +- .../PetfindbystatusGetSecurityRequirementObject0.md | 2 +- .../PetfindbystatusGetSecurityRequirementObject1.md | 2 +- .../PetfindbystatusGetSecurityRequirementObject2.md | 2 +- .../PetfindbytagsGetSecurityRequirementObject0.md | 2 +- .../PetfindbytagsGetSecurityRequirementObject1.md | 2 +- .../PetpetidDeleteSecurityRequirementObject0.md | 2 +- .../PetpetidDeleteSecurityRequirementObject1.md | 2 +- .../security/PetpetidGetSecurityRequirementObject0.md | 2 +- .../PetpetidPostSecurityRequirementObject0.md | 2 +- .../PetpetidPostSecurityRequirementObject1.md | 2 +- ...tpetiduploadimagePostSecurityRequirementObject0.md | 2 +- .../StoreinventoryGetSecurityRequirementObject0.md | 2 +- .../codegen/generators/DefaultGenerator.java | 4 +++- .../openapimodels/CodegenSecurityScheme.java | 11 +++++++++-- .../SecurityRequirementObjectNDoc.hbs | 2 +- 26 files changed, 36 insertions(+), 27 deletions(-) diff --git a/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md index 889ed2d05a5..a81a3833352 100644 --- a/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        BearerTest.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [BearerTest](../../../../components/securityschemes/BearerTest.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md index 888bfaf6eac..1ca63a4ee47 100644 --- a/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpBasicTest.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpBasicTest](../../../../components/securityschemes/HttpBasicTest.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md index a885ea3f034..ad859c3d7d3 100644 --- a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKeyQuery.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKeyQuery](../../../../components/securityschemes/ApiKeyQuery.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md index 70541c388a7..93cd351d298 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpBasicTest.class,        List.of()    ),    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpBasicTest](../../../../components/securityschemes/HttpBasicTest.md).class,        List.of()    ),    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md index fa41b674d37..cea7cce87c2 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md index 008834f0342..edd8032ca66 100644 --- a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md index 4a23cc34240..b57a2c0d808 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md index 97c08455309..5b613caf8f0 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md index ea19e6e2ee6..2dc5efa17b8 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md index 7bffd1f658d..8d7bf443433 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md index 7eb50480d1a..592097bdf76 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md index c413f7d4b0a..ce8f67cd760 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md index a176405b672..4f0a08fa368 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md index 51aa090f7e5..aca29b8dbe2 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md index baabebeaabb..6cafa8028a2 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        HttpSignatureTest.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md index c97b7b62cda..da43d6fd745 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md index cb51c37a240..dba632bfb96 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md index bad1b4f9d40..2ec34148a60 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md index 85cf75a35ad..db9b7aa9e1c 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md index e38d88e2c65..37ca20c445c 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md index 44db520d4b1..39f7f569128 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md index 344d9c2f6ed..60151770b33 100644 --- a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        PetstoreAuth.class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md index b1916b05c23..6593f13d869 100644 --- a/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        ApiKey.class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 06f0fbff79a..22fcbf24e5b 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -3507,6 +3507,7 @@ public CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, S if (securityScheme.getExtensions() != null) { vendorExtensions = securityScheme.getExtensions(); } + String pathFromDocROot = getPathFromDocRoot(jsonPath); final CodegenSecurityScheme cs = new CodegenSecurityScheme( type, description, @@ -3520,7 +3521,8 @@ public CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, S componentModule, jsonPathPiece, refInfo, - vendorExtensions + vendorExtensions, + pathFromDocROot ); codegenSecuritySchemeCache.put(jsonPath, cs); return cs; diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java index 4f0f724afb6..a54fdc4a0ed 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.TreeSet; -public class CodegenSecurityScheme { +public class CodegenSecurityScheme implements PathFromDocRootProvider { public final String type; public final CodegenText description; public final String name; @@ -35,8 +35,9 @@ public class CodegenSecurityScheme { public final CodegenKey jsonPathPiece; public final CodegenRefInfo refInfo; public final Map vendorExtensions; + public final String pathFromDocRoot; - public CodegenSecurityScheme(String type, CodegenText description, String name, String in, String scheme, String bearerFormat, CodegenOauthFlows flows, String openIdConnectUrl, TreeSet imports, boolean componentModule, CodegenKey jsonPathPiece, CodegenRefInfo refInfo, Map vendorExtensions) { + public CodegenSecurityScheme(String type, CodegenText description, String name, String in, String scheme, String bearerFormat, CodegenOauthFlows flows, String openIdConnectUrl, TreeSet imports, boolean componentModule, CodegenKey jsonPathPiece, CodegenRefInfo refInfo, Map vendorExtensions, String pathFromDocRoot) { this.type = type; this.description = description; this.name = name; @@ -50,6 +51,7 @@ public CodegenSecurityScheme(String type, CodegenText description, String name, this.jsonPathPiece = jsonPathPiece; this.refInfo = refInfo; this.vendorExtensions = vendorExtensions; + this.pathFromDocRoot = pathFromDocRoot; } public CodegenSecurityScheme getDeepestRef() { @@ -96,4 +98,9 @@ public String toString() { ", vendorExtensions=" + vendorExtensions + '}'; } + + @Override + public String pathFromDocRoot() { + return pathFromDocRoot; + } } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs index 2da14083a18..9f588ba064b 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs @@ -16,4 +16,4 @@ extends SecurityRequirementObject {{headerSize}}## Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries({{#each securityRequirementObject}}    new AbstractMap.SimpleEntry, List>(        {{refInfo.refClass}}.class,        List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})    ){{#unless @last}},{{/unless}}{{/each}}) | +| Map, List> | securitySchemeToScopes = Map.ofEntries({{#each securityRequirementObject}}    new AbstractMap.SimpleEntry, List>(        [{{refInfo.refClass}}]({{docRoot}}{{refInfo.ref.pathFromDocRoot}}.md).class,        List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})    ){{#unless @last}},{{/unless}}{{/each}}) | From ba5d051bae7b59915236a2c69f9116f238cce509 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Tue, 26 Mar 2024 14:48:30 -0700 Subject: [PATCH 7/9] Fixes links from security info classes to securityequirementObjects --- .../docs/paths/fake/delete/FakeDeleteSecurityInfo.md | 2 +- .../security/FakeDeleteSecurityRequirementObject0.md | 2 +- .../java/docs/paths/fake/post/FakePostSecurityInfo.md | 2 +- .../security/FakePostSecurityRequirementObject0.md | 2 +- .../patch/FakeclassnametestPatchSecurityInfo.md | 2 +- ...akeclassnametestPatchSecurityRequirementObject0.md | 2 +- .../get/FakemultiplesecuritiesGetSecurityInfo.md | 2 +- ...multiplesecuritiesGetSecurityRequirementObject1.md | 2 +- ...multiplesecuritiesGetSecurityRequirementObject2.md | 2 +- ...etiduploadimagewithrequiredfilePostSecurityInfo.md | 2 +- ...ewithrequiredfilePostSecurityRequirementObject0.md | 2 +- .../java/docs/paths/pet/post/PetPostSecurityInfo.md | 2 +- .../security/PetPostSecurityRequirementObject0.md | 2 +- .../security/PetPostSecurityRequirementObject1.md | 2 +- .../security/PetPostSecurityRequirementObject2.md | 2 +- .../java/docs/paths/pet/put/PetPutSecurityInfo.md | 2 +- .../put/security/PetPutSecurityRequirementObject0.md | 2 +- .../put/security/PetPutSecurityRequirementObject1.md | 2 +- .../get/PetfindbystatusGetSecurityInfo.md | 2 +- .../PetfindbystatusGetSecurityRequirementObject0.md | 2 +- .../PetfindbystatusGetSecurityRequirementObject1.md | 2 +- .../PetfindbystatusGetSecurityRequirementObject2.md | 2 +- .../petfindbytags/get/PetfindbytagsGetSecurityInfo.md | 2 +- .../PetfindbytagsGetSecurityRequirementObject0.md | 2 +- .../PetfindbytagsGetSecurityRequirementObject1.md | 2 +- .../petpetid/delete/PetpetidDeleteSecurityInfo.md | 2 +- .../PetpetidDeleteSecurityRequirementObject0.md | 2 +- .../PetpetidDeleteSecurityRequirementObject1.md | 2 +- .../paths/petpetid/get/PetpetidGetSecurityInfo.md | 2 +- .../security/PetpetidGetSecurityRequirementObject0.md | 2 +- .../paths/petpetid/post/PetpetidPostSecurityInfo.md | 2 +- .../PetpetidPostSecurityRequirementObject0.md | 2 +- .../PetpetidPostSecurityRequirementObject1.md | 2 +- .../post/PetpetiduploadimagePostSecurityInfo.md | 2 +- ...tpetiduploadimagePostSecurityRequirementObject0.md | 2 +- .../get/StoreinventoryGetSecurityInfo.md | 2 +- .../StoreinventoryGetSecurityRequirementObject0.md | 2 +- .../generatorrunner/DefaultGeneratorRunner.java | 3 ++- .../codegen/generators/DefaultGenerator.java | 8 +++++--- .../CodegenSecurityRequirementObject.java | 11 +++++++++-- .../securityrequirementobjects/SecurityInfoDoc.hbs | 2 +- .../SecurityRequirementObjectNDoc.hbs | 2 +- 42 files changed, 55 insertions(+), 45 deletions(-) diff --git a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md index 9ba3b330f2f..7fe8f7d1151 100644 --- a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeDeleteSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [FakeDeleteSecurityRequirementObject0()](../../../paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md index a81a3833352..af486306c7b 100644 --- a/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fake/delete/security/FakeDeleteSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [BearerTest](../../../../components/securityschemes/BearerTest.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [BearerTest.class](../../../../components/securityschemes/BearerTest.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md index 1f024664d78..a2e745095b2 100644 --- a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakePostSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [FakePostSecurityRequirementObject0()](../../../paths/fake/post/security/FakePostSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md index 1ca63a4ee47..ffe185f4a8a 100644 --- a/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fake/post/security/FakePostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpBasicTest](../../../../components/securityschemes/HttpBasicTest.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpBasicTest.class](../../../../components/securityschemes/HttpBasicTest.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md index c7c670f26d1..941df5cb4eb 100644 --- a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeclassnametestPatchSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [FakeclassnametestPatchSecurityRequirementObject0()](../../../paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md index ad859c3d7d3..74c9bd15fba 100644 --- a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKeyQuery](../../../../components/securityschemes/ApiKeyQuery.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKeyQuery.class](../../../../components/securityschemes/ApiKeyQuery.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md index e28666afdea..514e0b5edab 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakemultiplesecuritiesGetSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new FakemultiplesecuritiesGetSecurityRequirementObject1()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new FakemultiplesecuritiesGetSecurityRequirementObject2())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [FakemultiplesecuritiesGetSecurityRequirementObject0()](../../../paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [FakemultiplesecuritiesGetSecurityRequirementObject1()](../../../paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new [FakemultiplesecuritiesGetSecurityRequirementObject2()](../../../paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md index 93cd351d298..b642d36e8d5 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpBasicTest](../../../../components/securityschemes/HttpBasicTest.md).class,        List.of()    ),    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpBasicTest.class](../../../../components/securityschemes/HttpBasicTest.md),        List.of()    ),    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md index cea7cce87c2..a59e0627a45 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject2.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md index 99055d37309..8f4219b5ea9 100644 --- a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0()](../../../paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md index edd8032ca66..e2e1adb6ae8 100644 --- a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md index ef98ea8c461..5d63c6ddf64 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPostSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPostSecurityRequirementObject1()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetPostSecurityRequirementObject2())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetPostSecurityRequirementObject0()](../../../paths/pet/post/security/PetPostSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [PetPostSecurityRequirementObject1()](../../../paths/pet/post/security/PetPostSecurityRequirementObject1.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new [PetPostSecurityRequirementObject2()](../../../paths/pet/post/security/PetPostSecurityRequirementObject2.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md index b57a2c0d808..34870b66eb6 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md index 5b613caf8f0..1cb682b7915 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest.class](../../../../components/securityschemes/HttpSignatureTest.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md index 2dc5efa17b8..ccb5edf9c7a 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md +++ b/samples/client/petstore/java/docs/paths/pet/post/security/PetPostSecurityRequirementObject2.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md index e98aa18e922..8f1572f8adb 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPutSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPutSecurityRequirementObject1())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetPutSecurityRequirementObject0()](../../../paths/pet/put/security/PetPutSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [PetPutSecurityRequirementObject1()](../../../paths/pet/put/security/PetPutSecurityRequirementObject1.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md index 8d7bf443433..23269a709b1 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest.class](../../../../components/securityschemes/HttpSignatureTest.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md index 592097bdf76..d57a44d83e2 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/pet/put/security/PetPutSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md index 03fc2bba7fb..39f668774fa 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbystatusGetSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbystatusGetSecurityRequirementObject1()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetfindbystatusGetSecurityRequirementObject2())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetfindbystatusGetSecurityRequirementObject0()](../../../paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [PetfindbystatusGetSecurityRequirementObject1()](../../../paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new [PetfindbystatusGetSecurityRequirementObject2()](../../../paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md index ce8f67cd760..a656f810b95 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md index 4f0a08fa368..d505ac57b5b 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest.class](../../../../components/securityschemes/HttpSignatureTest.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md index aca29b8dbe2..38f9d7030cc 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityRequirementObject2.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md index 786c605bc39..b911c8aa230 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbytagsGetSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbytagsGetSecurityRequirementObject1())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetfindbytagsGetSecurityRequirementObject0()](../../../paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [PetfindbytagsGetSecurityRequirementObject1()](../../../paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md index 6cafa8028a2..8cec8cbafe3 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest](../../../../components/securityschemes/HttpSignatureTest.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [HttpSignatureTest.class](../../../../components/securityschemes/HttpSignatureTest.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md index da43d6fd745..003dc335aa8 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/security/PetfindbytagsGetSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md index 0b3b138d7ac..57a396e1617 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidDeleteSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidDeleteSecurityRequirementObject1())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetpetidDeleteSecurityRequirementObject0()](../../../paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [PetpetidDeleteSecurityRequirementObject1()](../../../paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md index dba632bfb96..1bfbaa536d1 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md index 2ec34148a60..70dcf48c967 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/security/PetpetidDeleteSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md index 3a0191f4fb3..4741b0085bf 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidGetSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetpetidGetSecurityRequirementObject0()](../../../paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md index db9b7aa9e1c..6a56d6d61e7 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetid/get/security/PetpetidGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md index c359d24277d..a1de666c6a1 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidPostSecurityRequirementObject0()),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidPostSecurityRequirementObject1())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetpetidPostSecurityRequirementObject0()](../../../paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md),
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new [PetpetidPostSecurityRequirementObject1()](../../../paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md index 37ca20c445c..cd3e742dcd2 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md index 39f7f569128..ad6ba36e84e 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/security/PetpetidPostSecurityRequirementObject1.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md index 23bc601766f..0f30ebbf69a 100644 --- a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetiduploadimagePostSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [PetpetiduploadimagePostSecurityRequirementObject0()](../../../paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md index 60151770b33..e31f5956998 100644 --- a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/security/PetpetiduploadimagePostSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth](../../../../components/securityschemes/PetstoreAuth.md).class,        List.of("write:pets", "read:pets")    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [PetstoreAuth.class](../../../../components/securityschemes/PetstoreAuth.md),        List.of("write:pets", "read:pets")    )) | diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md index ad744b0b02e..60b1ee2442f 100644 --- a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new StoreinventoryGetSecurityRequirementObject0())
)); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new [StoreinventoryGetSecurityRequirementObject0()](../../../paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md)
)); | ### Method Summary | Modifier and Type | Method and Description | diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md b/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md index 6593f13d869..ae36a11c931 100644 --- a/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/security/StoreinventoryGetSecurityRequirementObject0.md @@ -12,4 +12,4 @@ extends SecurityRequirementObject ### Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey](../../../../components/securityschemes/ApiKey.md).class,        List.of()    )) | +| Map, List> | securitySchemeToScopes = Map.ofEntries(    new AbstractMap.SimpleEntry, List>(        [ApiKey.class](../../../../components/securityschemes/ApiKey.md),        List.of()    )) | diff --git a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index 5619327129d..bb87f3e1704 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -1482,8 +1482,9 @@ private void generateSecurity(List files, CodegenList securityTemplateData = new HashMap<>(); securityTemplateData.put("packageName", generator.packageName()); securityTemplateData.put("security", security); - securityTemplateData.put("headerSize", "#"); generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITIES, CodegenConstants.SECURITY, securityTemplateData, true); + securityTemplateData.put("headerSize", "#"); + securityTemplateData.put("docRoot", docRoot); generateXDocs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITIES, CodegenConstants.SECURITY, securityTemplateData, true); int i = 0; diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 22fcbf24e5b..f28913d7f52 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -3022,11 +3022,13 @@ public CodegenList fromSecurity(List { +public class CodegenSecurityRequirementObject extends AbstractMap implements PathFromDocRootProvider { public final TreeSet imports; public final Map map; public final String subpackage; public final CodegenKey jsonPathPiece; + public final String pathFromDocRoot; - public CodegenSecurityRequirementObject(TreeSet imports, Map map, String subpackage, CodegenKey jsonPathPiece) { + public CodegenSecurityRequirementObject(TreeSet imports, Map map, String subpackage, CodegenKey jsonPathPiece, String pathFromDocRoot) { this.imports = imports; this.map = map; this.subpackage = subpackage; this.jsonPathPiece = jsonPathPiece; + this.pathFromDocRoot = pathFromDocRoot; } @Override public Set> entrySet() { return this.map.entrySet(); } + + @Override + public String pathFromDocRoot() { + return pathFromDocRoot; + } } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs index bd9cf32ae0d..ca3682ce571 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs @@ -24,7 +24,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> {{headerSize}}## Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| EnumMap | securities = new EnumMap<>(Map.ofEntries(
{{#each security}}    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}}
{{/each}})); | +| EnumMap | securities = new EnumMap<>(Map.ofEntries(
{{#each security}}    new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new [{{jsonPathPiece.pascalCase}}()]({{docRoot}}{{pathFromDocRoot}}.md){{#unless @last}},{{/unless}}
{{/each}})); | {{headerSize}}## Method Summary | Modifier and Type | Method and Description | diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs index 9f588ba064b..d708426f605 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityRequirementObjectNDoc.hbs @@ -16,4 +16,4 @@ extends SecurityRequirementObject {{headerSize}}## Field Summary | Modifier and Type | Field and Description | | ----------------- | --------------------- | -| Map, List> | securitySchemeToScopes = Map.ofEntries({{#each securityRequirementObject}}    new AbstractMap.SimpleEntry, List>(        [{{refInfo.refClass}}]({{docRoot}}{{refInfo.ref.pathFromDocRoot}}.md).class,        List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})    ){{#unless @last}},{{/unless}}{{/each}}) | +| Map, List> | securitySchemeToScopes = Map.ofEntries({{#each securityRequirementObject}}    new AbstractMap.SimpleEntry, List>(        [{{refInfo.refClass}}.class]({{docRoot}}{{refInfo.ref.pathFromDocRoot}}.md),        List.of({{#each scopeNames}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})    ){{#unless @last}},{{/unless}}{{/each}}) | From ba8d77fa77820a92395b3bd29fd04b56335edd13 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Tue, 26 Mar 2024 14:54:29 -0700 Subject: [PATCH 8/9] Removes getSecurityBuilders --- .../codegen/generators/DefaultGenerator.java | 7 +- .../generators/JavaClientGenerator.java | 88 ------------------- 2 files changed, 1 insertion(+), 94 deletions(-) diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index f28913d7f52..97cda0f9896 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -3035,7 +3035,6 @@ public CodegenList fromSecurity(List> builders = getSecurityBuilders(items, jsonPath); CodegenKey operationInputClass = getKey("SecurityIndex", "misc", jsonPath); String operationInputVariableName = "securityIndex"; String pathFromDocRoot = getPathFromDocRoot(jsonPath); @@ -3043,17 +3042,13 @@ public CodegenList fromSecurity(List> getSecurityBuilders(List items, String jsonPath) { - return null; - } - protected String getPathFromDocRoot(String sourceJsonPath) { String moduleLocation = getModuleLocation(sourceJsonPath); return moduleLocation.replace('.', File.separatorChar).substring(packageName.length()+1); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 2ea069c1667..59eb84f6049 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -3128,94 +3128,6 @@ public void setOpenAPI(OpenAPI openAPI) { } } - protected List> getSecurityBuilders(List items, String jsonPath) { - List> builders = new ArrayList<>(); - if (items.isEmpty()) { - return null; - } - String schemaName = "Securities"; - int qtyBuilders = items.size()+1; - int reqPropsSize = items.size(); - Map> bitStrToBuilder = new HashMap<>(); - List reqPropKeys = new ArrayList<>(); - for (int i=0; i < items.size(); i ++) { - reqPropKeys.add(items.get(i).jsonPathPiece); - } - // builders are built last to first, last builder has build method - /* - 2 -> 3 builders - 2**0 -> 1 10 - 2**1 -> 2 01 - 2**2 -> 4 11 - - 3 -> 4 - 111 7 - 110 6 - 101 5 - 011 3 - - 1 -> 2 builders - 1 - 0 - */ - for (int i=0; i < qtyBuilders; i++) { - String lastBuilderBitStr = "1".repeat(reqPropsSize); - String bitStr; - if (i == qtyBuilders-1) { - bitStr = lastBuilderBitStr; - } else { - bitStr = lastBuilderBitStr.substring(0, i) + "0" - + lastBuilderBitStr.substring(i + 1); - } - CodegenKey builderClassName; - if (i == qtyBuilders - 1) { - // first invoked builder has the simplest name with no bitStr - builderClassName = getKey(schemaName + "Builder", "misc", jsonPath); - } else { - builderClassName = getKey(schemaName + bitStr + "Builder", "misc", jsonPath); - } - MapBuilder builder; - if (i != qtyBuilders-1) { - // final optional builders - LinkedHashMap> keyToBuilder = new LinkedHashMap<>(); - builder = new MapBuilder<>(builderClassName, keyToBuilder); - for (int c=0; c < reqPropsSize; c++) { - if (bitStr.charAt(c) == '1') { - CodegenKey key = reqPropKeys.get(c); - if (key == null) { - throw new RuntimeException("key must exist at c="+c); - } - var pair = new MapBuilder.BuilderPropertyPair<>(builder, items.get(c)); - keyToBuilder.put(key, pair); - } - } - } else { - // first builder with required props - LinkedHashMap> keyToBuilder = new LinkedHashMap<>(); - for (int c=0; c < reqPropsSize; c++) { - if (bitStr.charAt(c) == '1') { - StringBuilder nextBuilderBitStr = new StringBuilder(bitStr); - nextBuilderBitStr.setCharAt(c, '0'); - CodegenKey key = reqPropKeys.get(c); - if (key == null) { - throw new RuntimeException("key must exist at c="+c); - } - MapBuilder nextBuilder = bitStrToBuilder.get(nextBuilderBitStr.toString()); - if (nextBuilder == null) { - throw new RuntimeException("Next builder must exist for bitStr="+ nextBuilderBitStr); - } - var pair = new MapBuilder.BuilderPropertyPair<>(nextBuilder, items.get(c)); - keyToBuilder.put(key, pair); - } - } - builder = new MapBuilder<>(builderClassName, keyToBuilder); - } - bitStrToBuilder.put(bitStr, builder); - builders.add(builder); - } - return builders; - } - @Override public String toSecurityFilename(String basename, String jsonPath) { String[] pathPieces = jsonPath.split("/"); From 5d39655122c640f86144748b5e06ff27db3df8fe Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 27 Mar 2024 12:49:34 -0700 Subject: [PATCH 9/9] Samples regen --- .../fake/delete/FakeDeleteSecurityInfo.md | 2 +- .../paths/fake/post/FakePostSecurityInfo.md | 2 +- .../FakeclassnametestPatchSecurityInfo.md | 2 +- .../FakemultiplesecuritiesGetSecurityInfo.md | 2 +- ...adimagewithrequiredfilePostSecurityInfo.md | 2 +- .../paths/pet/post/PetPostSecurityInfo.md | 2 +- .../docs/paths/pet/put/PetPutSecurityInfo.md | 2 +- .../get/PetfindbystatusGetSecurityInfo.md | 2 +- .../get/PetfindbytagsGetSecurityInfo.md | 2 +- .../delete/PetpetidDeleteSecurityInfo.md | 2 +- .../petpetid/get/PetpetidGetSecurityInfo.md | 2 +- .../petpetid/post/PetpetidPostSecurityInfo.md | 2 +- .../PetpetiduploadimagePostSecurityInfo.md | 2 +- .../get/StoreinventoryGetSecurityInfo.md | 2 +- .../configurations/ApiConfiguration.java | 298 ++++++++++++------ .../fake/delete/FakeDeleteSecurityInfo.java | 10 +- .../paths/fake/post/FakePostSecurityInfo.java | 10 +- .../FakeclassnametestPatchSecurityInfo.java | 10 +- ...FakemultiplesecuritiesGetSecurityInfo.java | 10 +- ...imagewithrequiredfilePostSecurityInfo.java | 10 +- .../paths/pet/post/PetPostSecurityInfo.java | 10 +- .../paths/pet/put/PetPutSecurityInfo.java | 10 +- .../get/PetfindbystatusGetSecurityInfo.java | 10 +- .../get/PetfindbytagsGetSecurityInfo.java | 10 +- .../delete/PetpetidDeleteSecurityInfo.java | 10 +- .../petpetid/get/PetpetidGetSecurityInfo.java | 10 +- .../post/PetpetidPostSecurityInfo.java | 10 +- .../PetpetiduploadimagePostSecurityInfo.java | 10 +- .../get/StoreinventoryGetSecurityInfo.java | 10 +- .../configurations/ApiConfiguration.hbs | 42 ++- .../SecurityInfo.hbs | 10 +- .../SecurityInfoDoc.hbs | 2 +- 32 files changed, 281 insertions(+), 239 deletions(-) diff --git a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md index 7fe8f7d1151..6480bf870bd 100644 --- a/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/delete/FakeDeleteSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| FakeDeleteSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| FakeDeleteSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md index a2e745095b2..95b409d5023 100644 --- a/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fake/post/FakePostSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| FakePostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| FakePostSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md index 941df5cb4eb..2137564e12f 100644 --- a/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| FakeclassnametestPatchSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| FakeclassnametestPatchSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md index 514e0b5edab..202b98244be 100644 --- a/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| FakemultiplesecuritiesGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| FakemultiplesecuritiesGetSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md index 8f4219b5ea9..47cbe85d783 100644 --- a/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| FakepetiduploadimagewithrequiredfilePostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| FakepetiduploadimagewithrequiredfilePostSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md index 5d63c6ddf64..bfcbdaed682 100644 --- a/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/post/PetPostSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetPostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetPostSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md index 8f1572f8adb..1f13f8174c2 100644 --- a/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/pet/put/PetPutSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetPutSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetPutSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md index 39f668774fa..c3cc586c35b 100644 --- a/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetfindbystatusGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetfindbystatusGetSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md index b911c8aa230..9d0ab412696 100644 --- a/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetfindbytagsGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetfindbytagsGetSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md index 57a396e1617..78dca588af1 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/delete/PetpetidDeleteSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetpetidDeleteSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetpetidDeleteSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md index 4741b0085bf..f6403d11468 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/get/PetpetidGetSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetpetidGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetpetidGetSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md index a1de666c6a1..18f25e685bf 100644 --- a/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetid/post/PetpetidPostSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetpetidPostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetpetidPostSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md index 0f30ebbf69a..5c45e3b65b1 100644 --- a/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| PetpetiduploadimagePostSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| PetpetiduploadimagePostSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md index 60b1ee2442f..eca03625ce0 100644 --- a/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md +++ b/samples/client/petstore/java/docs/paths/storeinventory/get/StoreinventoryGetSecurityInfo.md @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> ### Constructor Summary | Constructor and Description | | --------------------------- | -| StoreinventoryGetSecurityInfo1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| StoreinventoryGetSecurityInfo1()
Creates an instance | ### Field Summary | Modifier and Type | Field and Description | diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java index a98d24a2fb6..9b64de10f0c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java @@ -32,34 +32,22 @@ public class ApiConfiguration { private final ServerInfo serverInfo; private final SecurityInfo securityInfo; + private final SecurityIndexInfo securityIndexInfo; private final @Nullable Duration timeout; private final Map, SecurityScheme> securitySchemeInfo; public ApiConfiguration() { serverInfo = new ServerInfo(); - securityInfo = new SecurityInfo( - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null - ); + securityInfo = new SecurityInfo(); + securityIndexInfo = new SecurityIndexInfo(); securitySchemeInfo = new HashMap<>(); timeout = null; } - public ApiConfiguration(ServerInfo serverInfo, SecurityInfo securityInfo, List securitySchemes, Duration timeout) { + public ApiConfiguration(ServerInfo serverInfo, SecurityIndexInfo securityIndexInfo, List securitySchemes, Duration timeout) { this.serverInfo = serverInfo; - this.securityInfo = securityInfo; + this.securityInfo = new SecurityInfo(); + this.securityIndexInfo = securityIndexInfo; securitySchemeInfo = new HashMap<>(); for (SecurityScheme securityScheme: securitySchemes) { securitySchemeInfo.put(securityScheme.getClass(), securityScheme); @@ -100,149 +88,279 @@ public Server getServer(PetfindbystatusServerInfo. @Nullable ServerIndex serverI } public static class SecurityInfo { - protected final @Nullable FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1 fakeDeleteSecurityInfo; - protected final @Nullable FakePostSecurityInfo.FakePostSecurityInfo1 fakePostSecurityInfo; - protected final @Nullable FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1 fakemultiplesecuritiesGetSecurityInfo; - protected final @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1 fakepetiduploadimagewithrequiredfilePostSecurityInfo; - protected final @Nullable FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1 fakeclassnametestPatchSecurityInfo; - protected final @Nullable PetPostSecurityInfo.PetPostSecurityInfo1 petPostSecurityInfo; - protected final @Nullable PetPutSecurityInfo.PetPutSecurityInfo1 petPutSecurityInfo; - protected final @Nullable PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1 petfindbystatusGetSecurityInfo; - protected final @Nullable PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1 petfindbytagsGetSecurityInfo; - protected final @Nullable PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1 petpetidDeleteSecurityInfo; - protected final @Nullable PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1 petpetidGetSecurityInfo; - protected final @Nullable PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1 petpetidPostSecurityInfo; - protected final @Nullable PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1 petpetiduploadimagePostSecurityInfo; - protected final @Nullable StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1 storeinventoryGetSecurityInfo; + protected final FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1 fakeDeleteSecurityInfo; + protected final FakePostSecurityInfo.FakePostSecurityInfo1 fakePostSecurityInfo; + protected final FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1 fakemultiplesecuritiesGetSecurityInfo; + protected final FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1 fakepetiduploadimagewithrequiredfilePostSecurityInfo; + protected final FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1 fakeclassnametestPatchSecurityInfo; + protected final PetPostSecurityInfo.PetPostSecurityInfo1 petPostSecurityInfo; + protected final PetPutSecurityInfo.PetPutSecurityInfo1 petPutSecurityInfo; + protected final PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1 petfindbystatusGetSecurityInfo; + protected final PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1 petfindbytagsGetSecurityInfo; + protected final PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1 petpetidDeleteSecurityInfo; + protected final PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1 petpetidGetSecurityInfo; + protected final PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1 petpetidPostSecurityInfo; + protected final PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1 petpetiduploadimagePostSecurityInfo; + protected final StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1 storeinventoryGetSecurityInfo; - public SecurityInfo( - @Nullable FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1 fakeDeleteSecurityInfo, - @Nullable FakePostSecurityInfo.FakePostSecurityInfo1 fakePostSecurityInfo, - @Nullable FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1 fakemultiplesecuritiesGetSecurityInfo, - @Nullable FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1 fakepetiduploadimagewithrequiredfilePostSecurityInfo, - @Nullable FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1 fakeclassnametestPatchSecurityInfo, - @Nullable PetPostSecurityInfo.PetPostSecurityInfo1 petPostSecurityInfo, - @Nullable PetPutSecurityInfo.PetPutSecurityInfo1 petPutSecurityInfo, - @Nullable PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1 petfindbystatusGetSecurityInfo, - @Nullable PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1 petfindbytagsGetSecurityInfo, - @Nullable PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1 petpetidDeleteSecurityInfo, - @Nullable PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1 petpetidGetSecurityInfo, - @Nullable PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1 petpetidPostSecurityInfo, - @Nullable PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1 petpetiduploadimagePostSecurityInfo, - @Nullable StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1 storeinventoryGetSecurityInfo - ) { - this.fakeDeleteSecurityInfo = fakeDeleteSecurityInfo; - this.fakePostSecurityInfo = fakePostSecurityInfo; - this.fakemultiplesecuritiesGetSecurityInfo = fakemultiplesecuritiesGetSecurityInfo; - this.fakepetiduploadimagewithrequiredfilePostSecurityInfo = fakepetiduploadimagewithrequiredfilePostSecurityInfo; - this.fakeclassnametestPatchSecurityInfo = fakeclassnametestPatchSecurityInfo; - this.petPostSecurityInfo = petPostSecurityInfo; - this.petPutSecurityInfo = petPutSecurityInfo; - this.petfindbystatusGetSecurityInfo = petfindbystatusGetSecurityInfo; - this.petfindbytagsGetSecurityInfo = petfindbytagsGetSecurityInfo; - this.petpetidDeleteSecurityInfo = petpetidDeleteSecurityInfo; - this.petpetidGetSecurityInfo = petpetidGetSecurityInfo; - this.petpetidPostSecurityInfo = petpetidPostSecurityInfo; - this.petpetiduploadimagePostSecurityInfo = petpetiduploadimagePostSecurityInfo; - this.storeinventoryGetSecurityInfo = storeinventoryGetSecurityInfo; + public SecurityInfo() { + this.fakeDeleteSecurityInfo = new FakeDeleteSecurityInfo.FakeDeleteSecurityInfo1(); + this.fakePostSecurityInfo = new FakePostSecurityInfo.FakePostSecurityInfo1(); + this.fakemultiplesecuritiesGetSecurityInfo = new FakemultiplesecuritiesGetSecurityInfo.FakemultiplesecuritiesGetSecurityInfo1(); + this.fakepetiduploadimagewithrequiredfilePostSecurityInfo = new FakepetiduploadimagewithrequiredfilePostSecurityInfo.FakepetiduploadimagewithrequiredfilePostSecurityInfo1(); + this.fakeclassnametestPatchSecurityInfo = new FakeclassnametestPatchSecurityInfo.FakeclassnametestPatchSecurityInfo1(); + this.petPostSecurityInfo = new PetPostSecurityInfo.PetPostSecurityInfo1(); + this.petPutSecurityInfo = new PetPutSecurityInfo.PetPutSecurityInfo1(); + this.petfindbystatusGetSecurityInfo = new PetfindbystatusGetSecurityInfo.PetfindbystatusGetSecurityInfo1(); + this.petfindbytagsGetSecurityInfo = new PetfindbytagsGetSecurityInfo.PetfindbytagsGetSecurityInfo1(); + this.petpetidDeleteSecurityInfo = new PetpetidDeleteSecurityInfo.PetpetidDeleteSecurityInfo1(); + this.petpetidGetSecurityInfo = new PetpetidGetSecurityInfo.PetpetidGetSecurityInfo1(); + this.petpetidPostSecurityInfo = new PetpetidPostSecurityInfo.PetpetidPostSecurityInfo1(); + this.petpetiduploadimagePostSecurityInfo = new PetpetiduploadimagePostSecurityInfo.PetpetiduploadimagePostSecurityInfo1(); + this.storeinventoryGetSecurityInfo = new StoreinventoryGetSecurityInfo.StoreinventoryGetSecurityInfo1(); + } + } + + public static class SecurityIndexInfo { + protected FakeDeleteSecurityInfo. @Nullable SecurityIndex fakeDeleteSecurityInfoSecurityIndex; + protected FakePostSecurityInfo. @Nullable SecurityIndex fakePostSecurityInfoSecurityIndex; + protected FakemultiplesecuritiesGetSecurityInfo. @Nullable SecurityIndex fakemultiplesecuritiesGetSecurityInfoSecurityIndex; + protected FakepetiduploadimagewithrequiredfilePostSecurityInfo. @Nullable SecurityIndex fakepetiduploadimagewithrequiredfilePostSecurityInfoSecurityIndex; + protected FakeclassnametestPatchSecurityInfo. @Nullable SecurityIndex fakeclassnametestPatchSecurityInfoSecurityIndex; + protected PetPostSecurityInfo. @Nullable SecurityIndex petPostSecurityInfoSecurityIndex; + protected PetPutSecurityInfo. @Nullable SecurityIndex petPutSecurityInfoSecurityIndex; + protected PetfindbystatusGetSecurityInfo. @Nullable SecurityIndex petfindbystatusGetSecurityInfoSecurityIndex; + protected PetfindbytagsGetSecurityInfo. @Nullable SecurityIndex petfindbytagsGetSecurityInfoSecurityIndex; + protected PetpetidDeleteSecurityInfo. @Nullable SecurityIndex petpetidDeleteSecurityInfoSecurityIndex; + protected PetpetidGetSecurityInfo. @Nullable SecurityIndex petpetidGetSecurityInfoSecurityIndex; + protected PetpetidPostSecurityInfo. @Nullable SecurityIndex petpetidPostSecurityInfoSecurityIndex; + protected PetpetiduploadimagePostSecurityInfo. @Nullable SecurityIndex petpetiduploadimagePostSecurityInfoSecurityIndex; + protected StoreinventoryGetSecurityInfo. @Nullable SecurityIndex storeinventoryGetSecurityInfoSecurityIndex; + + public SecurityIndexInfo() {} + + public SecurityIndexInfo fakeDeleteSecurityInfoSecurityIndex(FakeDeleteSecurityInfo.SecurityIndex securityIndex) { + this.fakeDeleteSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo fakePostSecurityInfoSecurityIndex(FakePostSecurityInfo.SecurityIndex securityIndex) { + this.fakePostSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo fakemultiplesecuritiesGetSecurityInfoSecurityIndex(FakemultiplesecuritiesGetSecurityInfo.SecurityIndex securityIndex) { + this.fakemultiplesecuritiesGetSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo fakepetiduploadimagewithrequiredfilePostSecurityInfoSecurityIndex(FakepetiduploadimagewithrequiredfilePostSecurityInfo.SecurityIndex securityIndex) { + this.fakepetiduploadimagewithrequiredfilePostSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo fakeclassnametestPatchSecurityInfoSecurityIndex(FakeclassnametestPatchSecurityInfo.SecurityIndex securityIndex) { + this.fakeclassnametestPatchSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petPostSecurityInfoSecurityIndex(PetPostSecurityInfo.SecurityIndex securityIndex) { + this.petPostSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petPutSecurityInfoSecurityIndex(PetPutSecurityInfo.SecurityIndex securityIndex) { + this.petPutSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petfindbystatusGetSecurityInfoSecurityIndex(PetfindbystatusGetSecurityInfo.SecurityIndex securityIndex) { + this.petfindbystatusGetSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petfindbytagsGetSecurityInfoSecurityIndex(PetfindbytagsGetSecurityInfo.SecurityIndex securityIndex) { + this.petfindbytagsGetSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petpetidDeleteSecurityInfoSecurityIndex(PetpetidDeleteSecurityInfo.SecurityIndex securityIndex) { + this.petpetidDeleteSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petpetidGetSecurityInfoSecurityIndex(PetpetidGetSecurityInfo.SecurityIndex securityIndex) { + this.petpetidGetSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petpetidPostSecurityInfoSecurityIndex(PetpetidPostSecurityInfo.SecurityIndex securityIndex) { + this.petpetidPostSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo petpetiduploadimagePostSecurityInfoSecurityIndex(PetpetiduploadimagePostSecurityInfo.SecurityIndex securityIndex) { + this.petpetiduploadimagePostSecurityInfoSecurityIndex = securityIndex; + return this; + } + + public SecurityIndexInfo storeinventoryGetSecurityInfoSecurityIndex(StoreinventoryGetSecurityInfo.SecurityIndex securityIndex) { + this.storeinventoryGetSecurityInfoSecurityIndex = securityIndex; + return this; } } public SecurityRequirementObject getSecurityRequirementObject(FakeDeleteSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.fakeDeleteSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakeDeleteSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + FakeDeleteSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.fakeDeleteSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("fakeDeleteSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(FakePostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.fakePostSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakePostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + FakePostSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.fakePostSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("fakePostSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(FakemultiplesecuritiesGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.fakemultiplesecuritiesGetSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakemultiplesecuritiesGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + FakemultiplesecuritiesGetSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.fakemultiplesecuritiesGetSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("fakemultiplesecuritiesGetSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(FakepetiduploadimagewithrequiredfilePostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.fakepetiduploadimagewithrequiredfilePostSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakepetiduploadimagewithrequiredfilePostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + FakepetiduploadimagewithrequiredfilePostSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.fakepetiduploadimagewithrequiredfilePostSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("fakepetiduploadimagewithrequiredfilePostSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(FakeclassnametestPatchSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.fakeclassnametestPatchSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the FakeclassnametestPatchSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + FakeclassnametestPatchSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.fakeclassnametestPatchSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("fakeclassnametestPatchSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetPostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petPostSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetPostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetPostSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petPostSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petPostSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetPutSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petPutSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetPutSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetPutSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petPutSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petPutSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetfindbystatusGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petfindbystatusGetSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetfindbystatusGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetfindbystatusGetSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petfindbystatusGetSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petfindbystatusGetSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetfindbytagsGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petfindbytagsGetSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetfindbytagsGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetfindbytagsGetSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petfindbytagsGetSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petfindbytagsGetSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetpetidDeleteSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petpetidDeleteSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetidDeleteSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetpetidDeleteSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petpetidDeleteSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petpetidDeleteSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetpetidGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petpetidGetSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetidGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetpetidGetSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petpetidGetSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petpetidGetSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetpetidPostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petpetidPostSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetidPostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetpetidPostSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petpetidPostSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petpetidPostSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(PetpetiduploadimagePostSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.petpetiduploadimagePostSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the PetpetiduploadimagePostSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + PetpetiduploadimagePostSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.petpetiduploadimagePostSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("petpetiduploadimagePostSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } public SecurityRequirementObject getSecurityRequirementObject(StoreinventoryGetSecurityInfo. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.storeinventoryGetSecurityInfo; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the StoreinventoryGetSecurityInfo is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + StoreinventoryGetSecurityInfo. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.storeinventoryGetSecurityInfoSecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("storeinventoryGetSecurityInfoSecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java index 7f2272c18ce..143eff49895 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/FakeDeleteSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.fake.delete.security.FakeDeleteSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class FakeDeleteSecurityInfo { public static class FakeDeleteSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public FakeDeleteSecurityInfo1(SecurityIndex securityIndex) { + public FakeDeleteSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeDeleteSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java index 56431a133ef..feaf2d3706d 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/FakePostSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.fake.post.security.FakePostSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class FakePostSecurityInfo { public static class FakePostSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public FakePostSecurityInfo1(SecurityIndex securityIndex) { + public FakePostSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakePostSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java index 30c221633e1..3d2274ab9ac 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/FakeclassnametestPatchSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.fakeclassnametest.patch.security.FakeclassnametestPatchSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class FakeclassnametestPatchSecurityInfo { public static class FakeclassnametestPatchSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public FakeclassnametestPatchSecurityInfo1(SecurityIndex securityIndex) { + public FakeclassnametestPatchSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakeclassnametestPatchSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java index 3bf2fad80fa..0a641952eca 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/FakemultiplesecuritiesGetSecurityInfo.java @@ -5,7 +5,6 @@ import org.openapijsonschematools.client.paths.fakemultiplesecurities.get.security.FakemultiplesecuritiesGetSecurityRequirementObject2; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -14,21 +13,16 @@ public class FakemultiplesecuritiesGetSecurityInfo { public static class FakemultiplesecuritiesGetSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public FakemultiplesecuritiesGetSecurityInfo1(SecurityIndex securityIndex) { + public FakemultiplesecuritiesGetSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakemultiplesecuritiesGetSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new FakemultiplesecuritiesGetSecurityRequirementObject1()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new FakemultiplesecuritiesGetSecurityRequirementObject2()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java index 8fded7e9be5..c06bb045cf8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.fakepetiduploadimagewithrequiredfile.post.security.FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class FakepetiduploadimagewithrequiredfilePostSecurityInfo { public static class FakepetiduploadimagewithrequiredfilePostSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public FakepetiduploadimagewithrequiredfilePostSecurityInfo1(SecurityIndex securityIndex) { + public FakepetiduploadimagewithrequiredfilePostSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java index dd927f88b03..33c0fb012db 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/PetPostSecurityInfo.java @@ -5,7 +5,6 @@ import org.openapijsonschematools.client.paths.pet.post.security.PetPostSecurityRequirementObject2; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -14,21 +13,16 @@ public class PetPostSecurityInfo { public static class PetPostSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetPostSecurityInfo1(SecurityIndex securityIndex) { + public PetPostSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPostSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPostSecurityRequirementObject1()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetPostSecurityRequirementObject2()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java index e5ba0e58e93..a8276f457ba 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/PetPutSecurityInfo.java @@ -4,7 +4,6 @@ import org.openapijsonschematools.client.paths.pet.put.security.PetPutSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -13,20 +12,15 @@ public class PetPutSecurityInfo { public static class PetPutSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetPutSecurityInfo1(SecurityIndex securityIndex) { + public PetPutSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetPutSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetPutSecurityRequirementObject1()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java index 54cb3228eb9..feb7a695ede 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/PetfindbystatusGetSecurityInfo.java @@ -5,7 +5,6 @@ import org.openapijsonschematools.client.paths.petfindbystatus.get.security.PetfindbystatusGetSecurityRequirementObject2; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -14,21 +13,16 @@ public class PetfindbystatusGetSecurityInfo { public static class PetfindbystatusGetSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetfindbystatusGetSecurityInfo1(SecurityIndex securityIndex) { + public PetfindbystatusGetSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbystatusGetSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbystatusGetSecurityRequirementObject1()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, new PetfindbystatusGetSecurityRequirementObject2()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java index 0ace3a65ba1..7005499fb3e 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbytags/get/PetfindbytagsGetSecurityInfo.java @@ -4,7 +4,6 @@ import org.openapijsonschematools.client.paths.petfindbytags.get.security.PetfindbytagsGetSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -13,20 +12,15 @@ public class PetfindbytagsGetSecurityInfo { public static class PetfindbytagsGetSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetfindbytagsGetSecurityInfo1(SecurityIndex securityIndex) { + public PetfindbytagsGetSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetfindbytagsGetSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetfindbytagsGetSecurityRequirementObject1()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java index 47c182ba029..c71ee0107bc 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/PetpetidDeleteSecurityInfo.java @@ -4,7 +4,6 @@ import org.openapijsonschematools.client.paths.petpetid.delete.security.PetpetidDeleteSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -13,20 +12,15 @@ public class PetpetidDeleteSecurityInfo { public static class PetpetidDeleteSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetpetidDeleteSecurityInfo1(SecurityIndex securityIndex) { + public PetpetidDeleteSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidDeleteSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidDeleteSecurityRequirementObject1()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java index 9a837402745..ea5c2dfa9c2 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/PetpetidGetSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.petpetid.get.security.PetpetidGetSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class PetpetidGetSecurityInfo { public static class PetpetidGetSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetpetidGetSecurityInfo1(SecurityIndex securityIndex) { + public PetpetidGetSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidGetSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java index 34d16945400..192ccc51c6c 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/PetpetidPostSecurityInfo.java @@ -4,7 +4,6 @@ import org.openapijsonschematools.client.paths.petpetid.post.security.PetpetidPostSecurityRequirementObject1; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -13,20 +12,15 @@ public class PetpetidPostSecurityInfo { public static class PetpetidPostSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetpetidPostSecurityInfo1(SecurityIndex securityIndex) { + public PetpetidPostSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetidPostSecurityRequirementObject0()), new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, new PetpetidPostSecurityRequirementObject1()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java index 21d045fa9d0..1ec53a24fb0 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/PetpetiduploadimagePostSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.petpetiduploadimage.post.security.PetpetiduploadimagePostSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class PetpetiduploadimagePostSecurityInfo { public static class PetpetiduploadimagePostSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public PetpetiduploadimagePostSecurityInfo1(SecurityIndex securityIndex) { + public PetpetiduploadimagePostSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new PetpetiduploadimagePostSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java index d8d591ec4cd..c263a4e51f8 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/storeinventory/get/StoreinventoryGetSecurityInfo.java @@ -3,7 +3,6 @@ import org.openapijsonschematools.client.paths.storeinventory.get.security.StoreinventoryGetSecurityRequirementObject0; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObject; import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -12,19 +11,14 @@ public class StoreinventoryGetSecurityInfo { public static class StoreinventoryGetSecurityInfo1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public StoreinventoryGetSecurityInfo1(SecurityIndex securityIndex) { + public StoreinventoryGetSecurityInfo1() { this.securities = new EnumMap<>(Map.ofEntries( new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, new StoreinventoryGetSecurityRequirementObject0()) )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs index 4c752bfb97e..e04da96ade5 100644 --- a/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs +++ b/src/main/resources/java/src/main/java/packagename/configurations/ApiConfiguration.hbs @@ -34,6 +34,7 @@ public class ApiConfiguration { private final ServerInfo serverInfo; {{#gt allSecurity.size 0}} private final SecurityInfo securityInfo; + private final SecurityIndexInfo securityIndexInfo; {{/gt}} private final @Nullable Duration timeout; {{#if securitySchemes}} @@ -43,11 +44,8 @@ public class ApiConfiguration { public ApiConfiguration() { serverInfo = new ServerInfo(); {{#gt allSecurity.size 0}} - securityInfo = new SecurityInfo( - {{#each allSecurity}} - null{{#unless @last}},{{/unless}} - {{/each}} - ); + securityInfo = new SecurityInfo(); + securityIndexInfo = new SecurityIndexInfo(); {{/gt}} {{#if securitySchemes}} securitySchemeInfo = new HashMap<>(); @@ -55,10 +53,11 @@ public class ApiConfiguration { timeout = null; } - public ApiConfiguration(ServerInfo serverInfo{{#gt allSecurity.size 0}}, SecurityInfo securityInfo{{/gt}}{{#if securitySchemes}}, List securitySchemes{{/if}}, Duration timeout) { + public ApiConfiguration(ServerInfo serverInfo{{#gt allSecurity.size 0}}, SecurityIndexInfo securityIndexInfo{{/gt}}{{#if securitySchemes}}, List securitySchemes{{/if}}, Duration timeout) { this.serverInfo = serverInfo; {{#gt allSecurity.size 0}} - this.securityInfo = securityInfo; + this.securityInfo = new SecurityInfo(); + this.securityIndexInfo = securityIndexInfo; {{/gt}} {{#if securitySchemes}} securitySchemeInfo = new HashMap<>(); @@ -100,25 +99,40 @@ public class ApiConfiguration { public static class SecurityInfo { {{#each allSecurity}} - protected final @Nullable {{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1 {{jsonPathPiece.camelCase}}; + protected final {{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1 {{jsonPathPiece.camelCase}}; {{/each}} - public SecurityInfo( + public SecurityInfo() { {{#each allSecurity}} - @Nullable {{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1 {{jsonPathPiece.camelCase}}{{#unless @last}},{{/unless}} + this.{{jsonPathPiece.camelCase}} = new {{jsonPathPiece.pascalCase}}.{{jsonPathPiece.pascalCase}}1(); {{/each}} - ) { + } + } + + public static class SecurityIndexInfo { {{#each allSecurity}} - this.{{jsonPathPiece.camelCase}} = {{jsonPathPiece.camelCase}}; + protected {{jsonPathPiece.pascalCase}}. @Nullable SecurityIndex {{jsonPathPiece.camelCase}}SecurityIndex; {{/each}} + + public SecurityIndexInfo() {} + {{#each allSecurity}} + + public SecurityIndexInfo {{jsonPathPiece.camelCase}}SecurityIndex({{jsonPathPiece.pascalCase}}.SecurityIndex securityIndex) { + this.{{jsonPathPiece.camelCase}}SecurityIndex = securityIndex; + return this; } + {{/each}} } {{#each allSecurity}} public SecurityRequirementObject getSecurityRequirementObject({{jsonPathPiece.pascalCase}}. @Nullable SecurityIndex securityIndex) throws UnsetPropertyException { var securityInfoInstance = securityInfo.{{jsonPathPiece.camelCase}}; - if (securityInfoInstance == null) { - throw new UnsetPropertyException("SecurityRequirementObject cannot be returned because the {{jsonPathPiece.pascalCase}} is unset in the SecurityInfo class. Pass it in when instantiating SecurityInfo to fix this."); + if (securityIndex == null) { + {{jsonPathPiece.pascalCase}}. @Nullable SecurityIndex configSecurityIndex = securityIndexInfo.{{jsonPathPiece.camelCase}}SecurityIndex; + if (configSecurityIndex == null) { + throw new UnsetPropertyException("{{jsonPathPiece.camelCase}}SecurityIndex is unset"); + } + return securityInfoInstance.getSecurityRequirementObject(configSecurityIndex); } return securityInfoInstance.getSecurityRequirementObject(securityIndex); } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs index 454ba322ca6..f1c02226030 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfo.hbs @@ -9,7 +9,6 @@ import {{{packageName}}}.{{subpackage}}.{{jsonPathPiece.pascalCase}}; {{/each}} import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObject; import {{{packageName}}}.securityrequirementobjects.SecurityRequirementObjectProvider; -import org.checkerframework.checker.nullness.qual.Nullable; import java.util.AbstractMap; import java.util.Map; @@ -18,21 +17,16 @@ import java.util.EnumMap; public class {{security.jsonPathPiece.pascalCase}} { public static class {{security.jsonPathPiece.pascalCase}}1 implements SecurityRequirementObjectProvider { final public EnumMap securities; - final private SecurityIndex securityIndex; - public {{security.jsonPathPiece.pascalCase}}1(SecurityIndex securityIndex) { + public {{security.jsonPathPiece.pascalCase}}1() { this.securities = new EnumMap<>(Map.ofEntries( {{#each security}} new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_{{@index}}, new {{jsonPathPiece.pascalCase}}()){{#unless @last}},{{/unless}} {{/each}} )); - this.securityIndex = securityIndex; } - public SecurityRequirementObject getSecurityRequirementObject(@Nullable SecurityIndex securityIndex) { - if (securityIndex == null) { - return securities.get(this.securityIndex); - } + public SecurityRequirementObject getSecurityRequirementObject(SecurityIndex securityIndex) { return securities.get(securityIndex); } } diff --git a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs index ca3682ce571..e00203f3313 100644 --- a/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs +++ b/src/main/resources/java/src/main/java/packagename/securityrequirementobjects/SecurityInfoDoc.hbs @@ -19,7 +19,7 @@ implements SecurityRequirementObjectProvider<[SecurityIndex](#securityindex)> {{headerSize}}## Constructor Summary | Constructor and Description | | --------------------------- | -| {{security.jsonPathPiece.pascalCase}}1([SecurityIndex](#securityindex) securityIndex)
Creates an instance | +| {{security.jsonPathPiece.pascalCase}}1()
Creates an instance | {{headerSize}}## Field Summary | Modifier and Type | Field and Description |