fix: could not create api from scratch with plan

fix gravitee-io/issues#973
gravitee-io · Jan 4, 2018 · 77dc680 · 77dc680
1 parent 56b83a0
commit 77dc680
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/gravitee-management-api-model/src/main/java/io/gravitee/management/model/plan/PlanQuery.java b/gravitee-management-api-model/src/main/java/io/gravitee/management/model/plan/PlanQuery.java
@@ -15,7 +15,7 @@
  */
 package io.gravitee.management.model.plan;
 
-import io.gravitee.management.model.PlanType;
+import io.gravitee.management.model.PlanSecurityType;
 
 /**
  * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) 
@@ -25,12 +25,12 @@ public class PlanQuery {
 
     private String api;
     private String name;
-    private PlanType type;
+    private PlanSecurityType security;
 
     private PlanQuery(Builder builder) {
         api = builder.api;
         name = builder.name;
-        type = builder.type;
+        security = builder.security;
     }
 
     public String getApi() {
@@ -41,14 +41,14 @@ public String getName() {
         return name;
     }
 
-    public PlanType getType() {
-        return type;
+    public PlanSecurityType getSecurity() {
+        return security;
     }
 
     public static class Builder {
         private String api;
         private String name;
-        private PlanType type;
+        private PlanSecurityType security;
 
         public PlanQuery build() {
             return new PlanQuery(this);
@@ -64,8 +64,8 @@ public Builder name(String name) {
             return this;
         }
 
-        public Builder type(PlanType type) {
-            this.type = type;
+        public Builder security(PlanSecurityType security) {
+            this.security = security;
             return this;
         }
     }

diff --git a/...agement-api-service/src/main/java/io/gravitee/management/service/impl/ApiServiceImpl.java b/...agement-api-service/src/main/java/io/gravitee/management/service/impl/ApiServiceImpl.java
@@ -766,7 +766,7 @@ public ApiEntity createOrUpdateWithDefinition(final ApiEntity apiEntity, String
                     PlanQuery query = new PlanQuery.Builder().
                             api(createdOrUpdatedApiEntity.getId()).
                             name(planNode.get("name").asText()).
-                            type(PlanType.valueOf(planNode.get("type").asText())).
+                            security(PlanSecurityType.valueOf(planNode.get("security").asText())).
                             build();
                     List<PlanEntity> planEntities = planService.search(query);
                     if (planEntities == null || planEntities.isEmpty()) {

diff --git a/...gement-api-service/src/main/java/io/gravitee/management/service/impl/PlanServiceImpl.java b/...gement-api-service/src/main/java/io/gravitee/management/service/impl/PlanServiceImpl.java
@@ -122,8 +122,8 @@ public List<PlanEntity> search(final PlanQuery query) {
                     if (query.getName() != null) {
                         filtered = p.getName().equals(query.getName());
                     }
-                    if (filtered && query.getType() != null) {
-                        filtered = p.getType().equals(query.getType());
+                    if (filtered && query.getSecurity() != null) {
+                        filtered = p.getSecurity().equals(query.getSecurity());
                     }
                     return filtered;
                 }).