From a7d6b959b624152648cd65d956e96246c0b8dbf6 Mon Sep 17 00:00:00 2001
From: brasseld <brasseld@gmail.com>
Date: Thu, 1 Dec 2016 17:50:29 +0100
Subject: [PATCH] fix(page): Creating page is requiring a page's type

Closes gravitee-io/issues#351
---
 .../gravitee/management/model/NewPageEntity.java   | 14 ++++++++------
 .../management/service/impl/PageServiceImpl.java   |  4 ++--
 .../management/service/PageServiceTest.java        |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/gravitee-management-api-model/src/main/java/io/gravitee/management/model/NewPageEntity.java b/gravitee-management-api-model/src/main/java/io/gravitee/management/model/NewPageEntity.java
index b914cd7446..6e3fefa6d3 100644
--- a/gravitee-management-api-model/src/main/java/io/gravitee/management/model/NewPageEntity.java
+++ b/gravitee-management-api-model/src/main/java/io/gravitee/management/model/NewPageEntity.java
@@ -19,15 +19,17 @@
 import javax.validation.constraints.Size;
 
 /**
- * @author Titouan COMPIEGNE
+ * @author Titouan COMPIEGNE (titouan.compiegne at graviteesource.com)
+ * @author GraviteeSource Team
  */
 public class NewPageEntity {
 
 	@NotNull
 	@Size(min = 1)
 	private String name;
-	
-	private String type;
+
+	@NotNull
+	private PageType type;
 	
 	private String content;
 	
@@ -46,12 +48,12 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getType() {
+
+	public PageType getType() {
 		return type;
 	}
 
-	public void setType(String type) {
+	public void setType(PageType type) {
 		this.type = type;
 	}
 
diff --git a/gravitee-management-api-service/src/main/java/io/gravitee/management/service/impl/PageServiceImpl.java b/gravitee-management-api-service/src/main/java/io/gravitee/management/service/impl/PageServiceImpl.java
index 4ba4a0d243..ae3a119faa 100644
--- a/gravitee-management-api-service/src/main/java/io/gravitee/management/service/impl/PageServiceImpl.java
+++ b/gravitee-management-api-service/src/main/java/io/gravitee/management/service/impl/PageServiceImpl.java
@@ -334,9 +334,9 @@ private static Page convert(NewPageEntity newPageEntity) {
 		Page page = new Page();
 
 		page.setName(newPageEntity.getName());
-		final String type = newPageEntity.getType();
+		final PageType type = newPageEntity.getType();
 		if (type != null) {
-			page.setType(io.gravitee.repository.management.model.PageType.valueOf(type));
+			page.setType(io.gravitee.repository.management.model.PageType.valueOf(type.name()));
 		}
 		page.setContent(newPageEntity.getContent());
 		page.setLastContributor(newPageEntity.getLastContributor());
diff --git a/gravitee-management-api-service/src/test/java/io/gravitee/management/service/PageServiceTest.java b/gravitee-management-api-service/src/test/java/io/gravitee/management/service/PageServiceTest.java
index 7f63084688..8ba4dde8b5 100644
--- a/gravitee-management-api-service/src/test/java/io/gravitee/management/service/PageServiceTest.java
+++ b/gravitee-management-api-service/src/test/java/io/gravitee/management/service/PageServiceTest.java
@@ -164,7 +164,7 @@ public void shouldCreatePage() throws TechnicalException {
         when(newPage.getOrder()).thenReturn(1);
         when(newPage.getContent()).thenReturn(content);
         when(newPage.getLastContributor()).thenReturn(contrib);
-        when(newPage.getType()).thenReturn(type);
+        when(newPage.getType()).thenReturn(io.gravitee.management.model.PageType.SWAGGER);
 
         final PageEntity createdPage = pageService.create(API_ID, newPage);
 
@@ -176,7 +176,7 @@ public boolean matches(Object argument) {
                     name.equals(pageToCreate.getName()) &&
                     contrib.equals(pageToCreate.getLastContributor()) &&
                     content.equals(pageToCreate.getContent()) &&
-                    type.equals(pageToCreate.getType().name()) &&
+                    io.gravitee.management.model.PageType.SWAGGER.name().equals(pageToCreate.getType().name()) &&
                     pageToCreate.getCreatedAt() != null &&
                     pageToCreate.getUpdatedAt() != null &&
                     pageToCreate.getCreatedAt().equals(pageToCreate.getUpdatedAt());