feat(plan): Implementation of Plans

Closes gravitee-io/issues#257

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 {

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 {

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 {

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<T> extends StdScalarDeserializer<T> {
 

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<Api> {
 

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");

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<Failover> {
 

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<HttpClient> {
 

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<HttpClientSslOptions> {
 

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<HttpProxy> {
 

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<LoadBalancer> {
 

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<Path> {
 

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<Policy> {
 
@@ -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;
     }

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);

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<Rule> {
 

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<Api> {
 

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<Endpoint> {

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<Failover> {
 

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<HttpClient> {
 

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<HttpClientSslOptions> {
 

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<HttpProxy> {
 

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<LoadBalancer> {
 

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<Path> {
 

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<Policy> {
 

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();
     }
 }

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<Rule> {
 

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 {

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<Resource> {

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<Resource> {

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 {

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<Service> {

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<Services> {
@@ -71,21 +71,5 @@ public Services deserialize(JsonParser jp, DeserializationContext ctxt) throws I
         services.set(individualServices);
 
         return services;
-
-/*
-        String serviceName = node.fieldNames().next();
-
-        Class<? extends Service> serviceClass = registeredServices.get(serviceName);
-        if (serviceClass == null) {
-            return null;
-        }
-
-        return node.elements().next().traverse(jp.getCodec()).readValueAs(new TypeReference<Service>() {
-            @Override
-            public Type getType() {
-                return serviceClass;
-            }
-        });
-*/
     }
 }