diff --git a/annotation-error-decoder/pom.xml b/annotation-error-decoder/pom.xml index 01dee937f..956352234 100644 --- a/annotation-error-decoder/pom.xml +++ b/annotation-error-decoder/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-annotation-error-decoder diff --git a/apt-test-generator/pom.xml b/apt-test-generator/pom.xml index 082abe010..d5c7f6e2b 100644 --- a/apt-test-generator/pom.xml +++ b/apt-test-generator/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT io.github.openfeign.experimental diff --git a/benchmark/pom.xml b/benchmark/pom.xml index d99666fbc..7c6d55af5 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-benchmark diff --git a/core/pom.xml b/core/pom.xml index fba385c4d..0fc95a3c7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-core diff --git a/dropwizard-metrics4/pom.xml b/dropwizard-metrics4/pom.xml index 6bbef5d9f..3e8136ed0 100644 --- a/dropwizard-metrics4/pom.xml +++ b/dropwizard-metrics4/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-dropwizard-metrics4 Feign Dropwizard Metrics4 diff --git a/dropwizard-metrics5/pom.xml b/dropwizard-metrics5/pom.xml index b8f270562..4b565dfbe 100644 --- a/dropwizard-metrics5/pom.xml +++ b/dropwizard-metrics5/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-dropwizard-metrics5 Feign Dropwizard Metrics5 diff --git a/example-github-with-coroutine/pom.xml b/example-github-with-coroutine/pom.xml index b07493cdc..b3edf9ea0 100644 --- a/example-github-with-coroutine/pom.xml +++ b/example-github-with-coroutine/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-example-github-with-coroutine diff --git a/example-github/pom.xml b/example-github/pom.xml index c9c4bfc88..6e1015105 100644 --- a/example-github/pom.xml +++ b/example-github/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-example-github diff --git a/example-wikipedia-with-springboot/pom.xml b/example-wikipedia-with-springboot/pom.xml index d9b5d2a81..57ae5651e 100644 --- a/example-wikipedia-with-springboot/pom.xml +++ b/example-wikipedia-with-springboot/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-example-wikipedia-with-springboot diff --git a/example-wikipedia/pom.xml b/example-wikipedia/pom.xml index 01b3be0ee..c2114cf8e 100644 --- a/example-wikipedia/pom.xml +++ b/example-wikipedia/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT io.github.openfeign diff --git a/fastjson2/pom.xml b/fastjson2/pom.xml index 62aef4c99..8e8527b07 100644 --- a/fastjson2/pom.xml +++ b/fastjson2/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-fastjson2 diff --git a/form-spring/pom.xml b/form-spring/pom.xml index 85a7e4210..a3d4a7909 100644 --- a/form-spring/pom.xml +++ b/form-spring/pom.xml @@ -23,7 +23,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-form-spring diff --git a/form/pom.xml b/form/pom.xml index fb646c21f..e52ba3a84 100644 --- a/form/pom.xml +++ b/form/pom.xml @@ -23,7 +23,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-form diff --git a/googlehttpclient/pom.xml b/googlehttpclient/pom.xml index 17b8bd66b..201cb2eee 100644 --- a/googlehttpclient/pom.xml +++ b/googlehttpclient/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-googlehttpclient diff --git a/graphql-apt/pom.xml b/graphql-apt/pom.xml index 4f96d5320..d61aab4e1 100644 --- a/graphql-apt/pom.xml +++ b/graphql-apt/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT io.github.openfeign.experimental diff --git a/graphql/pom.xml b/graphql/pom.xml index 8fdff507f..0809ab441 100644 --- a/graphql/pom.xml +++ b/graphql/pom.xml @@ -22,13 +22,17 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-graphql Feign GraphQL Feign GraphQL runtime support for declarative GraphQL clients + + 17 + + ${project.groupId} diff --git a/graphql/src/main/java/feign/graphql/GraphqlContract.java b/graphql/src/main/java/feign/graphql/GraphqlContract.java index 65caffc5a..6f089e855 100644 --- a/graphql/src/main/java/feign/graphql/GraphqlContract.java +++ b/graphql/src/main/java/feign/graphql/GraphqlContract.java @@ -19,7 +19,6 @@ import feign.Request.HttpMethod; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.regex.Matcher; import java.util.regex.Pattern; public class GraphqlContract extends Contract.Default { @@ -35,14 +34,14 @@ public GraphqlContract() { super.registerMethodAnnotation( GraphqlQuery.class, (annotation, data) -> { - String query = annotation.value(); + var query = annotation.value(); if (data.template().method() == null) { data.template().method(HttpMethod.POST); data.template().uri("/"); } - String variableName = extractFirstVariable(query); + var variableName = extractFirstVariable(query); metadata.put(data.configKey(), new QueryMetadata(query, variableName)); }); } @@ -62,8 +61,8 @@ static String extractOperationField(String query) { if (braceCount == 1) { inOperation = true; } else if (braceCount == 2 && inOperation) { - String prefix = query.substring(0, i).trim(); - Matcher m = OPERATION_FIELD_PATTERN.matcher(prefix + "{"); + var prefix = query.substring(0, i).trim(); + var m = OPERATION_FIELD_PATTERN.matcher(prefix + "{"); if (m.find()) { return m.group(1); } @@ -73,7 +72,7 @@ static String extractOperationField(String query) { } } - Matcher m = OPERATION_FIELD_PATTERN.matcher(query); + var m = OPERATION_FIELD_PATTERN.matcher(query); if (m.find()) { return m.group(1); } @@ -81,7 +80,7 @@ static String extractOperationField(String query) { } static String extractFirstVariable(String query) { - Matcher m = VARIABLE_PATTERN.matcher(query); + var m = VARIABLE_PATTERN.matcher(query); if (m.find()) { return m.group(1); } diff --git a/graphql/src/main/java/feign/graphql/GraphqlDecoder.java b/graphql/src/main/java/feign/graphql/GraphqlDecoder.java index 060890cb1..356034105 100644 --- a/graphql/src/main/java/feign/graphql/GraphqlDecoder.java +++ b/graphql/src/main/java/feign/graphql/GraphqlDecoder.java @@ -22,9 +22,7 @@ import feign.codec.Decoder; import java.io.BufferedReader; import java.io.IOException; -import java.io.Reader; import java.lang.reflect.Type; -import java.util.Iterator; public class GraphqlDecoder implements Decoder { @@ -57,39 +55,39 @@ public Object decode(Response response, Type type) throws IOException { return null; } - Reader reader = response.body().asReader(response.charset()); + var reader = response.body().asReader(response.charset()); if (!reader.markSupported()) { reader = new BufferedReader(reader, 1); } - JsonNode root = mapper.readTree(reader); + var root = mapper.readTree(reader); - JsonNode errorsNode = root.path("errors"); + var errorsNode = root.path("errors"); if (!errorsNode.isMissingNode() && errorsNode.isArray() && !errorsNode.isEmpty()) { - String operationField = resolveOperationField(root, response); + var operationField = resolveOperationField(root, response); throw new GraphqlErrorException( response.status(), operationField, errorsNode.toString(), response.request()); } - JsonNode dataNode = root.path("data"); + var dataNode = root.path("data"); if (dataNode.isMissingNode() || dataNode.isNull() || !dataNode.isObject()) { return Util.emptyValueOf(type); } - Iterator fieldNames = dataNode.fieldNames(); + var fieldNames = dataNode.fieldNames(); if (!fieldNames.hasNext()) { return Util.emptyValueOf(type); } - String firstField = fieldNames.next(); - JsonNode operationData = dataNode.get(firstField); + var firstField = fieldNames.next(); + var operationData = dataNode.get(firstField); if (operationData == null || operationData.isNull()) { return Util.emptyValueOf(type); } if (delegate != null) { - byte[] dataBytes = mapper.writeValueAsBytes(operationData); - Response dataResponse = + var dataBytes = mapper.writeValueAsBytes(operationData); + var dataResponse = Response.builder() .status(response.status()) .reason(response.reason()) @@ -104,9 +102,9 @@ public Object decode(Response response, Type type) throws IOException { } private String resolveOperationField(JsonNode root, Response response) { - JsonNode dataNode = root.path("data"); + var dataNode = root.path("data"); if (!dataNode.isMissingNode() && dataNode.isObject()) { - Iterator names = dataNode.fieldNames(); + var names = dataNode.fieldNames(); if (names.hasNext()) { return names.next(); } @@ -114,8 +112,8 @@ private String resolveOperationField(JsonNode root, Response response) { if (response.request() != null && response.request().body() != null) { try { - JsonNode requestBody = mapper.readTree(response.request().body()); - String query = requestBody.path("query").asText(null); + var requestBody = mapper.readTree(response.request().body()); + var query = requestBody.path("query").asText(null); if (query != null) { return GraphqlContract.extractOperationField(query); } diff --git a/graphql/src/main/java/feign/graphql/GraphqlEncoder.java b/graphql/src/main/java/feign/graphql/GraphqlEncoder.java index a3d1aaa30..391d8a567 100644 --- a/graphql/src/main/java/feign/graphql/GraphqlEncoder.java +++ b/graphql/src/main/java/feign/graphql/GraphqlEncoder.java @@ -36,17 +36,17 @@ public GraphqlEncoder(Encoder delegate, GraphqlContract contract) { @Override public void encode(Object object, Type bodyType, RequestTemplate template) throws EncodeException { - GraphqlContract.QueryMetadata meta = lookupMetadata(template); + var meta = lookupMetadata(template); if (meta == null) { delegate.encode(object, bodyType, template); return; } - Map graphqlBody = new LinkedHashMap<>(); + var graphqlBody = new LinkedHashMap(); graphqlBody.put("query", meta.query); if (object != null && meta.variableName != null) { - Map variables = new LinkedHashMap<>(); + var variables = new LinkedHashMap(); variables.put(meta.variableName, object); graphqlBody.put("variables", variables); } @@ -60,12 +60,12 @@ public void apply(RequestTemplate template) { return; } - GraphqlContract.QueryMetadata meta = lookupMetadata(template); + var meta = lookupMetadata(template); if (meta == null) { return; } - Map graphqlBody = new LinkedHashMap<>(); + var graphqlBody = new LinkedHashMap(); graphqlBody.put("query", meta.query); delegate.encode(graphqlBody, MAP_STRING_WILDCARD, template); diff --git a/gson/pom.xml b/gson/pom.xml index b8cf5cada..b8891b6dc 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-gson diff --git a/hc5/pom.xml b/hc5/pom.xml index d736d9e7b..2492db8df 100644 --- a/hc5/pom.xml +++ b/hc5/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-hc5 diff --git a/httpclient/pom.xml b/httpclient/pom.xml index d2a98601c..e2f020811 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-httpclient diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 21f0775b4..b06bd5726 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-hystrix diff --git a/jackson-jaxb/pom.xml b/jackson-jaxb/pom.xml index c7a5604d8..31e627a44 100644 --- a/jackson-jaxb/pom.xml +++ b/jackson-jaxb/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jackson-jaxb diff --git a/jackson-jr/pom.xml b/jackson-jr/pom.xml index e3b9e4721..658ac87fb 100644 --- a/jackson-jr/pom.xml +++ b/jackson-jr/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jackson-jr diff --git a/jackson/pom.xml b/jackson/pom.xml index 0cfc8976a..edfb90331 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jackson diff --git a/jackson3/pom.xml b/jackson3/pom.xml index f615df00d..a4e77043f 100644 --- a/jackson3/pom.xml +++ b/jackson3/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jackson3 diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 9709dffb7..b013b48ad 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jakarta diff --git a/java11/pom.xml b/java11/pom.xml index 475134fc2..f985cd848 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-java11 diff --git a/jaxb-jakarta/pom.xml b/jaxb-jakarta/pom.xml index 3a64c0161..cf2c98d05 100644 --- a/jaxb-jakarta/pom.xml +++ b/jaxb-jakarta/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jaxb-jakarta diff --git a/jaxb/pom.xml b/jaxb/pom.xml index 5470fa747..8902ad462 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jaxb diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index 9b1ec21ce..b519e4e34 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jaxrs diff --git a/jaxrs2/pom.xml b/jaxrs2/pom.xml index dfee5d0a1..c4b81479d 100644 --- a/jaxrs2/pom.xml +++ b/jaxrs2/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jaxrs2 diff --git a/jaxrs3/pom.xml b/jaxrs3/pom.xml index ac058a757..965ceba1e 100644 --- a/jaxrs3/pom.xml +++ b/jaxrs3/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jaxrs3 diff --git a/jaxrs4/pom.xml b/jaxrs4/pom.xml index f07e902de..4c42cfc84 100644 --- a/jaxrs4/pom.xml +++ b/jaxrs4/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-jaxrs4 diff --git a/json/pom.xml b/json/pom.xml index a5ae81ec1..3eb9d8aad 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-json diff --git a/kotlin/pom.xml b/kotlin/pom.xml index 3ef76e2a6..da1699b3f 100644 --- a/kotlin/pom.xml +++ b/kotlin/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-kotlin diff --git a/micrometer/pom.xml b/micrometer/pom.xml index c98d50beb..b85531009 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-micrometer Feign Micrometer diff --git a/mock/pom.xml b/mock/pom.xml index 565d9cf80..43168ef31 100644 --- a/mock/pom.xml +++ b/mock/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-mock diff --git a/moshi/pom.xml b/moshi/pom.xml index 6d160bbb6..f6e085b9b 100644 --- a/moshi/pom.xml +++ b/moshi/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-moshi diff --git a/okhttp/pom.xml b/okhttp/pom.xml index eab4785c9..104196cba 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-okhttp diff --git a/pom.xml b/pom.xml index 671951ca2..8774e2eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT pom Feign (Parent) diff --git a/reactive/pom.xml b/reactive/pom.xml index 2a490e9a5..ae8375341 100644 --- a/reactive/pom.xml +++ b/reactive/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-reactive-wrappers diff --git a/ribbon/pom.xml b/ribbon/pom.xml index fc3ca30ec..3ab5649e0 100644 --- a/ribbon/pom.xml +++ b/ribbon/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-ribbon diff --git a/sax/pom.xml b/sax/pom.xml index 10b52bb14..62f89def8 100644 --- a/sax/pom.xml +++ b/sax/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-sax diff --git a/slf4j/pom.xml b/slf4j/pom.xml index 7f2e33597..45a8db4e3 100644 --- a/slf4j/pom.xml +++ b/slf4j/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-slf4j diff --git a/soap-jakarta/pom.xml b/soap-jakarta/pom.xml index 627b33be8..668423150 100644 --- a/soap-jakarta/pom.xml +++ b/soap-jakarta/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-soap-jakarta diff --git a/soap/pom.xml b/soap/pom.xml index e25715e0a..1c0c3f2a0 100644 --- a/soap/pom.xml +++ b/soap/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-soap diff --git a/spring/pom.xml b/spring/pom.xml index a441d7130..8e2458a27 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-spring diff --git a/spring4/pom.xml b/spring4/pom.xml index 998527191..cdc919749 100644 --- a/spring4/pom.xml +++ b/spring4/pom.xml @@ -22,7 +22,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-spring4 diff --git a/vertx/feign-vertx/pom.xml b/vertx/feign-vertx/pom.xml index 6119cea9a..675a13150 100644 --- a/vertx/feign-vertx/pom.xml +++ b/vertx/feign-vertx/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-vertx-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-vertx diff --git a/vertx/feign-vertx4-test/pom.xml b/vertx/feign-vertx4-test/pom.xml index 4627c60a2..97fd38adb 100644 --- a/vertx/feign-vertx4-test/pom.xml +++ b/vertx/feign-vertx4-test/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-vertx-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-vertx4-test diff --git a/vertx/feign-vertx5-test/pom.xml b/vertx/feign-vertx5-test/pom.xml index f7941a471..d21120abc 100644 --- a/vertx/feign-vertx5-test/pom.xml +++ b/vertx/feign-vertx5-test/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-vertx-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-vertx5-test diff --git a/vertx/pom.xml b/vertx/pom.xml index c3fd09e8c..1966bee59 100644 --- a/vertx/pom.xml +++ b/vertx/pom.xml @@ -21,7 +21,7 @@ io.github.openfeign feign-parent - 13.8-SNAPSHOT + 13.9-SNAPSHOT feign-vertx-parent