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

Commit c551007

Browse files
spacetherspacether
committed
Updates security info class to have a constrctor where all securities can be null
1 parent e1ca80e commit c551007

File tree

18 files changed

+156
-257
lines changed

18 files changed

+156
-257
lines changed

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

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

9-
import java.util.AbstractMap;
10-
import java.util.HashMap;
11-
import java.util.EnumMap;
12-
import java.util.stream.Stream;
9+
import java.util.Map;
1310
import java.util.EnumMap;
1411

1512
public class FakeDeleteSecurityInfo implements SecurityRequirementObjectProvider<FakeDeleteSecurityInfo.SecurityIndex> {
@@ -24,9 +21,7 @@ public FakeDeleteSecurityInfo(Securities securities, SecurityIndex securityIndex
2421
public static class Securities {
2522
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2623

27-
public Securities(
28-
FakeDeleteSecurityRequirementObject0 security0
29-
) {
24+
public Securities(FakeDeleteSecurityRequirementObject0 security0) {
3025
securities = new EnumMap<>(
3126
Map.ofEntries(
3227
new AbstractMap.SimpleEntry<>(

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

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

9-
import java.util.AbstractMap;
10-
import java.util.HashMap;
11-
import java.util.EnumMap;
12-
import java.util.stream.Stream;
9+
import java.util.Map;
1310
import java.util.EnumMap;
1411

1512
public class FakePostSecurityInfo implements SecurityRequirementObjectProvider<FakePostSecurityInfo.SecurityIndex> {
@@ -24,9 +21,7 @@ public FakePostSecurityInfo(Securities securities, SecurityIndex securityIndex)
2421
public static class Securities {
2522
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2623

27-
public Securities(
28-
FakePostSecurityRequirementObject0 security0
29-
) {
24+
public Securities(FakePostSecurityRequirementObject0 security0) {
3025
securities = new EnumMap<>(
3126
Map.ofEntries(
3227
new AbstractMap.SimpleEntry<>(

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
77
import org.checkerframework.checker.nullness.qual.Nullable;
88

9-
import java.util.AbstractMap;
109
import java.util.Map;
1110
import java.util.EnumMap;
1211

@@ -22,9 +21,7 @@ public FakeclassnametestPatchSecurityInfo(Securities securities, SecurityIndex s
2221
public static class Securities {
2322
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2423

25-
public Securities(
26-
@Nullable FakeclassnametestPatchSecurityRequirementObject0 security0
27-
) {
24+
public Securities(FakeclassnametestPatchSecurityRequirementObject0 security0) {
2825
securities = new EnumMap<>(
2926
Map.ofEntries(
3027
new AbstractMap.SimpleEntry<>(

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

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
99
import org.checkerframework.checker.nullness.qual.Nullable;
1010

11-
import java.util.AbstractMap;
1211
import java.util.Map;
1312
import java.util.EnumMap;
1413

@@ -24,49 +23,32 @@ public FakemultiplesecuritiesGetSecurityInfo(Securities securities, SecurityInde
2423
public static class Securities {
2524
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2625

26+
public Securities(FakemultiplesecuritiesGetSecurityRequirementObject0 security0) {
27+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
28+
}
29+
public Securities(FakemultiplesecuritiesGetSecurityRequirementObject1 security1) {
30+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
31+
}
32+
public Securities(FakemultiplesecuritiesGetSecurityRequirementObject2 security2) {
33+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_2, security2));
34+
}
2735
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(
5636
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject0 security0,
5737
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject1 security1,
58-
FakemultiplesecuritiesGetSecurityRequirementObject2 security2
38+
@Nullable FakemultiplesecuritiesGetSecurityRequirementObject2 security2
5939
) {
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-
);
40+
securities = new EnumMap<>(SecurityRequirementObject.class);
41+
if (security0 != null) {
42+
securities.put(SecurityIndex.SECURITY_0, security0);
43+
}
44+
if (security1 != null) {
45+
securities.put(SecurityIndex.SECURITY_1, security1);
46+
}
47+
if (security2 != null) {
48+
securities.put(SecurityIndex.SECURITY_2, security2);
49+
}
6950
}
51+
7052
public SecurityRequirementObject get(SecurityIndex securityIndex) {
7153
if (securities.containsKey(securityIndex)) {
7254
return get(securityIndex);

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
77
import org.checkerframework.checker.nullness.qual.Nullable;
88

9-
import java.util.AbstractMap;
109
import java.util.Map;
1110
import java.util.EnumMap;
1211

@@ -22,9 +21,7 @@ public FakepetiduploadimagewithrequiredfilePostSecurityInfo(Securities securitie
2221
public static class Securities {
2322
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2423

25-
public Securities(
26-
@Nullable FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 security0
27-
) {
24+
public Securities(FakepetiduploadimagewithrequiredfilePostSecurityRequirementObject0 security0) {
2825
securities = new EnumMap<>(
2926
Map.ofEntries(
3027
new AbstractMap.SimpleEntry<>(

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

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
99
import org.checkerframework.checker.nullness.qual.Nullable;
1010

11-
import java.util.AbstractMap;
1211
import java.util.Map;
1312
import java.util.EnumMap;
1413

@@ -24,49 +23,32 @@ public PetPostSecurityInfo(Securities securities, SecurityIndex securityIndex) {
2423
public static class Securities {
2524
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2625

26+
public Securities(PetPostSecurityRequirementObject0 security0) {
27+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
28+
}
29+
public Securities(PetPostSecurityRequirementObject1 security1) {
30+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
31+
}
32+
public Securities(PetPostSecurityRequirementObject2 security2) {
33+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_2, security2));
34+
}
2735
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(
5636
@Nullable PetPostSecurityRequirementObject0 security0,
5737
@Nullable PetPostSecurityRequirementObject1 security1,
58-
PetPostSecurityRequirementObject2 security2
38+
@Nullable PetPostSecurityRequirementObject2 security2
5939
) {
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-
);
40+
securities = new EnumMap<>(SecurityRequirementObject.class);
41+
if (security0 != null) {
42+
securities.put(SecurityIndex.SECURITY_0, security0);
43+
}
44+
if (security1 != null) {
45+
securities.put(SecurityIndex.SECURITY_1, security1);
46+
}
47+
if (security2 != null) {
48+
securities.put(SecurityIndex.SECURITY_2, security2);
49+
}
6950
}
51+
7052
public SecurityRequirementObject get(SecurityIndex securityIndex) {
7153
if (securities.containsKey(securityIndex)) {
7254
return get(securityIndex);

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

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

10-
import java.util.AbstractMap;
1110
import java.util.Map;
1211
import java.util.EnumMap;
1312

@@ -23,31 +22,25 @@ public PetPutSecurityInfo(Securities securities, SecurityIndex securityIndex) {
2322
public static class Securities {
2423
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2524

25+
public Securities(PetPutSecurityRequirementObject0 security0) {
26+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
27+
}
28+
public Securities(PetPutSecurityRequirementObject1 security1) {
29+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
30+
}
2631
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(
3932
@Nullable PetPutSecurityRequirementObject0 security0,
40-
PetPutSecurityRequirementObject1 security1
33+
@Nullable PetPutSecurityRequirementObject1 security1
4134
) {
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-
);
35+
securities = new EnumMap<>(SecurityRequirementObject.class);
36+
if (security0 != null) {
37+
securities.put(SecurityIndex.SECURITY_0, security0);
38+
}
39+
if (security1 != null) {
40+
securities.put(SecurityIndex.SECURITY_1, security1);
41+
}
5042
}
43+
5144
public SecurityRequirementObject get(SecurityIndex securityIndex) {
5245
if (securities.containsKey(securityIndex)) {
5346
return get(securityIndex);

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

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.openapijsonschematools.client.securityrequirementobjects.SecurityRequirementObjectProvider;
99
import org.checkerframework.checker.nullness.qual.Nullable;
1010

11-
import java.util.AbstractMap;
1211
import java.util.Map;
1312
import java.util.EnumMap;
1413

@@ -24,49 +23,32 @@ public PetfindbystatusGetSecurityInfo(Securities securities, SecurityIndex secur
2423
public static class Securities {
2524
private final EnumMap<SecurityIndex, SecurityRequirementObject> securities;
2625

26+
public Securities(PetfindbystatusGetSecurityRequirementObject0 security0) {
27+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_0, security0));
28+
}
29+
public Securities(PetfindbystatusGetSecurityRequirementObject1 security1) {
30+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_1, security1));
31+
}
32+
public Securities(PetfindbystatusGetSecurityRequirementObject2 security2) {
33+
securities = new EnumMap<>(Map.of(SecurityIndex.SECURITY_2, security2));
34+
}
2735
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(
5636
@Nullable PetfindbystatusGetSecurityRequirementObject0 security0,
5737
@Nullable PetfindbystatusGetSecurityRequirementObject1 security1,
58-
PetfindbystatusGetSecurityRequirementObject2 security2
38+
@Nullable PetfindbystatusGetSecurityRequirementObject2 security2
5939
) {
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-
);
40+
securities = new EnumMap<>(SecurityRequirementObject.class);
41+
if (security0 != null) {
42+
securities.put(SecurityIndex.SECURITY_0, security0);
43+
}
44+
if (security1 != null) {
45+
securities.put(SecurityIndex.SECURITY_1, security1);
46+
}
47+
if (security2 != null) {
48+
securities.put(SecurityIndex.SECURITY_2, security2);
49+
}
6950
}
51+
7052
public SecurityRequirementObject get(SecurityIndex securityIndex) {
7153
if (securities.containsKey(securityIndex)) {
7254
return get(securityIndex);

0 commit comments

Comments
 (0)