From ae45bcd72845d57984624e28fb588d5eff71bd51 Mon Sep 17 00:00:00 2001 From: brasseld Date: Tue, 20 Sep 2016 14:25:54 +0200 Subject: [PATCH] feat(plan): Implementation of Plans Closes gravitee-io/issues#257 --- .../jackson/datatype/GraviteeMapper.java | 2 +- .../jackson/datatype/GraviteeModule.java | 2 +- .../jackson/datatype/api/ApiModule.java | 2 +- .../deser/AbstractStdScalarDeserializer.java | 4 +- .../datatype/api/deser/ApiDeserializer.java | 4 +- .../api/deser/EndpointDeserializer.java | 5 +-- .../api/deser/FailoverDeserializer.java | 4 +- .../api/deser/HttpClientDeserializer.java | 4 +- .../HttpClientSslOptionsDeserializer.java | 4 +- .../api/deser/HttpProxyDeserializer.java | 4 +- .../api/deser/LoadBalancerDeserializer.java | 4 +- .../datatype/api/deser/PathDeserializer.java | 4 +- .../api/deser/PolicyDeserializer.java | 16 +++++-- .../datatype/api/deser/ProxyDeserializer.java | 11 ++--- .../datatype/api/deser/RuleDeserializer.java | 4 +- .../datatype/api/ser/ApiSerializer.java | 4 +- .../datatype/api/ser/EndpointSerializer.java | 2 +- .../datatype/api/ser/FailoverSerializer.java | 4 +- .../api/ser/HttpClientSerializer.java | 4 +- .../ser/HttpClientSslOptionsSerializer.java | 4 +- .../datatype/api/ser/HttpProxySerializer.java | 4 +- .../api/ser/LoadBalancerSerializer.java | 4 +- .../datatype/api/ser/PathSerializer.java | 4 +- .../datatype/api/ser/PolicySerializer.java | 4 +- .../datatype/api/ser/ProxySerializer.java | 4 -- .../datatype/api/ser/RuleSerializer.java | 4 +- .../plugins/resource/ResourceModule.java | 2 +- .../resource/deser/ResourceDeserializer.java | 2 +- .../resource/ser/ResourceSerializer.java | 2 +- .../datatype/services/core/ServiceModule.java | 2 +- .../core/deser/ServiceDeserializer.java | 2 +- .../core/deser/ServicesDeserializer.java | 18 +------- .../services/core/ser/ServiceSerializer.java | 4 +- .../services/core/ser/ServicesSerializer.java | 4 +- .../healthcheck/HealthCheckModule.java | 2 +- .../deser/ExpectationDeserializer.java | 4 +- .../deser/HealthCheckDeserializer.java | 2 +- .../deser/RequestDeserializer.java | 2 +- .../ser/ExpectationSerializer.java | 2 +- .../ser/HealthCheckSerializer.java | 2 +- .../healthcheck/ser/RequestSerializer.java | 2 +- .../definition/jackson/AbstractTest.java | 8 +++- .../jackson/api/ApiDeserializerTest.java | 44 +++++++++++-------- .../jackson/api/ApiSerializerTest.java | 3 +- .../resources/ResourceDeserializerTest.java | 3 +- .../resources/ResourceSerializerTest.java | 2 +- .../HealthCheckDeserializerTest.java | 2 +- .../HealthCheckSerializerTest.java | 2 +- .../jackson/api-defaulthttpconfig.json | 1 + .../jackson/api-failover-singlecase.json | 2 + ...pi-multipleendpoints-insingleendpoint.json | 1 + .../jackson/api-multipleendpoints.json | 2 + .../jackson/api-overridedhttpconfig.json | 22 +++++----- .../jackson/api-singleendpoint-inarray.json | 1 + .../jackson/api-singleendpoint.json | 1 + .../api-withclientoptions-nooptions.json | 7 ++- .../jackson/api-withclientoptions-nossl.json | 19 ++++---- .../jackson/api-withclientoptions.json | 29 ++++++------ .../gravitee/definition/model/Endpoint.java | 4 +- .../gravitee/definition/model/Failover.java | 4 +- .../definition/model/FailoverCase.java | 4 +- .../gravitee/definition/model/HttpClient.java | 4 +- .../definition/model/HttpClientOptions.java | 4 +- .../model/HttpClientSslOptions.java | 4 +- .../gravitee/definition/model/HttpProxy.java | 4 +- .../definition/model/HttpProxyType.java | 2 +- .../definition/model/LoadBalancer.java | 4 +- .../definition/model/LoadBalancerType.java | 2 +- .../io/gravitee/definition/model/Path.java | 4 +- .../io/gravitee/definition/model/Policy.java | 4 +- .../io/gravitee/definition/model/Proxy.java | 14 +----- .../io/gravitee/definition/model/Rule.java | 2 +- .../io/gravitee/definition/model/Service.java | 2 +- .../model/plugins/resources/Resource.java | 2 +- .../definition/model/services/Services.java | 2 +- .../services/healthcheck/Expectation.java | 2 +- .../services/healthcheck/HealthCheck.java | 2 +- .../model/services/healthcheck/Request.java | 2 +- 78 files changed, 197 insertions(+), 192 deletions(-) diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeMapper.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeMapper.java index 86703de2..41ec2ad5 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeMapper.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeMapper.java @@ -24,7 +24,7 @@ import io.gravitee.definition.jackson.datatype.services.healthcheck.HealthCheckModule; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class GraviteeMapper extends ObjectMapper { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeModule.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeModule.java index fadc5614..7ccc6e6c 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeModule.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/GraviteeModule.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public abstract class GraviteeModule extends SimpleModule { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ApiModule.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ApiModule.java index 3b1b18c5..17954b15 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ApiModule.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ApiModule.java @@ -21,7 +21,7 @@ import io.gravitee.definition.model.*; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ApiModule extends GraviteeModule { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/AbstractStdScalarDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/AbstractStdScalarDeserializer.java index f2eaae67..827588af 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/AbstractStdScalarDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/AbstractStdScalarDeserializer.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public abstract class AbstractStdScalarDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ApiDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ApiDeserializer.java index f2d969b8..06d46c37 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ApiDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ApiDeserializer.java @@ -34,8 +34,8 @@ import java.util.TreeMap; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class ApiDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/EndpointDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/EndpointDeserializer.java index 8609a87f..622982b5 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/EndpointDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/EndpointDeserializer.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer; -import io.gravitee.common.utils.UUID; import io.gravitee.definition.model.Endpoint; import io.gravitee.definition.model.HttpClientOptions; import io.gravitee.definition.model.HttpClientSslOptions; @@ -47,10 +46,10 @@ public Endpoint deserialize(JsonParser jp, DeserializationContext ctxt) JsonNode nameNode = node.get("name"); if (nameNode != null) { - String name = nameNode.asText(UUID.random().toString()); + String name = nameNode.asText(); endpoint.setName(name); } else { - endpoint.setName(UUID.random().toString()); + throw ctxt.mappingException("Endpoint name is required"); } JsonNode weightNode = node.get("weight"); diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/FailoverDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/FailoverDeserializer.java index 7eda9ca7..90216915 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/FailoverDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/FailoverDeserializer.java @@ -27,8 +27,8 @@ import java.util.List; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class FailoverDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientDeserializer.java index ac4b70b4..8c4fd361 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientDeserializer.java @@ -27,8 +27,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClientDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientSslOptionsDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientSslOptionsDeserializer.java index d1c2c95c..852e23a1 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientSslOptionsDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpClientSslOptionsDeserializer.java @@ -23,8 +23,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClientSslOptionsDeserializer extends AbstractStdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpProxyDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpProxyDeserializer.java index 8e322f19..031c8b7e 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpProxyDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/HttpProxyDeserializer.java @@ -25,8 +25,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpProxyDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/LoadBalancerDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/LoadBalancerDeserializer.java index 2d0a4db8..db82b071 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/LoadBalancerDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/LoadBalancerDeserializer.java @@ -25,8 +25,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class LoadBalancerDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PathDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PathDeserializer.java index 5ef7e7e8..5550a710 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PathDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PathDeserializer.java @@ -25,8 +25,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class PathDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PolicyDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PolicyDeserializer.java index 7aed7121..03afe3f6 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PolicyDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/PolicyDeserializer.java @@ -24,8 +24,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class PolicyDeserializer extends StdScalarDeserializer { @@ -39,8 +39,18 @@ public Policy deserialize(JsonParser jp, DeserializationContext ctxt) JsonNode node = jp.getCodec().readTree(jp); Policy policy = new Policy(); + node.fieldNames().forEachRemaining(field -> { + JsonNode subNode = node.findValue(field); + policy.setName(field); + policy.setConfiguration(subNode.toString()); + + System.out.println(field); + }); + + /* policy.setName(node.get("policy").asText()); - policy.setConfiguration(node.get("configuration").toString()); + policy.setConfiguration(node.getget("configuration").toString()); + */ return policy; } diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ProxyDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ProxyDeserializer.java index fc861b46..7e4cfea0 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ProxyDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/ProxyDeserializer.java @@ -19,7 +19,10 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer; -import io.gravitee.definition.model.*; +import io.gravitee.definition.model.Endpoint; +import io.gravitee.definition.model.Failover; +import io.gravitee.definition.model.LoadBalancer; +import io.gravitee.definition.model.Proxy; import java.io.IOException; @@ -65,12 +68,6 @@ public Proxy deserialize(JsonParser jp, DeserializationContext ctxt) proxy.setStripContextPath(stripContextNode.asBoolean(false)); } - JsonNode httpClientNode = node.get("http"); - if (httpClientNode != null) { - HttpClient httpClient = httpClientNode.traverse(jp.getCodec()).readValueAs(HttpClient.class); - proxy.setHttpClient(httpClient); - } - JsonNode loadBalancingNode = node.get("load_balancing"); if (loadBalancingNode != null) { LoadBalancer loadBalancer = loadBalancingNode.traverse(jp.getCodec()).readValueAs(LoadBalancer.class); diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/RuleDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/RuleDeserializer.java index 820f760a..3c0f1cda 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/RuleDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/RuleDeserializer.java @@ -27,8 +27,8 @@ import java.util.Arrays; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class RuleDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ApiSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ApiSerializer.java index 2afbb8a8..fe75e809 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ApiSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ApiSerializer.java @@ -24,8 +24,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class ApiSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/EndpointSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/EndpointSerializer.java index ec859b43..910a8f14 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/EndpointSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/EndpointSerializer.java @@ -24,7 +24,7 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class EndpointSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/FailoverSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/FailoverSerializer.java index d7a49378..eb00cd03 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/FailoverSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/FailoverSerializer.java @@ -25,8 +25,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class FailoverSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSerializer.java index 4b777cb9..1eadeb02 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSerializer.java @@ -24,8 +24,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClientSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSslOptionsSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSslOptionsSerializer.java index b63755e6..bb586734 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSslOptionsSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpClientSslOptionsSerializer.java @@ -24,8 +24,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClientSslOptionsSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpProxySerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpProxySerializer.java index c6f78c61..6d81668b 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpProxySerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/HttpProxySerializer.java @@ -23,8 +23,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpProxySerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/LoadBalancerSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/LoadBalancerSerializer.java index 8d96e2f6..88f93327 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/LoadBalancerSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/LoadBalancerSerializer.java @@ -23,8 +23,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class LoadBalancerSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PathSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PathSerializer.java index 210b305b..543e194d 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PathSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PathSerializer.java @@ -24,8 +24,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class PathSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PolicySerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PolicySerializer.java index a602a85e..49e64522 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PolicySerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/PolicySerializer.java @@ -23,8 +23,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class PolicySerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ProxySerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ProxySerializer.java index 130876fc..2b58e397 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ProxySerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/ProxySerializer.java @@ -61,10 +61,6 @@ public void serialize(Proxy proxy, JsonGenerator jgen, SerializerProvider provid jgen.writeObjectField("failover", proxy.getFailover()); } - - if (proxy.getHttpClient() != null) { - jgen.writeObjectField("http", proxy.getHttpClient()); - } jgen.writeEndObject(); } } diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/RuleSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/RuleSerializer.java index 7075739d..08ab3c28 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/RuleSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/ser/RuleSerializer.java @@ -25,8 +25,8 @@ import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class RuleSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ResourceModule.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ResourceModule.java index d9662220..7eb0b77b 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ResourceModule.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ResourceModule.java @@ -21,7 +21,7 @@ import io.gravitee.definition.model.plugins.resources.Resource; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ResourceModule extends GraviteeModule { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/deser/ResourceDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/deser/ResourceDeserializer.java index a557af27..2df9693e 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/deser/ResourceDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/deser/ResourceDeserializer.java @@ -24,7 +24,7 @@ import java.io.IOException; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ResourceDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ser/ResourceSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ser/ResourceSerializer.java index b2c57a2e..58952402 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ser/ResourceSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/plugins/resource/ser/ResourceSerializer.java @@ -23,7 +23,7 @@ import java.io.IOException; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ResourceSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ServiceModule.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ServiceModule.java index bac02430..b8909a43 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ServiceModule.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ServiceModule.java @@ -24,7 +24,7 @@ import io.gravitee.definition.model.services.Services; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ServiceModule extends GraviteeModule { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServiceDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServiceDeserializer.java index ec84afcc..30da5b19 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServiceDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServiceDeserializer.java @@ -29,7 +29,7 @@ import java.util.Map; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ServiceDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServicesDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServicesDeserializer.java index ae01a2fe..28409e8a 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServicesDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/deser/ServicesDeserializer.java @@ -30,7 +30,7 @@ import java.util.Map; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ServicesDeserializer extends StdScalarDeserializer { @@ -71,21 +71,5 @@ public Services deserialize(JsonParser jp, DeserializationContext ctxt) throws I services.set(individualServices); return services; - -/* - String serviceName = node.fieldNames().next(); - - Class serviceClass = registeredServices.get(serviceName); - if (serviceClass == null) { - return null; - } - - return node.elements().next().traverse(jp.getCodec()).readValueAs(new TypeReference() { - @Override - public Type getType() { - return serviceClass; - } - }); -*/ } } diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServiceSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServiceSerializer.java index 4607bb79..0c8fc7c6 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServiceSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServiceSerializer.java @@ -23,8 +23,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class ServiceSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServicesSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServicesSerializer.java index 46c3ded6..3d8a5597 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServicesSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/core/ser/ServicesSerializer.java @@ -23,8 +23,8 @@ import java.io.IOException; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class ServicesSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/HealthCheckModule.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/HealthCheckModule.java index edcac02f..05c04fcd 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/HealthCheckModule.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/HealthCheckModule.java @@ -27,7 +27,7 @@ import io.gravitee.definition.model.services.healthcheck.Expectation; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class HealthCheckModule extends GraviteeModule { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/ExpectationDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/ExpectationDeserializer.java index cf2fbc44..b52439b4 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/ExpectationDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/ExpectationDeserializer.java @@ -29,13 +29,11 @@ import java.util.List; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ExpectationDeserializer extends StdScalarDeserializer { - private final Logger logger = LoggerFactory.getLogger(ExpectationDeserializer.class); - public ExpectationDeserializer(Class vc) { super(vc); } diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/HealthCheckDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/HealthCheckDeserializer.java index 9709c701..1e0e57d3 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/HealthCheckDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/HealthCheckDeserializer.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class HealthCheckDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/RequestDeserializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/RequestDeserializer.java index b03204a7..9cb54024 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/RequestDeserializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/deser/RequestDeserializer.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class RequestDeserializer extends StdScalarDeserializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/ExpectationSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/ExpectationSerializer.java index c092830b..1799e414 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/ExpectationSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/ExpectationSerializer.java @@ -23,7 +23,7 @@ import java.io.IOException; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ExpectationSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/HealthCheckSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/HealthCheckSerializer.java index 8caa31dd..d40d78f2 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/HealthCheckSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/HealthCheckSerializer.java @@ -23,7 +23,7 @@ import java.io.IOException; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class HealthCheckSerializer extends StdScalarSerializer { diff --git a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/RequestSerializer.java b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/RequestSerializer.java index 2fcf6380..b30d7b33 100644 --- a/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/RequestSerializer.java +++ b/jackson/src/main/java/io/gravitee/definition/jackson/datatype/services/healthcheck/ser/RequestSerializer.java @@ -23,7 +23,7 @@ import java.io.IOException; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class RequestSerializer extends StdScalarSerializer { diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/AbstractTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/AbstractTest.java index fc164909..25902d8e 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/AbstractTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/AbstractTest.java @@ -15,6 +15,7 @@ */ package io.gravitee.definition.jackson; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.gravitee.definition.jackson.datatype.GraviteeMapper; @@ -22,7 +23,7 @@ import java.net.URL; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public abstract class AbstractTest { @@ -32,6 +33,11 @@ protected T load(String resource, Class type) throws IOException { return objectMapper().readValue(jsonFile, type); } + protected T load(String resource, TypeReference type) throws IOException { + URL jsonFile = this.getClass().getResource(resource); + return objectMapper().readValue(jsonFile, type); + } + protected ObjectMapper objectMapper() { return new GraviteeMapper(); } diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiDeserializerTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiDeserializerTest.java index ac6fdf21..c85240fa 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiDeserializerTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiDeserializerTest.java @@ -26,7 +26,8 @@ import java.util.Map; /** - * @author David BRASSELY (brasseld at gmail.com) + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class ApiDeserializerTest extends AbstractTest { @@ -34,18 +35,20 @@ public class ApiDeserializerTest extends AbstractTest { public void definition_defaultHttpConfig() throws Exception { Api api = load("/io/gravitee/definition/jackson/api-defaulthttpconfig.json", Api.class); - Assert.assertEquals("http://localhost:1234", api.getProxy().getEndpoints().iterator().next().getTarget()); - Assert.assertNotNull(api.getProxy().getHttpClient()); - Assert.assertFalse(api.getProxy().getHttpClient().getOptions().isUseCompression()); + Endpoint endpoint = api.getProxy().getEndpoints().iterator().next(); + Assert.assertEquals("http://localhost:1234", endpoint.getTarget()); + Assert.assertNotNull(endpoint.getHttpClientOptions()); + Assert.assertFalse(endpoint.getHttpClientOptions().isUseCompression()); } @Test public void definition_overridedHttpConfig() throws Exception { Api api = load("/io/gravitee/definition/jackson/api-overridedhttpconfig.json", Api.class); - Assert.assertEquals("http://localhost:1234", api.getProxy().getEndpoints().iterator().next().getTarget()); - Assert.assertNotNull(api.getProxy().getHttpClient().getHttpProxy()); - Assert.assertTrue(api.getProxy().getHttpClient().getHttpProxy().isEnabled()); + Endpoint endpoint = api.getProxy().getEndpoints().iterator().next(); + Assert.assertEquals("http://localhost:1234", endpoint.getTarget()); + Assert.assertNotNull(endpoint.getHttpProxy()); + Assert.assertTrue(endpoint.getHttpProxy().isEnabled()); } @Test(expected = JsonMappingException.class) @@ -259,32 +262,37 @@ public void definition_multipleEndpoints_inSingleEndpoint() throws Exception { @Test public void definition_withclientoptions() throws Exception { Api api = load("/io/gravitee/definition/jackson/api-withclientoptions.json", Api.class); - Assert.assertNotNull(api.getProxy().getHttpClient()); - Assert.assertNotNull(api.getProxy().getHttpClient().getOptions()); - Assert.assertNotNull(api.getProxy().getHttpClient().getSsl()); + + Endpoint endpoint = api.getProxy().getEndpoints().iterator().next(); + Assert.assertNotNull(endpoint.getHttpClientOptions()); + Assert.assertNotNull(endpoint.getHttpClientSslOptions()); } @Test public void definition_withclientoptions_nossl() throws Exception { Api api = load("/io/gravitee/definition/jackson/api-withclientoptions-nossl.json", Api.class); - Assert.assertNotNull(api.getProxy().getHttpClient()); - Assert.assertNotNull(api.getProxy().getHttpClient().getOptions()); - Assert.assertNull(api.getProxy().getHttpClient().getSsl()); + + Endpoint endpoint = api.getProxy().getEndpoints().iterator().next(); + Assert.assertNotNull(endpoint.getHttpClientOptions()); + Assert.assertNull(endpoint.getHttpClientSslOptions()); } @Test public void definition_withclientoptions_nooptions() throws Exception { Api api = load("/io/gravitee/definition/jackson/api-withclientoptions-nooptions.json", Api.class); - Assert.assertNotNull(api.getProxy().getHttpClient()); - Assert.assertNotNull(api.getProxy().getHttpClient().getOptions()); - Assert.assertNull(api.getProxy().getHttpClient().getSsl()); + + Endpoint endpoint = api.getProxy().getEndpoints().iterator().next(); + Assert.assertNotNull(endpoint.getHttpClientOptions()); + Assert.assertNull(endpoint.getHttpClientSslOptions()); } @Test public void definition_withclientoptions_nooptions_defaultconfiguration() throws Exception { Api api = load("/io/gravitee/definition/jackson/api-withclientoptions-nooptions.json", Api.class); - Assert.assertNotNull(api.getProxy().getHttpClient()); - HttpClientOptions options = api.getProxy().getHttpClient().getOptions(); + + Endpoint endpoint = api.getProxy().getEndpoints().iterator().next(); + Assert.assertNotNull(endpoint.getHttpClientOptions()); + HttpClientOptions options = endpoint.getHttpClientOptions(); Assert.assertNotNull(options); Assert.assertEquals(HttpClientOptions.DEFAULT_CONNECT_TIMEOUT, options.getConnectTimeout()); Assert.assertEquals(HttpClientOptions.DEFAULT_IDLE_TIMEOUT, options.getIdleTimeout()); diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiSerializerTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiSerializerTest.java index b3addf05..b3708bb8 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiSerializerTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/api/ApiSerializerTest.java @@ -21,7 +21,8 @@ import org.junit.Test; /** - * @author David BRASSELY (brasseld at gmail.com) + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class ApiSerializerTest extends AbstractTest { diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceDeserializerTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceDeserializerTest.java index 20042779..ae0fadbd 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceDeserializerTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceDeserializerTest.java @@ -15,14 +15,13 @@ */ package io.gravitee.definition.jackson.plugins.resources; -import com.fasterxml.jackson.databind.JsonMappingException; import io.gravitee.definition.jackson.AbstractTest; import io.gravitee.definition.model.Api; import org.junit.Assert; import org.junit.Test; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ResourceDeserializerTest extends AbstractTest { diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceSerializerTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceSerializerTest.java index eb3418a0..e5811e1d 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceSerializerTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/plugins/resources/ResourceSerializerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class ResourceSerializerTest extends AbstractTest { diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckDeserializerTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckDeserializerTest.java index b48d19a8..08f177fe 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckDeserializerTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckDeserializerTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class HealthCheckDeserializerTest extends AbstractTest { diff --git a/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckSerializerTest.java b/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckSerializerTest.java index 7ea09dd2..6e52df64 100644 --- a/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckSerializerTest.java +++ b/jackson/src/test/java/io/gravitee/definition/jackson/services/healthcheck/HealthCheckSerializerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class HealthCheckSerializerTest extends AbstractTest { diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig.json index 15a4f81f..37f96913 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-defaulthttpconfig.json @@ -5,6 +5,7 @@ "context_path": "/my-api", "endpoints": [ { + "name": "default", "target": "http://localhost:1234" } ], diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase.json index 7c4ed3fe..4394a42a 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-failover-singlecase.json @@ -6,8 +6,10 @@ "context_path": "/team", "endpoints": [ { + "name": "endpoint_0", "target": "http://host1:8083/myapi" }, { + "name": "endpoint_1", "target": "http://host2:8083/myapi", "backup": true } diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints-insingleendpoint.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints-insingleendpoint.json index 7395dc75..8dd7656c 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints-insingleendpoint.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints-insingleendpoint.json @@ -6,6 +6,7 @@ "context_path": "/team", "endpoints": [ { + "name": "default", "target": "http://host1:8083/myapi" } ], diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints.json index 30d69414..c2b3c4c6 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-multipleendpoints.json @@ -6,8 +6,10 @@ "context_path": "/team", "endpoints": [ { + "name": "endpoint_0", "target": "http://host1:8083/myapi" }, { + "name": "endpoint_1", "target": "http://host2:8083/myapi" } ], diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig.json index 822de91f..e8ccdbd1 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-overridedhttpconfig.json @@ -6,19 +6,17 @@ "context_path": "/my-api", "endpoints": [ { - "target": "http://localhost:1234" + "name": "default", + "target": "http://localhost:1234", + "proxy": { + "enabled": true, + "host": "proxy_host", + "port": 1234, + "principal": "username", + "password": "my_password" + } } ], - "strip_context_path": false, - - "http": { - "http_proxy": { - "enabled": true, - "host": "proxy_host", - "port": 1234, - "principal": "username", - "password": "my_password" - } - } + "strip_context_path": false } } \ No newline at end of file diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint-inarray.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint-inarray.json index 7395dc75..8dd7656c 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint-inarray.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint-inarray.json @@ -6,6 +6,7 @@ "context_path": "/team", "endpoints": [ { + "name": "default", "target": "http://host1:8083/myapi" } ], diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint.json index 7395dc75..8dd7656c 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-singleendpoint.json @@ -6,6 +6,7 @@ "context_path": "/team", "endpoints": [ { + "name": "default", "target": "http://host1:8083/myapi" } ], diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions.json index 3301fd6f..39d2f490 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nooptions.json @@ -4,7 +4,12 @@ "proxy": { "context_path": "/team", - "endpoint": "http://localhost:8083/myapi", + "endpoints": [ + { + "name": "default", + "target": "http://localhost:8083/myapi" + } + ], "strip_context_path": false, "http": { } diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json index 4e083d87..05ca3b44 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions-nossl.json @@ -4,15 +4,18 @@ "proxy": { "context_path": "/team", - "endpoint": "http://localhost:8083/myapi", - "strip_context_path": false, - "http": { - "configuration": { - "idleTimeout": 5000, - "connectTimeout": 5000, - "keepAlive": true + "endpoints": [ + { + "name": "default", + "target": "http://localhost:8083/myapi", + "http": { + "idleTimeout": 5000, + "connectTimeout": 5000, + "keepAlive": true + } } - } + ], + "strip_context_path": false }, "paths": { diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json index 43b215d4..14acc66b 100644 --- a/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json +++ b/jackson/src/test/resources/io/gravitee/definition/jackson/api-withclientoptions.json @@ -4,20 +4,23 @@ "proxy": { "context_path": "/team", - "endpoint": "http://localhost:8083/myapi", - "strip_context_path": false, - "http": { - "configuration": { - "idleTimeout": 5000, - "connectTimeout": 5000, - "keepAlive": true - }, - "ssl": { - "trustAll": true, - "hostnameVerifier": false, - "pem": "sdfsdfsdfsdfsdfsdfsdfsdf" + "endpoints": [ + { + "name": "default", + "target": "http://localhost:8083/myapi", + "http": { + "idleTimeout": 5000, + "connectTimeout": 5000, + "keepAlive": true + }, + "ssl": { + "trustAll": true, + "hostnameVerifier": false, + "pem": "sdfsdfsdfsdfsdfsdfsdfsdf" + } } - } + ], + "strip_context_path": false }, "paths": { diff --git a/model/src/main/java/io/gravitee/definition/model/Endpoint.java b/model/src/main/java/io/gravitee/definition/model/Endpoint.java index e12edfd6..d7f87907 100644 --- a/model/src/main/java/io/gravitee/definition/model/Endpoint.java +++ b/model/src/main/java/io/gravitee/definition/model/Endpoint.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class Endpoint { diff --git a/model/src/main/java/io/gravitee/definition/model/Failover.java b/model/src/main/java/io/gravitee/definition/model/Failover.java index f3cd2e4f..5981cfb5 100644 --- a/model/src/main/java/io/gravitee/definition/model/Failover.java +++ b/model/src/main/java/io/gravitee/definition/model/Failover.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class Failover { diff --git a/model/src/main/java/io/gravitee/definition/model/FailoverCase.java b/model/src/main/java/io/gravitee/definition/model/FailoverCase.java index 12cb8633..d39f7cec 100644 --- a/model/src/main/java/io/gravitee/definition/model/FailoverCase.java +++ b/model/src/main/java/io/gravitee/definition/model/FailoverCase.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public enum FailoverCase { diff --git a/model/src/main/java/io/gravitee/definition/model/HttpClient.java b/model/src/main/java/io/gravitee/definition/model/HttpClient.java index fb9b9c38..8594cd02 100644 --- a/model/src/main/java/io/gravitee/definition/model/HttpClient.java +++ b/model/src/main/java/io/gravitee/definition/model/HttpClient.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClient { diff --git a/model/src/main/java/io/gravitee/definition/model/HttpClientOptions.java b/model/src/main/java/io/gravitee/definition/model/HttpClientOptions.java index 1db48955..cd4bc594 100644 --- a/model/src/main/java/io/gravitee/definition/model/HttpClientOptions.java +++ b/model/src/main/java/io/gravitee/definition/model/HttpClientOptions.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClientOptions { diff --git a/model/src/main/java/io/gravitee/definition/model/HttpClientSslOptions.java b/model/src/main/java/io/gravitee/definition/model/HttpClientSslOptions.java index 04d9b8eb..e2182d36 100644 --- a/model/src/main/java/io/gravitee/definition/model/HttpClientSslOptions.java +++ b/model/src/main/java/io/gravitee/definition/model/HttpClientSslOptions.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpClientSslOptions { diff --git a/model/src/main/java/io/gravitee/definition/model/HttpProxy.java b/model/src/main/java/io/gravitee/definition/model/HttpProxy.java index 33692f00..91ed665f 100644 --- a/model/src/main/java/io/gravitee/definition/model/HttpProxy.java +++ b/model/src/main/java/io/gravitee/definition/model/HttpProxy.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class HttpProxy { diff --git a/model/src/main/java/io/gravitee/definition/model/HttpProxyType.java b/model/src/main/java/io/gravitee/definition/model/HttpProxyType.java index e3d30b70..c37c21fa 100644 --- a/model/src/main/java/io/gravitee/definition/model/HttpProxyType.java +++ b/model/src/main/java/io/gravitee/definition/model/HttpProxyType.java @@ -17,7 +17,7 @@ /** * @author David BRASSELY (david.brassely at graviteesource.com) - * @author Gravitee.io Team + * @author GraviteeSource Team */ public enum HttpProxyType { diff --git a/model/src/main/java/io/gravitee/definition/model/LoadBalancer.java b/model/src/main/java/io/gravitee/definition/model/LoadBalancer.java index d2858d61..319c2cff 100644 --- a/model/src/main/java/io/gravitee/definition/model/LoadBalancer.java +++ b/model/src/main/java/io/gravitee/definition/model/LoadBalancer.java @@ -16,8 +16,8 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class LoadBalancer { diff --git a/model/src/main/java/io/gravitee/definition/model/LoadBalancerType.java b/model/src/main/java/io/gravitee/definition/model/LoadBalancerType.java index 08c65c7c..809fce6c 100644 --- a/model/src/main/java/io/gravitee/definition/model/LoadBalancerType.java +++ b/model/src/main/java/io/gravitee/definition/model/LoadBalancerType.java @@ -16,7 +16,7 @@ package io.gravitee.definition.model; /** - * @author David BRASSELY (brasseld at gmail.com) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public enum LoadBalancerType { diff --git a/model/src/main/java/io/gravitee/definition/model/Path.java b/model/src/main/java/io/gravitee/definition/model/Path.java index 69984fa2..12047151 100644 --- a/model/src/main/java/io/gravitee/definition/model/Path.java +++ b/model/src/main/java/io/gravitee/definition/model/Path.java @@ -19,8 +19,8 @@ import java.util.List; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class Path { private String path; diff --git a/model/src/main/java/io/gravitee/definition/model/Policy.java b/model/src/main/java/io/gravitee/definition/model/Policy.java index 5a61e0eb..cdc54f8f 100644 --- a/model/src/main/java/io/gravitee/definition/model/Policy.java +++ b/model/src/main/java/io/gravitee/definition/model/Policy.java @@ -18,8 +18,8 @@ import java.util.Objects; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class Policy { diff --git a/model/src/main/java/io/gravitee/definition/model/Proxy.java b/model/src/main/java/io/gravitee/definition/model/Proxy.java index 05e15209..1dbebbd0 100644 --- a/model/src/main/java/io/gravitee/definition/model/Proxy.java +++ b/model/src/main/java/io/gravitee/definition/model/Proxy.java @@ -19,8 +19,8 @@ import java.util.List; /** - * @author David BRASSELY (brasseld at gmail.com) - * @author Gravitee.io Team + * @author David BRASSELY (david.brassely at graviteesource.com) + * @author GraviteeSource Team */ public class Proxy { @@ -38,8 +38,6 @@ public class Proxy { private boolean dumpRequest = DEFAULT_DUMP_REQUEST; - private HttpClient httpClient = new HttpClient(); - public String getContextPath() { return contextPath; } @@ -64,14 +62,6 @@ public void setStripContextPath(boolean stripContextPath) { this.stripContextPath = stripContextPath; } - public HttpClient getHttpClient() { - return httpClient; - } - - public void setHttpClient(HttpClient httpClient) { - this.httpClient = httpClient; - } - public LoadBalancer getLoadBalancer() { return loadBalancer; } diff --git a/model/src/main/java/io/gravitee/definition/model/Rule.java b/model/src/main/java/io/gravitee/definition/model/Rule.java index 5d760adb..8d64524b 100644 --- a/model/src/main/java/io/gravitee/definition/model/Rule.java +++ b/model/src/main/java/io/gravitee/definition/model/Rule.java @@ -21,7 +21,7 @@ import java.util.List; /** - * @author David BRASSELY (david at graviteesource.com) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class Rule { diff --git a/model/src/main/java/io/gravitee/definition/model/Service.java b/model/src/main/java/io/gravitee/definition/model/Service.java index 73f11b1f..1aa5f6a5 100644 --- a/model/src/main/java/io/gravitee/definition/model/Service.java +++ b/model/src/main/java/io/gravitee/definition/model/Service.java @@ -18,7 +18,7 @@ import java.util.Objects; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public abstract class Service { diff --git a/model/src/main/java/io/gravitee/definition/model/plugins/resources/Resource.java b/model/src/main/java/io/gravitee/definition/model/plugins/resources/Resource.java index 1d8e4ea3..5a3f5415 100644 --- a/model/src/main/java/io/gravitee/definition/model/plugins/resources/Resource.java +++ b/model/src/main/java/io/gravitee/definition/model/plugins/resources/Resource.java @@ -18,7 +18,7 @@ import java.util.Objects; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class Resource { diff --git a/model/src/main/java/io/gravitee/definition/model/services/Services.java b/model/src/main/java/io/gravitee/definition/model/services/Services.java index 9f8951f9..849ceaa5 100644 --- a/model/src/main/java/io/gravitee/definition/model/services/Services.java +++ b/model/src/main/java/io/gravitee/definition/model/services/Services.java @@ -23,7 +23,7 @@ import java.util.function.Consumer; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public final class Services { diff --git a/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Expectation.java b/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Expectation.java index df5b680b..08aa9555 100644 --- a/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Expectation.java +++ b/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Expectation.java @@ -18,7 +18,7 @@ import java.util.List; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class Expectation { diff --git a/model/src/main/java/io/gravitee/definition/model/services/healthcheck/HealthCheck.java b/model/src/main/java/io/gravitee/definition/model/services/healthcheck/HealthCheck.java index ccd5449e..15f6fafa 100644 --- a/model/src/main/java/io/gravitee/definition/model/services/healthcheck/HealthCheck.java +++ b/model/src/main/java/io/gravitee/definition/model/services/healthcheck/HealthCheck.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class HealthCheck extends Service { diff --git a/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Request.java b/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Request.java index 59242a6c..a6f6f7d3 100644 --- a/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Request.java +++ b/model/src/main/java/io/gravitee/definition/model/services/healthcheck/Request.java @@ -21,7 +21,7 @@ import java.util.List; /** - * @author David BRASSELY (david at gravitee.io) + * @author David BRASSELY (david.brassely at graviteesource.com) * @author GraviteeSource Team */ public class Request {