Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 1483928

Browse files
spacetherspacether
committed
Updates SecurityInfo class to contain a sealed interface, uses it in builder
1 parent d8123bf commit 1483928

19 files changed

Lines changed: 76 additions & 221 deletions

File tree

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class ApiConfiguration {
1212
private final ServerInfo serverInfo;
13-
private final SecurityInfo securityInfo;
13+
// private final SecurityInfo securityInfo;
1414

1515
public ApiConfiguration() {
1616
serverInfo = new ServerInfo();

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/security/FakeDeleteSecurityInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public FakeDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex
1919
}
2020

2121
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
22+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2323

24-
public Securities(FakeDeleteSecurityRequirementObject0 security0) {
24+
public Securities(IndexedSecurityRequirementObject security0) {
2525
securities = new EnumMap<>(
2626
Map.ofEntries(
2727
new AbstractMap.SimpleEntry<>(
@@ -32,7 +32,7 @@ public Securities(FakeDeleteSecurityRequirementObject0 security0) {
3232
);
3333
}
3434

35-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
35+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
3636
if (securities.containsKey(securityIndex)) {
3737
return get(securityIndex);
3838
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/post/security/FakePostSecurityInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public FakePostSecurityInfo(Securities securities, SecurityIndex securityIndex)
1919
}
2020

2121
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
22+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2323

24-
public Securities(FakePostSecurityRequirementObject0 security0) {
24+
public Securities(IndexedSecurityRequirementObject security0) {
2525
securities = new EnumMap<>(
2626
Map.ofEntries(
2727
new AbstractMap.SimpleEntry<>(
@@ -32,7 +32,7 @@ public Securities(FakePostSecurityRequirementObject0 security0) {
3232
);
3333
}
3434

35-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
35+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
3636
if (securities.containsKey(securityIndex)) {
3737
return get(securityIndex);
3838
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakeclassnametest/patch/security/FakeclassnametestPatchSecurityInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public FakeclassnametestPatchSecurityInfo(Securities securities, SecurityIndex s
1919
}
2020

2121
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
22+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2323

24-
public Securities(FakeclassnametestPatchSecurityRequirementObject0 security0) {
24+
public Securities(IndexedSecurityRequirementObject security0) {
2525
securities = new EnumMap<>(
2626
Map.ofEntries(
2727
new AbstractMap.SimpleEntry<>(
@@ -32,7 +32,7 @@ public Securities(FakeclassnametestPatchSecurityRequirementObject0 security0) {
3232
);
3333
}
3434

35-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
35+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
3636
if (securities.containsKey(securityIndex)) {
3737
return get(securityIndex);
3838
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityInfo.java‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
66
import org.checkerframework.checker.nullness.qual.Nullable;
77

8-
import java.util.AbstractMap;
98
import java.util.Map;
109
import java.util.EnumMap;
1110

@@ -19,38 +18,16 @@ public FakemultiplesecuritiesGetSecurityInfo(Securities securities, SecurityInde
1918
}
2019

2120
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
21+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2322

24-
public Securities(FakemultiplesecuritiesGetSecurityRequirementObject0 security0) {
25-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
26-
}
27-
public Securities(FakemultiplesecuritiesGetSecurityRequirementObject1 security1) {
28-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
29-
}
30-
public Securities(FakemultiplesecuritiesGetSecurityRequirementObject2 security2) {
31-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_2, security2));
32-
}
33-
public Securities(
34-
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject0 security0,
35-
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject1 security1,
36-
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject2 security2
37-
) {
38-
securities = new EnumMap<>(SecurityRequirementObject.class);
39-
if (security0 != null) {
40-
securities.put(SecurityIndex.SECURITY_0, security0);
41-
}
42-
if (security1 != null) {
43-
securities.put(SecurityIndex.SECURITY_1, security1);
44-
}
45-
if (security2 != null) {
46-
securities.put(SecurityIndex.SECURITY_2, security2);
47-
}
48-
if (securities.isEmpty()) {
49-
throw new RuntimeException("Invalid empty input for securities, set at least one of them;");
23+
public Securities(IndexedSecurityRequirementObject setSecurity, IndexedSecurityRequirementObject... otherSecurities) {
24+
securities = new EnumMap<>(Map.of(setSecurity.getIndex(), setSecurity));
25+
for (IndexedSecurityRequirementObject sro: otherSecurities) {
26+
securities.put(sro.getIndex(), sro);
5027
}
5128
}
5229

53-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
5431
if (securities.containsKey(securityIndex)) {
5532
return get(securityIndex);
5633
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakemultiplesecurities/get/security/FakemultiplesecuritiesGetSecurityRequirementObject0.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.openapijsonschematools.client.securityrequirementobjects.EmptySecurityRequirementObject;
44

5-
public class extends EmptySecurityRequirementObject implements FakemultiplesecuritiesGetSecurityInfo.IndexedSecurityRequirementObject {
5+
public final class FakemultiplesecuritiesGetSecurityRequirementObject0 extends EmptySecurityRequirementObject implements FakemultiplesecuritiesGetSecurityInfo.IndexedSecurityRequirementObject {
66
public FakemultiplesecuritiesGetSecurityInfo.SecurityIndex getIndex() {
77
return FakemultiplesecuritiesGetSecurityInfo.SecurityIndex.SECURITY_0;
88
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/security/FakepetiduploadimagewithrequiredfilePostSecurityInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public FakepetiduploadimagewithrequiredfilePostSecurityInfo(Securities securitie
1919
}
2020

2121
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
22+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2323

24-
public Securities(FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 security0) {
24+
public Securities(IndexedSecurityRequirementObject security0) {
2525
securities = new EnumMap<>(
2626
Map.ofEntries(
2727
new AbstractMap.SimpleEntry<>(
@@ -32,7 +32,7 @@ public Securities(FakepetiduploadimagewithrequiredfilePostSecurityRequirementObj
3232
);
3333
}
3434

35-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
35+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
3636
if (securities.containsKey(securityIndex)) {
3737
return get(securityIndex);
3838
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/post/security/PetPostSecurityInfo.java‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
66
import org.checkerframework.checker.nullness.qual.Nullable;
77

8-
import java.util.AbstractMap;
98
import java.util.Map;
109
import java.util.EnumMap;
1110

@@ -19,38 +18,16 @@ public PetPostSecurityInfo(Securities securities, SecurityIndex securityIndex) {
1918
}
2019

2120
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
21+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2322

24-
public Securities(PetPostSecurityRequirementObject0 security0) {
25-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
26-
}
27-
public Securities(PetPostSecurityRequirementObject1 security1) {
28-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
29-
}
30-
public Securities(PetPostSecurityRequirementObject2 security2) {
31-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_2, security2));
32-
}
33-
public Securities(
34-
@Nullable PetPostSecurityRequirementObject0 security0,
35-
@Nullable PetPostSecurityRequirementObject1 security1,
36-
@Nullable PetPostSecurityRequirementObject2 security2
37-
) {
38-
securities = new EnumMap<>(SecurityRequirementObject.class);
39-
if (security0 != null) {
40-
securities.put(SecurityIndex.SECURITY_0, security0);
41-
}
42-
if (security1 != null) {
43-
securities.put(SecurityIndex.SECURITY_1, security1);
44-
}
45-
if (security2 != null) {
46-
securities.put(SecurityIndex.SECURITY_2, security2);
47-
}
48-
if (securities.isEmpty()) {
49-
throw new RuntimeException("Invalid empty input for securities, set at least one of them;");
23+
public Securities(IndexedSecurityRequirementObject setSecurity, IndexedSecurityRequirementObject... otherSecurities) {
24+
securities = new EnumMap<>(Map.of(setSecurity.getIndex(), setSecurity));
25+
for (IndexedSecurityRequirementObject sro: otherSecurities) {
26+
securities.put(sro.getIndex(), sro);
5027
}
5128
}
5229

53-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
5431
if (securities.containsKey(securityIndex)) {
5532
return get(securityIndex);
5633
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/pet/put/security/PetPutSecurityInfo.java‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
66
import org.checkerframework.checker.nullness.qual.Nullable;
77

8-
import java.util.AbstractMap;
98
import java.util.Map;
109
import java.util.EnumMap;
1110

@@ -19,31 +18,16 @@ public PetPutSecurityInfo(Securities securities, SecurityIndex securityIndex) {
1918
}
2019

2120
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
21+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2322

24-
public Securities(PetPutSecurityRequirementObject0 security0) {
25-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
26-
}
27-
public Securities(PetPutSecurityRequirementObject1 security1) {
28-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
29-
}
30-
public Securities(
31-
@Nullable PetPutSecurityRequirementObject0 security0,
32-
@Nullable PetPutSecurityRequirementObject1 security1
33-
) {
34-
securities = new EnumMap<>(SecurityRequirementObject.class);
35-
if (security0 != null) {
36-
securities.put(SecurityIndex.SECURITY_0, security0);
37-
}
38-
if (security1 != null) {
39-
securities.put(SecurityIndex.SECURITY_1, security1);
40-
}
41-
if (securities.isEmpty()) {
42-
throw new RuntimeException("Invalid empty input for securities, set at least one of them;");
23+
public Securities(IndexedSecurityRequirementObject setSecurity, IndexedSecurityRequirementObject... otherSecurities) {
24+
securities = new EnumMap<>(Map.of(setSecurity.getIndex(), setSecurity));
25+
for (IndexedSecurityRequirementObject sro: otherSecurities) {
26+
securities.put(sro.getIndex(), sro);
4327
}
4428
}
4529

46-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
4731
if (securities.containsKey(securityIndex)) {
4832
return get(securityIndex);
4933
}

‎samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/petfindbystatus/get/security/PetfindbystatusGetSecurityInfo.java‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
66
import org.checkerframework.checker.nullness.qual.Nullable;
77

8-
import java.util.AbstractMap;
98
import java.util.Map;
109
import java.util.EnumMap;
1110

@@ -19,38 +18,16 @@ public PetfindbystatusGetSecurityInfo(Securities securities, SecurityIndex secur
1918
}
2019

2120
public static class Securities {
22-
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
21+
private final EnumMap<SecurityIndex, IndexedSecurityRequirementObject> securities;
2322

24-
public Securities(PetfindbystatusGetSecurityRequirementObject0 security0) {
25-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
26-
}
27-
public Securities(PetfindbystatusGetSecurityRequirementObject1 security1) {
28-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
29-
}
30-
public Securities(PetfindbystatusGetSecurityRequirementObject2 security2) {
31-
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_2, security2));
32-
}
33-
public Securities(
34-
@Nullable PetfindbystatusGetSecurityRequirementObject0 security0,
35-
@Nullable PetfindbystatusGetSecurityRequirementObject1 security1,
36-
@Nullable PetfindbystatusGetSecurityRequirementObject2 security2
37-
) {
38-
securities = new EnumMap<>(SecurityRequirementObject.class);
39-
if (security0 != null) {
40-
securities.put(SecurityIndex.SECURITY_0, security0);
41-
}
42-
if (security1 != null) {
43-
securities.put(SecurityIndex.SECURITY_1, security1);
44-
}
45-
if (security2 != null) {
46-
securities.put(SecurityIndex.SECURITY_2, security2);
47-
}
48-
if (securities.isEmpty()) {
49-
throw new RuntimeException("Invalid empty input for securities, set at least one of them;");
23+
public Securities(IndexedSecurityRequirementObject setSecurity, IndexedSecurityRequirementObject... otherSecurities) {
24+
securities = new EnumMap<>(Map.of(setSecurity.getIndex(), setSecurity));
25+
for (IndexedSecurityRequirementObject sro: otherSecurities) {
26+
securities.put(sro.getIndex(), sro);
5027
}
5128
}
5229

53-
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30+
public IndexedSecurityRequirementObject get(SecurityIndex securityIndex) {
5431
if (securities.containsKey(securityIndex)) {
5532
return get(securityIndex);
5633
}

0 commit comments

Comments
 (0)