feat(policy): Enable / disable a policy rule

Ref: gravitee-io/issues#204
gravitee-io · Sep 4, 2016 · 91fd555 · 91fd555
1 parent 0094a22
commit 91fd555
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/...son/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/RuleDeserializer.java b/...son/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/RuleDeserializer.java
@@ -63,15 +63,15 @@ public Rule deserialize(JsonParser jp, DeserializationContext ctxt) throws IOExc
                         rule.setDescription(subNode.asText());
                     }
                     break;
+                case "enabled":
+                    if (subNode != null) {
+                        rule.setEnabled(subNode.asBoolean(true));
+                    }
+                    break;
                 default:
                     // We are in the case of a policy
                     Policy policy = new Policy();
 
-                    JsonNode enabledNode = subNode.get("enabled");
-                    if (enabledNode != null && enabledNode.isBoolean()) {
-                        policy.setEnabled(enabledNode.asBoolean());
-                    }
-
                     policy.setName(field);
                     policy.setConfiguration(subNode.toString());
 

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
@@ -53,6 +53,8 @@ public void serialize(Rule rule, JsonGenerator jgen, SerializerProvider provider
                 jgen.writeStringField("description", rule.getDescription());
             }
 
+            jgen.writeBooleanField("enabled", rule.isEnabled());
+
             jgen.writeEndObject();
         }
     }

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
@@ -143,13 +143,19 @@ public void definition_pathwithpolicies() throws Exception {
     public void definition_pathwithpolicies_disabled() throws Exception {
         Api api = load("/io/gravitee/definition/jackson/api-defaultpath.json", Api.class);
         Map<String, Path> paths = api.getPaths();
-        List<Rule> rules= paths.get("/*").getRules();
+        List<Rule> rules = paths.get("/*").getRules();
 
-        Policy policy = rules.iterator().next().getPolicy();
+        Rule accessControlRule = rules.get(0);
+        Policy policy = accessControlRule.getPolicy();
         Assert.assertNotNull(policy);
-
         Assert.assertEquals("access-control", policy.getName());
-        Assert.assertFalse(policy.isEnabled());
+        Assert.assertFalse(accessControlRule.isEnabled());
+
+        Rule corsRule = rules.get(1);
+        policy = corsRule.getPolicy();
+        Assert.assertNotNull(policy);
+        Assert.assertEquals("cors", policy.getName());
+        Assert.assertTrue(corsRule.isEnabled());
     }
 
     @Test

diff --git a/jackson/src/test/resources/io/gravitee/definition/jackson/api-defaultpath.json b/jackson/src/test/resources/io/gravitee/definition/jackson/api-defaultpath.json
@@ -12,14 +12,14 @@
     "/*": [
       {
         "methods": ["GET", "POST"],
+        "enabled": false,
         "access-control": {
-          "enabled": false
         }
       },
       {
         "methods": ["GET", "POST"],
+        "enabled": true,
         "cors": {
-          "enabled": false
         }
       },
       {

diff --git a/model/src/main/java/io/gravitee/definition/model/Policy.java b/model/src/main/java/io/gravitee/definition/model/Policy.java
@@ -23,8 +23,6 @@
  */
 public class Policy {
 
-    private boolean enabled = true;
-
     private String name;
 
     private String configuration;
@@ -45,14 +43,6 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/model/src/main/java/io/gravitee/definition/model/Rule.java b/model/src/main/java/io/gravitee/definition/model/Rule.java
@@ -21,8 +21,8 @@
 import java.util.List;
 
 /**
- * @author David BRASSELY (brasseld at gmail.com)
- * @author Gravitee.io Team
+ * @author David BRASSELY (david at graviteesource.com)
+ * @author GraviteeSource Team
  */
 public class Rule {
 
@@ -32,6 +32,8 @@ public class Rule {
 
     private String description;
 
+    private boolean enabled = true;
+
     public List<HttpMethod> getMethods() {
         return methods;
     }
@@ -55,4 +57,12 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
 }