feat(tree): fetch pages recursively

fix gravitee-io/issues#1565

gravitee-management-api-fetcher/src/test/java/io/gravitee/management/fetcher/DummyFetcherConfiguration.java

@@ -16,12 +16,13 @@
 package io.gravitee.management.fetcher;
 
 import io.gravitee.fetcher.api.FetcherConfiguration;
+import io.gravitee.fetcher.api.FilepathAwareFetcherConfiguration;
 
 /**
- * @author Nicolas GERAUD (nicolas.geraud [at] graviteesource [dot] com) 
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com)
  * @author GraviteeSource Team
  */
-public class DummyFetcherConfiguration implements FetcherConfiguration {
+public class DummyFetcherConfiguration implements FetcherConfiguration, FilepathAwareFetcherConfiguration {
 
     private int value;
 
@@ -32,4 +33,12 @@ public int getValue() {
     public void setValue(int value) {
         this.value = value;
     }
+
+    public String getFilepath() {
+        return null;
+    }
+
+    public void setFilepath(String filepath) {
+
+    }
 }

gravitee-management-api-model/src/main/java/io/gravitee/management/model/ImportPageEntity.java

@@ -0,0 +1,99 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.management.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com)
+ * @author GraviteeSource Team
+ */
+public class ImportPageEntity {
+
+	@NotNull
+	private PageType type;
+	private boolean published;
+	private String lastContributor;
+	private PageSourceEntity source;
+	private Map<String, String> configuration;
+	@JsonProperty("excluded_groups")
+	private List<String> excludedGroups;
+
+	public PageType getType() {
+		return type;
+	}
+
+	public void setType(PageType type) {
+		this.type = type;
+	}
+
+	public boolean isPublished() {
+		return published;
+	}
+
+	public void setPublished(boolean published) {
+		this.published = published;
+	}
+
+	public String getLastContributor() {
+		return lastContributor;
+	}
+
+	public void setLastContributor(String lastContributor) {
+		this.lastContributor = lastContributor;
+	}
+
+	public PageSourceEntity getSource() {
+		return source;
+	}
+
+	public void setSource(PageSourceEntity source) {
+		this.source = source;
+	}
+
+	public Map<String, String> getConfiguration() {
+		return configuration;
+	}
+
+	public void setConfiguration(Map<String, String> configuration) {
+		this.configuration = configuration;
+	}
+
+	public List<String> getExcludedGroups() {
+		return excludedGroups;
+	}
+
+	public void setExcludedGroups(List<String> excludedGroups) {
+		this.excludedGroups = excludedGroups;
+	}
+
+	@Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("Page{");
+        sb.append("type='").append(type).append('\'');
+        sb.append(", published='").append(published).append('\'');
+        sb.append(", lastContributor='").append(lastContributor).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+
+}

gravitee-management-api-model/src/main/java/io/gravitee/management/model/PageType.java

@@ -15,16 +15,32 @@
  */
 package io.gravitee.management.model;
 
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+
 /**
  * @author Ludovic Dussart (ludovic.dussart at gmail.com)
- * @author Guillaume GILLON 
+ * @author Guillaume GILLON
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com)
  * Managed types for page documentation
  *
  */
 public enum PageType {
 
-	MARKDOWN,
-	RAML,
-	SWAGGER,
-	FOLDER
+	MARKDOWN(unmodifiableList(asList("md", "markdown"))),
+	SWAGGER(unmodifiableList(asList("json", "yaml", "yml"))),
+	FOLDER(emptyList()),
+	ROOT(emptyList());
+
+	List<String> extensions;
+	PageType(List<String> extensions) {
+		this.extensions = extensions;
+	}
+
+	public List<String> extensions() {
+		return extensions;
+	}
 }

gravitee-management-api-model/src/main/java/io/gravitee/management/model/descriptor/GraviteeDescriptorDocumentationEntity.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.management.model.descriptor;
+
+import java.util.List;
+
+/**
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) 
+ * @author GraviteeSource Team
+ */
+public class GraviteeDescriptorDocumentationEntity {
+    private List<GraviteeDescriptorPageEntity> pages;
+
+    public List<GraviteeDescriptorPageEntity> getPages() {
+        return pages;
+    }
+
+    public void setPages(List<GraviteeDescriptorPageEntity> pages) {
+        this.pages = pages;
+    }
+}

gravitee-management-api-model/src/main/java/io/gravitee/management/model/descriptor/GraviteeDescriptorEntity.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.management.model.descriptor;
+
+/**
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) 
+ * @author GraviteeSource Team
+ */
+public class GraviteeDescriptorEntity {
+    private int version;
+    private GraviteeDescriptorDocumentationEntity documentation;
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public GraviteeDescriptorDocumentationEntity getDocumentation() {
+        return documentation;
+    }
+
+    public void setDocumentation(GraviteeDescriptorDocumentationEntity documentation) {
+        this.documentation = documentation;
+    }
+}

gravitee-management-api-model/src/main/java/io/gravitee/management/model/descriptor/GraviteeDescriptorPageEntity.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.management.model.descriptor;
+
+/**
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) 
+ * @author GraviteeSource Team
+ */
+public class GraviteeDescriptorPageEntity {
+    private String src;
+    private String dest;
+    private String name;
+    private boolean homepage;
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getDest() {
+        return dest;
+    }
+
+    public void setDest(String dest) {
+        this.dest = dest;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isHomepage() {
+        return homepage;
+    }
+
+    public void setHomepage(boolean homepage) {
+        this.homepage = homepage;
+    }
+}

gravitee-management-api-rest/src/main/java/io/gravitee/management/rest/resource/ApiPagesResource.java

@@ -16,10 +16,7 @@
 package io.gravitee.management.rest.resource;
 
 import io.gravitee.common.http.MediaType;
-import io.gravitee.management.model.NewPageEntity;
-import io.gravitee.management.model.PageEntity;
-import io.gravitee.management.model.PageType;
-import io.gravitee.management.model.Visibility;
+import io.gravitee.management.model.*;
 import io.gravitee.management.model.api.ApiEntity;
 import io.gravitee.management.model.documentation.PageQuery;
 import io.gravitee.management.model.permissions.RolePermission;
@@ -115,7 +112,7 @@ public Response createPage(
         int order = pageService.findMaxApiPageOrderByApi(api) + 1;
         newPageEntity.setOrder(order);
         newPageEntity.setLastContributor(getAuthenticatedUser());
-        PageEntity newPage = pageService.createApiPage(api, newPageEntity);
+        PageEntity newPage = pageService.createPage(api, newPageEntity);
         if (newPage != null) {
             return Response
                     .created(URI.create("/apis/" + api + "/pages/" + newPage.getId()))
@@ -155,6 +152,44 @@ public ApiPageResource getApiPageResource() {
         return resourceContext.getResource(ApiPageResource.class);
     }
 
+    @POST
+    @Path("/_import")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Import pages",
+            notes = "User must be ADMIN to use this service")
+    @ApiResponses({
+            @ApiResponse(code = 201, message = "Page successfully created", response = PageEntity.class),
+            @ApiResponse(code = 500, message = "Internal server error")})
+    @Permissions({
+            @Permission(value = RolePermission.API_DOCUMENTATION, acls = RolePermissionAction.CREATE)
+    })
+    public List<PageEntity> importFiles(
+            @PathParam("api") String api,
+            @ApiParam(name = "page", required = true) @Valid @NotNull ImportPageEntity pageEntity) {
+        pageEntity.setLastContributor(getAuthenticatedUser());
+        return pageService.importFiles(api, pageEntity);
+    }
+
+    @PUT
+    @Path("/_import")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Import pages",
+            notes = "User must be ADMIN to use this service")
+    @ApiResponses({
+            @ApiResponse(code = 201, message = "Page successfully updated", response = PageEntity.class),
+            @ApiResponse(code = 500, message = "Internal server error")})
+    @Permissions({
+            @Permission(value = RolePermission.API_DOCUMENTATION, acls = RolePermissionAction.CREATE)
+    })
+    public List<PageEntity> updateImportFiles(
+            @PathParam("api") String api,
+            @ApiParam(name = "page", required = true) @Valid @NotNull ImportPageEntity pageEntity) {
+        pageEntity.setLastContributor(getAuthenticatedUser());
+        return pageService.importFiles(api, pageEntity);
+    }
+
     private boolean isDisplayable(ApiEntity api, boolean isPagePublished, List<String> excludedGroups) {
         return (isAuthenticated() && isAdmin())
                 ||

gravitee-management-api-rest/src/main/java/io/gravitee/management/rest/resource/FetchersResource.java

@@ -30,6 +30,7 @@
 import javax.ws.rs.container.ResourceContext;
 import javax.ws.rs.core.Context;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -70,7 +71,7 @@ public Collection<FetcherListItem> list(@QueryParam("expand") List<String> expan
         }
 
         return stream
-                .sorted((o1, o2) -> o1.getName().compareTo(o2.getName()))
+                .sorted(Comparator.comparing(FetcherListItem::getName))
                 .collect(Collectors.toList());
     }