From 457012daaf3bbe51b4da4918abb22f64752faa7e Mon Sep 17 00:00:00 2001 From: Sajith Janaprasad Date: Tue, 19 Dec 2017 16:31:18 +0530 Subject: [PATCH 1/3] bump carbon deployment version to v5.2.0 --- .../uiserver/internal/io/deployment/ArtifactAppDeployer.java | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/deployment/ArtifactAppDeployer.java b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/deployment/ArtifactAppDeployer.java index edc53a7..8851d73 100644 --- a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/deployment/ArtifactAppDeployer.java +++ b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/deployment/ArtifactAppDeployer.java @@ -95,7 +95,7 @@ public Object deploy(Artifact artifact) throws CarbonDeploymentException { previouslyCreatedOverridableApp.get(), createdApp); publishAppUndeploymentEvent(previouslyCreatedOverridableApp.get()); appRegistry.add(createdApp); - deployingApp = new OverriddenApp(createdApp, previouslyCreatedOverridableApp.get()); + deployingApp = new OverriddenApp(previouslyCreatedOverridableApp.get(), createdApp); } else { deployingApp = createdApp; } diff --git a/pom.xml b/pom.xml index ea3811c..b95085e 100644 --- a/pom.xml +++ b/pom.xml @@ -366,8 +366,8 @@ 1.1.0 - 5.1.9 - [5.1.9, 6.0.0) + 5.2.0 + [5.2.0, 6.0.0) 2.1.5 From 37e45fac58a8bde156dfd48a11bbf3afa821bad7 Mon Sep 17 00:00:00 2001 From: Sajith Janaprasad Date: Tue, 19 Dec 2017 16:34:31 +0530 Subject: [PATCH 2/3] don't throw exception when pages directory is absent in a web app This reverts commit 84ac31fa37ef3eef835986f9935df72fe862539a --- .../internal/io/reference/ArtifactAppReference.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/reference/ArtifactAppReference.java b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/reference/ArtifactAppReference.java index 4d95a97..227e627 100644 --- a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/reference/ArtifactAppReference.java +++ b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/io/reference/ArtifactAppReference.java @@ -64,19 +64,16 @@ public String getName() throws FileOperationException { public Set getPageReferences() throws FileOperationException { Path pages = getPagesDirectory(); if (!Files.exists(pages)) { - throw new FileOperationException( - "Cannot find '" + DIR_NAME_PAGES + "' directory in app '" + appDirectory + "'."); + return Collections.emptySet(); } - Set pageReferences; try { - pageReferences = Files.walk(pages) + return Files.walk(pages) .filter(Files::isRegularFile) .map(pageFile -> new ArtifactPageReference(pageFile, this)) .collect(Collectors.toSet()); } catch (IOException e) { throw new FileOperationException("An error occurred while listing pages in '" + pages + "'.", e); } - return pageReferences; } @Override From 75448110c5cf690ea8254c3682569e7b5502e48b Mon Sep 17 00:00:00 2001 From: Sajith Janaprasad Date: Tue, 19 Dec 2017 16:41:12 +0530 Subject: [PATCH 3/3] don't throw exception when there are no pages in a web app This reverts commit fdf0e65e81275a77a180d787f7d5f2d07930c158. # Conflicts: # components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java # components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java --- .../uiserver/internal/deployment/AppCreator.java | 4 ---- .../uiserver/internal/deployment/AppCreatorTest.java | 11 ++--------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java index a4d9cc8..5156822 100644 --- a/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java +++ b/components/org.wso2.carbon.uiserver/src/main/java/org/wso2/carbon/uiserver/internal/deployment/AppCreator.java @@ -89,10 +89,6 @@ private static SortedSet createPages(AppReference appReference) { List pages = appReference.getPageReferences().stream() .map(AppCreator::createPage) .collect(Collectors.toList()); - if (pages.isEmpty()) { - throw new AppCreationException("App '" + appReference.getName() + "' does not contains any pages."); - } - // TODO: 10/13/17 remove following workaround after adding support for URI patterns with * in UriPatten class if ((pages.size() == 1) && (pages.get(0).getUriPatten().matches("/index"))) { final Page indexPage = pages.get(0); diff --git a/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java b/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java index afaf568..cdb44b9 100644 --- a/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java +++ b/components/org.wso2.carbon.uiserver/src/test/java/org/wso2/carbon/uiserver/internal/deployment/AppCreatorTest.java @@ -22,7 +22,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.wso2.carbon.uiserver.api.App; -import org.wso2.carbon.uiserver.internal.exception.AppCreationException; import org.wso2.carbon.uiserver.internal.io.reference.ArtifactAppReference; import org.wso2.carbon.uiserver.internal.reference.AppReference; @@ -39,7 +38,8 @@ public class AppCreatorTest { public Object[][] appReferences() { return new Object[][]{ {new ArtifactAppReference(Paths.get("src/test/resources/apps/full-app/"))}, - {new ArtifactAppReference(Paths.get("src/test/resources/apps/minimal-app/"))} + {new ArtifactAppReference(Paths.get("src/test/resources/apps/minimal-app/"))}, + {new ArtifactAppReference(Paths.get("src/test/resources/apps/empty-app/"))} }; } @@ -48,11 +48,4 @@ public void testCreateApp(AppReference appReference) { App app = AppCreator.createApp(appReference, "/test"); Assert.assertNotNull(app); } - - @Test - public void testCreateAppWithEmptyDirectory() { - AppReference appReference = new ArtifactAppReference(Paths.get("src/test/resources/apps/empty-app/")); - Assert.assertThrows(AppCreationException.class, - () -> AppCreator.createApp(appReference, "/test")); - } }