Skip to content

Commit 7e66f4c

Browse files
frantumafrantuma
committed
ref CVE-2020-25649 - fix jackson code
1 parent a50f14a commit 7e66f4c

File tree

145 files changed

+1512
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+1512
-456
lines changed

‎modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package {{invokerPackage}};
33
import okhttp3.*;
44
import okio.Buffer;
55
import okio.BufferedSource;
6+
import okio.Timeout;
67
import play.libs.F;
78
import play.libs.ws.WSClient;
89
import play.libs.ws.WSRequest;
@@ -97,6 +98,10 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
9798
return request;
9899
}
99100

101+
public Timeout timeout() {
102+
return null;
103+
}
104+
100105
@Override
101106
public void enqueue(final okhttp3.Callback responseCallback) {
102107
final Call call = this;

‎modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package {{invokerPackage}};
33
import okhttp3.*;
44
import okio.Buffer;
55
import okio.BufferedSource;
6+
import okio.Timeout;
67
import play.libs.ws.WSClient;
78
import play.libs.ws.WSRequest;
89
import play.libs.ws.WSResponse;
@@ -32,7 +33,7 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
3233
3334
/** Extra query parameters to add to request */
3435
private List<Pair> extraQueryParams = new ArrayList<>();
35-
36+
3637
/** Filters (interceptors) */
3738
private List<WSRequestFilter> filters = new ArrayList<>();
3839
@@ -108,6 +109,10 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
108109
return request;
109110
}
110111

112+
public Timeout timeout() {
113+
return null;
114+
}
115+
111116
@Override
112117
public void enqueue(final okhttp3.Callback responseCallback) {
113118
final Call call = this;
@@ -189,7 +194,7 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
189194
}
190195

