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

Commit e1ca80e

Browse files
spacetherspacether
committed
Updates SecurityInfo template
1 parent 0c8417b commit e1ca80e

File tree

19 files changed

+317
-121
lines changed

19 files changed

+317
-121
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import org.checkerframework.checker.nullness.qual.Nullable;
88

99
import java.util.AbstractMap;
10-
import java.util.Map;
10+
import java.util.HashMap;
11+
import java.util.EnumMap;
12+
import java.util.stream.Stream;
1113
import java.util.EnumMap;
1214

1315
public class FakeDeleteSecurityInfo implements SecurityRequirementObjectProvider<FakeDeleteSecurityInfo.SecurityIndex> {
@@ -20,10 +22,10 @@ public FakeDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex
2022
}
2123

2224
public static class Securities {
23-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
25+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2426

2527
public Securities(
26-
@Nullable FakeDeleteSecurityRequirementObject0 security0
28+
FakeDeleteSecurityRequirementObject0 security0
2729
) {
2830
securities = new EnumMap<>(
2931
Map.ofEntries(
@@ -36,11 +38,10 @@ public Securities(
3638
}
3739

3840
public SecurityRequirementObject get(SecurityIndex securityIndex) {
39-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
40-
if (securityRequirementObject == null) {
41-
throw new UnsetPropertyException(securityIndex+" is unset");
41+
if (securities.containsKey(securityIndex)) {
42+
return get(securityIndex);
4243
}
43-
return securityRequirementObject;
44+
throw new UnsetPropertyException(securityIndex+" is unset");
4445
}
4546
}
4647

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import org.checkerframework.checker.nullness.qual.Nullable;
88

99
import java.util.AbstractMap;
10-
import java.util.Map;
10+
import java.util.HashMap;
11+
import java.util.EnumMap;
12+
import java.util.stream.Stream;
1113
import java.util.EnumMap;
1214

1315
public class FakePostSecurityInfo implements SecurityRequirementObjectProvider<FakePostSecurityInfo.SecurityIndex> {
@@ -20,10 +22,10 @@ public FakePostSecurityInfo(Securities securities, SecurityIndex securityIndex)
2022
}
2123

2224
public static class Securities {
23-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
25+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2426

2527
public Securities(
26-
@Nullable FakePostSecurityRequirementObject0 security0
28+
FakePostSecurityRequirementObject0 security0
2729
) {
2830
securities = new EnumMap<>(
2931
Map.ofEntries(
@@ -36,11 +38,10 @@ public Securities(
3638
}
3739

3840
public SecurityRequirementObject get(SecurityIndex securityIndex) {
39-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
40-
if (securityRequirementObject == null) {
41-
throw new UnsetPropertyException(securityIndex+" is unset");
41+
if (securities.containsKey(securityIndex)) {
42+
return get(securityIndex);
4243
}
43-
return securityRequirementObject;
44+
throw new UnsetPropertyException(securityIndex+" is unset");
4445
}
4546
}
4647

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public FakeclassnametestPatchSecurityInfo(Securities securities, SecurityIndex s
2020
}
2121

2222
public static class Securities {
23-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
23+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2424

2525
public Securities(
2626
@Nullable FakeclassnametestPatchSecurityRequirementObject0 security0
@@ -36,11 +36,10 @@ public Securities(
3636
}
3737

3838
public SecurityRequirementObject get(SecurityIndex securityIndex) {
39-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
40-
if (securityRequirementObject == null) {
41-
throw new UnsetPropertyException(securityIndex+" is unset");
39+
if (securities.containsKey(securityIndex)) {
40+
return get(securityIndex);
4241
}
43-
return securityRequirementObject;
42+
throw new UnsetPropertyException(securityIndex+" is unset");
4443
}
4544
}
4645

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

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,56 @@ public FakemultiplesecuritiesGetSecurityInfo(Securities securities, SecurityInde
2222
}
2323

2424
public static class Securities {
25-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
26-
27-
// todo make multiple constructors for this use case
25+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2826

27+
public Securities(
28+
FakemultiplesecuritiesGetSecurityRequirementObject0 security0,
29+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject1 security1,
30+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject2 security2
31+
) {
32+
securities = new EnumMap<>(
33+
Stream.of(
34+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
35+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
36+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
37+
)
38+
.filter(entry -> entry != null && entry.getValue() != null)
39+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
40+
);
41+
} public Securities(
42+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject0 security0,
43+
FakemultiplesecuritiesGetSecurityRequirementObject1 security1,
44+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject2 security2
45+
) {
46+
securities = new EnumMap<>(
47+
Stream.of(
48+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
49+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
50+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
51+
)
52+
.filter(entry -> entry != null && entry.getValue() != null)
53+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
54+
);
55+
} public Securities(
56+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject0 security0,
57+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject1 security1,
58+
FakemultiplesecuritiesGetSecurityRequirementObject2 security2
59+
) {
60+
securities = new EnumMap<>(
61+
Stream.of(
62+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
63+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
64+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
65+
)
66+
.filter(entry -> entry != null && entry.getValue() != null)
67+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
68+
);
69+
}
2970
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
31-
if (securityRequirementObject == null) {
32-
throw new UnsetPropertyException(securityIndex+" is unset");
71+
if (securities.containsKey(securityIndex)) {
72+
return get(securityIndex);
3373
}
34-
return securityRequirementObject;
74+
throw new UnsetPropertyException(securityIndex+" is unset");
3575
}
3676
}
3777

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public FakepetiduploadimagewithrequiredfilePostSecurityInfo(Securities securitie
2020
}
2121

2222
public static class Securities {
23-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
23+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2424

2525
public Securities(
2626
@Nullable FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 security0
@@ -36,11 +36,10 @@ public Securities(
3636
}
3737

3838
public SecurityRequirementObject get(SecurityIndex securityIndex) {
39-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
40-
if (securityRequirementObject == null) {
41-
throw new UnsetPropertyException(securityIndex+" is unset");
39+
if (securities.containsKey(securityIndex)) {
40+
return get(securityIndex);
4241
}
43-
return securityRequirementObject;
42+
throw new UnsetPropertyException(securityIndex+" is unset");
4443
}
4544
}
4645

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

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,56 @@ public PetPostSecurityInfo(Securities securities, SecurityIndex securityIndex) {
2222
}
2323

2424
public static class Securities {
25-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
26-
27-
// todo make multiple constructors for this use case
25+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2826

27+
public Securities(
28+
PetPostSecurityRequirementObject0 security0,
29+
@Nullable PetPostSecurityRequirementObject1 security1,
30+
@Nullable PetPostSecurityRequirementObject2 security2
31+
) {
32+
securities = new EnumMap<>(
33+
Stream.of(
34+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
35+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
36+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
37+
)
38+
.filter(entry -> entry != null && entry.getValue() != null)
39+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
40+
);
41+
} public Securities(
42+
@Nullable PetPostSecurityRequirementObject0 security0,
43+
PetPostSecurityRequirementObject1 security1,
44+
@Nullable PetPostSecurityRequirementObject2 security2
45+
) {
46+
securities = new EnumMap<>(
47+
Stream.of(
48+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
49+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
50+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
51+
)
52+
.filter(entry -> entry != null && entry.getValue() != null)
53+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
54+
);
55+
} public Securities(
56+
@Nullable PetPostSecurityRequirementObject0 security0,
57+
@Nullable PetPostSecurityRequirementObject1 security1,
58+
PetPostSecurityRequirementObject2 security2
59+
) {
60+
securities = new EnumMap<>(
61+
Stream.of(
62+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
63+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
64+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
65+
)
66+
.filter(entry -> entry != null && entry.getValue() != null)
67+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
68+
);
69+
}
2970
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
31-
if (securityRequirementObject == null) {
32-
throw new UnsetPropertyException(securityIndex+" is unset");
71+
if (securities.containsKey(securityIndex)) {
72+
return get(securityIndex);
3373
}
34-
return securityRequirementObject;
74+
throw new UnsetPropertyException(securityIndex+" is unset");
3575
}
3676
}
3777

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

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,38 @@ public PetPutSecurityInfo(Securities securities, SecurityIndex securityIndex) {
2121
}
2222

2323
public static class Securities {
24-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
25-
26-
// todo make multiple constructors for this use case
24+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2725

26+
public Securities(
27+
PetPutSecurityRequirementObject0 security0,
28+
@Nullable PetPutSecurityRequirementObject1 security1
29+
) {
30+
securities = new EnumMap<>(
31+
Stream.of(
32+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
33+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1)
34+
)
35+
.filter(entry -> entry != null && entry.getValue() != null)
36+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
37+
);
38+
} public Securities(
39+
@Nullable PetPutSecurityRequirementObject0 security0,
40+
PetPutSecurityRequirementObject1 security1
41+
) {
42+
securities = new EnumMap<>(
43+
Stream.of(
44+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
45+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1)
46+
)
47+
.filter(entry -> entry != null && entry.getValue() != null)
48+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
49+
);
50+
}
2851
public SecurityRequirementObject get(SecurityIndex securityIndex) {
29-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
30-
if (securityRequirementObject == null) {
31-
throw new UnsetPropertyException(securityIndex+" is unset");
52+
if (securities.containsKey(securityIndex)) {
53+
return get(securityIndex);
3254
}
33-
return securityRequirementObject;
55+
throw new UnsetPropertyException(securityIndex+" is unset");
3456
}
3557
}
3658

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

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,56 @@ public PetfindbystatusGetSecurityInfo(Securities securities, SecurityIndex secur
2222
}
2323

2424
public static class Securities {
25-
private final EnumMap<SecurityIndex, @Nullable SecurityRequirementObject> securities;
26-
27-
// todo make multiple constructors for this use case
25+
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2826

27+
public Securities(
28+
PetfindbystatusGetSecurityRequirementObject0 security0,
29+
@Nullable PetfindbystatusGetSecurityRequirementObject1 security1,
30+
@Nullable PetfindbystatusGetSecurityRequirementObject2 security2
31+
) {
32+
securities = new EnumMap<>(
33+
Stream.of(
34+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
35+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
36+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
37+
)
38+
.filter(entry -> entry != null && entry.getValue() != null)
39+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
40+
);
41+
} public Securities(
42+
@Nullable PetfindbystatusGetSecurityRequirementObject0 security0,
43+
PetfindbystatusGetSecurityRequirementObject1 security1,
44+
@Nullable PetfindbystatusGetSecurityRequirementObject2 security2
45+
) {
46+
securities = new EnumMap<>(
47+
Stream.of(
48+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
49+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
50+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
51+
)
52+
.filter(entry -> entry != null && entry.getValue() != null)
53+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
54+
);
55+
} public Securities(
56+
@Nullable PetfindbystatusGetSecurityRequirementObject0 security0,
57+
@Nullable PetfindbystatusGetSecurityRequirementObject1 security1,
58+
PetfindbystatusGetSecurityRequirementObject2 security2
59+
) {
60+
securities = new EnumMap<>(
61+
Stream.of(
62+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_0, security0),
63+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_1, security1),
64+
new AbstractMap.SimpleEntry<>(SecurityIndex.SECURITY_2, security2)
65+
)
66+
.filter(entry -> entry != null && entry.getValue() != null)
67+
.collect(HashMap::new, (map, entry) -> map.put(entry.getKey(), entry.getValue()), HashMap::putAll)
68+
);
69+
}
2970
public SecurityRequirementObject get(SecurityIndex securityIndex) {
30-
@Nullable SecurityRequirementObject securityRequirementObject = get(securityIndex);
31-
if (securityRequirementObject == null) {
32-
throw new UnsetPropertyException(securityIndex+" is unset");
71+
if (securities.containsKey(securityIndex)) {
72+
return get(securityIndex);
3373
}
34-
return securityRequirementObject;
74+
throw new UnsetPropertyException(securityIndex+" is unset");
3575
}
3676
}
3777

0 commit comments

Comments
 (0)