CODENY-367 fix openWelcomePage required parameter name (#1037)

Signed-off-by: Max Shaposhnik <mshaposhnik@codenvy.com>
eclipse-che · Apr 14, 2016 · ac01f2b · ac01f2b
1 parent d2f6883
commit ac01f2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...e-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/FactoryConstants.java b/...e-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/FactoryConstants.java
@@ -70,8 +70,7 @@ public class FactoryConstants {
     public static final String INVALID_FIND_REPLACE_ACTION = "The findReplace action requires 'in', " +
                                                              "'find' and 'replace' properties to be set.";
 
-    public static final String INVALID_WELCOME_PAGE_ACTION = "The openWelcomePage action requires 'nonAuthenticatedContentUrl', " +
-                                                             "'authenticatedContentUrl' properties to be set.";
+    public static final String INVALID_WELCOME_PAGE_ACTION = "The openWelcomePage action requires 'greetingContentUrl' property to be set.";
 
     public static final String ILLEGAL_REQUIRE_AUTHENTICATION_FOR_NAMED_WORKSPACE_MESSAGE =
             "This factory was improperly configured. The parameter 'workspace.type=named' requires 'policies.requireAuthentication=true'.";

diff --git a/...i-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java b/...i-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java
@@ -222,9 +222,7 @@ protected void validateProjectActions(Factory factory) throws BadRequestExceptio
         if (onAppLoaded != null) {
             for (Action action : onAppLoaded.getActions()) {
                 final Map<String, String> properties = action.getProperties();
-                if ("openWelcomePage".equals(action.getId()) && (isNullOrEmpty(properties.get("nonAuthenticatedContentUrl")) ||
-                                                                 isNullOrEmpty(properties.get("authenticatedContentUrl")))) {
-
+                if ("openWelcomePage".equals(action.getId()) && isNullOrEmpty(properties.get("greetingContentUrl"))) {
                     throw new BadRequestException(FactoryConstants.INVALID_WELCOME_PAGE_ACTION);
                 }
             }