191196
});
192-
197+
193198
for (Map.Entry<String, List<String>> entry : r.getAllHeaders().entrySet()) {
194199
for (String value : entry.getValue()) {
195200
builder.addHeader(entry.getKey(), value);

‎modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
4242
{{#jackson}}
4343
@JsonCreator
4444
{{/jackson}}
45-
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue(String text) {
45+
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue{{#jackson}}({{{dataType}}} value){{/jackson}}{{^jackson}}(String text){{/jackson}} {
4646
for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
47-
if (String.valueOf(b.value).equals(text)) {
47+
if ({{#jackson}}b.value.equals(value){{/jackson}}{{^jackson}}String.valueOf(b.value).equals(text){{/jackson}}) {
4848
return b;
4949
}
5050
}
51-
{{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + text + "' for '{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}' enum.");{{/errorOnUnknownEnum}}
51+
{{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + {{#jackson}}value{{/jackson}}{{^jackson}}text{{/jackson}} + "' for '{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}' enum.");{{/errorOnUnknownEnum}}
5252
}
5353
{{#gson}}
5454

@@ -61,7 +61,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
6161
@Override
6262
public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
6363
{{#isNumber}}BigDecimal value = new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}{{#isInteger}}Integer value {{/isInteger}}{{^isInteger}}String value {{/isInteger}}= jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}nextString(){{/isInteger}}{{/isNumber}};
64-
return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(String.valueOf(value));
64+
return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue({{#jackson}}value{{/jackson}}{{^jackson}}String.valueOf(value){{/jackson}});
6565
}
6666
}
6767
{{/gson}}

‎modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
{{#jackson}}
3434
@JsonCreator
3535
{{/jackson}}
36-
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue(String text) {
36+
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue{{#jackson}}({{{datatype}}} value){{/jackson}}{{^jackson}}(String text){{/jackson}} {
3737
for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
38-
if (String.valueOf(b.value).equals(text)) {
38+
if ({{#jackson}}b.value.equals(value){{/jackson}}{{^jackson}}String.valueOf(b.value).equals(text){{/jackson}}) {
3939
return b;
4040
}
4141
}
42-
{{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + text + "' for '{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}' enum.");{{/errorOnUnknownEnum}}
42+
{{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + {{#jackson}}value{{/jackson}}{{^jackson}}text{{/jackson}} + "' for '{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}' enum.");{{/errorOnUnknownEnum}}
4343
}
4444
{{#gson}}
4545

@@ -52,7 +52,7 @@
5252
@Override
5353
public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
5454
{{#isNumber}}Object value = new BigDecimal(jsonReader.nextDouble()){{/isNumber}}{{^isNumber}}{{#isInteger}}int value {{/isInteger}}{{^isInteger}}String value {{/isInteger}}= jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}nextString(){{/isInteger}}{{/isNumber}};
55-
return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(String.valueOf(value));
55+
return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue({{#jackson}}value{{/jackson}}{{^jackson}}String.valueOf(value){{/jackson}});
5656
}
5757
}
5858
{{/gson}}

‎modules/swagger-codegen/src/main/resources/JavaVertXServer/enumOuterClass.mustache

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
2525
return String.valueOf(value);
2626
}
2727

28-
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue(String text) {
28+
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
2929
for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
30-
if (String.valueOf(b.value).equals(text)) {
30+
if (b.value.equals(value)) {
3131
return b;
3232
}
3333
}
34-
{{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + text + "' for '{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}' enum.");{{/errorOnUnknownEnum}}
34+
{{^errorOnUnknownEnum}}return null;{{/errorOnUnknownEnum}}{{#errorOnUnknownEnum}}throw new IllegalArgumentException("Unexpected value '" + value + "' for '{{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}' enum.");{{/errorOnUnknownEnum}}
3535
}
36-
}
36+
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public String toString() {
5353
}
5454

5555
@JsonCreator
56-
public static JustSymbolEnum fromValue(String text) {
56+
public static JustSymbolEnum fromValue(String value) {
5757
for (JustSymbolEnum b : JustSymbolEnum.values()) {
58-
if (String.valueOf(b.value).equals(text)) {
58+
if (b.value.equals(value)) {
5959
return b;
6060
}
6161
}
@@ -91,9 +91,9 @@ public String toString() {
9191
}
9292

9393
@JsonCreator
94-
public static ArrayEnumEnum fromValue(String text) {
94+
public static ArrayEnumEnum fromValue(String value) {
9595
for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
96-
if (String.valueOf(b.value).equals(text)) {
96+
if (b.value.equals(value)) {
9797
return b;
9898
}
9999
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public String toString() {
4747
}
4848

4949
@JsonCreator
50-
public static EnumClass fromValue(String text) {
50+
public static EnumClass fromValue(String value) {
5151
for (EnumClass b : EnumClass.values()) {
52-
if (String.valueOf(b.value).equals(text)) {
52+
if (b.value.equals(value)) {
5353
return b;
5454
}
5555
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public String toString() {
5454
}
5555

5656
@JsonCreator
57-
public static EnumStringEnum fromValue(String text) {
57+
public static EnumStringEnum fromValue(String value) {
5858
for (EnumStringEnum b : EnumStringEnum.values()) {
59-
if (String.valueOf(b.value).equals(text)) {
59+
if (b.value.equals(value)) {
6060
return b;
6161
}
6262
}
@@ -94,9 +94,9 @@ public String toString() {
9494
}
9595

9696
@JsonCreator
97-
public static EnumStringRequiredEnum fromValue(String text) {
97+
public static EnumStringRequiredEnum fromValue(String value) {
9898
for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
99-
if (String.valueOf(b.value).equals(text)) {
99+
if (b.value.equals(value)) {
100100
return b;
101101
}
102102
}
@@ -132,9 +132,9 @@ public String toString() {
132132
}
133133

134134
@JsonCreator
135-
public static EnumIntegerEnum fromValue(String text) {
135+
public static EnumIntegerEnum fromValue(Integer value) {
136136
for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
137-
if (String.valueOf(b.value).equals(text)) {
137+
if (b.value.equals(value)) {
138138
return b;
139139
}
140140
}
@@ -170,9 +170,9 @@ public String toString() {
170170
}
171171

172172
@JsonCreator
173-
public static EnumNumberEnum fromValue(String text) {
173+
public static EnumNumberEnum fromValue(Double value) {
174174
for (EnumNumberEnum b : EnumNumberEnum.values()) {
175-
if (String.valueOf(b.value).equals(text)) {
175+
if (b.value.equals(value)) {
176176
return b;
177177
}
178178
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Ints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public String toString() {
5656
}
5757

5858
@JsonCreator
59-
public static Ints fromValue(String text) {
59+
public static Ints fromValue(Integer value) {
6060
for (Ints b : Ints.values()) {
61-
if (String.valueOf(b.value).equals(text)) {
61+
if (b.value.equals(value)) {
6262
return b;
6363
}
6464
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public String toString() {
5757
}
5858

5959
@JsonCreator
60-
public static InnerEnum fromValue(String text) {
60+
public static InnerEnum fromValue(String value) {
6161
for (InnerEnum b : InnerEnum.values()) {
62-
if (String.valueOf(b.value).equals(text)) {
62+
if (b.value.equals(value)) {
6363
return b;
6464
}
6565
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelBoolean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public String toString() {
4646
}
4747

4848
@JsonCreator
49-
public static ModelBoolean fromValue(String text) {
49+
public static ModelBoolean fromValue(Boolean value) {
5050
for (ModelBoolean b : ModelBoolean.values()) {
51-
if (String.valueOf(b.value).equals(text)) {
51+
if (b.value.equals(value)) {
5252
return b;
5353
}
5454
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Numbers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public String toString() {
5151
}
5252

5353
@JsonCreator
54-
public static Numbers fromValue(String text) {
54+
public static Numbers fromValue(BigDecimal value) {
5555
for (Numbers b : Numbers.values()) {
56-
if (String.valueOf(b.value).equals(text)) {
56+
if (b.value.equals(value)) {
5757
return b;
5858
}
5959
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public String toString() {
6666
}
6767

6868
@JsonCreator
69-
public static StatusEnum fromValue(String text) {
69+
public static StatusEnum fromValue(String value) {
7070
for (StatusEnum b : StatusEnum.values()) {
71-
if (String.valueOf(b.value).equals(text)) {
71+
if (b.value.equals(value)) {
7272
return b;
7373
}
7474
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterEnum.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public String toString() {
4747
}
4848

4949
@JsonCreator
50-
public static OuterEnum fromValue(String text) {
50+
public static OuterEnum fromValue(String value) {
5151
for (OuterEnum b : OuterEnum.values()) {
52-
if (String.valueOf(b.value).equals(text)) {
52+
if (b.value.equals(value)) {
5353
return b;
5454
}
5555
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public String toString() {
7272
}
7373

7474
@JsonCreator
75-
public static StatusEnum fromValue(String text) {
75+
public static StatusEnum fromValue(String value) {
7676
for (StatusEnum b : StatusEnum.values()) {
77-
if (String.valueOf(b.value).equals(text)) {
77+
if (b.value.equals(value)) {
7878
return b;
7979
}
8080
}

‎samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/EnumArrays.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public String toString() {
5353
}
5454

5555
@JsonCreator
56-
public static JustSymbolEnum fromValue(String text) {
56+
public static JustSymbolEnum fromValue(String value) {
5757
for (JustSymbolEnum b : JustSymbolEnum.values()) {
58-
if (String.valueOf(b.value).equals(text)) {
58+
if (b.value.equals(value)) {
5959
return b;
6060
}
6161
}
@@ -91,9 +91,9 @@ public String toString() {
9191
}
9292

9393
@JsonCreator
94-
public static ArrayEnumEnum fromValue(String text) {
94+
public static ArrayEnumEnum fromValue(String value) {
9595
for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
96-
if (String.valueOf(b.value).equals(text)) {
96+
if (b.value.equals(value)) {
9797
return b;
9898
}
9999
}

‎samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/EnumClass.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public String toString() {
4747
}
4848

4949
@JsonCreator
50-
public static EnumClass fromValue(String text) {
50+
public static EnumClass fromValue(String value) {
5151
for (EnumClass b : EnumClass.values()) {
52-
if (String.valueOf(b.value).equals(text)) {
52+
if (b.value.equals(value)) {
5353
return b;
5454
}
5555
}

‎samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/EnumTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public String toString() {
5454
}
5555

5656
@JsonCreator
57-
public static EnumStringEnum fromValue(String text) {
57+
public static EnumStringEnum fromValue(String value) {
5858
for (EnumStringEnum b : EnumStringEnum.values()) {
59-
if (String.valueOf(b.value).equals(text)) {
59+
if (b.value.equals(value)) {
6060
return b;
6161
}
6262
}
@@ -94,9 +94,9 @@ public String toString() {
9494
}
9595

9696
@JsonCreator
97-
public static EnumStringRequiredEnum fromValue(String text) {
97+
public static EnumStringRequiredEnum fromValue(String value) {
9898
for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
99-
if (String.valueOf(b.value).equals(text)) {
99+
if (b.value.equals(value)) {
100100
return b;
101101
}
102102
}
@@ -132,9 +132,9 @@ public String toString() {
132132
}
133133

134134
@JsonCreator
135-
public static EnumIntegerEnum fromValue(String text) {
135+
public static EnumIntegerEnum fromValue(Integer value) {
136136
for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
137-
if (String.valueOf(b.value).equals(text)) {
137+
if (b.value.equals(value)) {
138138
return b;
139139
}
140140
}
@@ -170,9 +170,9 @@ public String toString() {
170170
}
171171

172172
@JsonCreator
173-
public static EnumNumberEnum fromValue(String text) {
173+
public static EnumNumberEnum fromValue(Double value) {
174174
for (EnumNumberEnum b : EnumNumberEnum.values()) {
175-
if (String.valueOf(b.value).equals(text)) {
175+
if (b.value.equals(value)) {
176176
return b;
177177
}
178178
}

‎samples/client/petstore/java/google-api-client/src/main/java/io/swagger/client/model/Ints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public String toString() {
5656
}
5757

5858
@JsonCreator
59-
public static Ints fromValue(String text) {
59+
public static Ints fromValue(Integer value) {
6060
for (Ints b : Ints.values()) {
61-
if (String.valueOf(b.value).equals(text)) {
61+
if (b.value.equals(value)) {
6262
return b;
6363
}
6464
}

0 commit comments

Comments
 (0)