Ui configs

.travis.yml

@@ -24,6 +24,7 @@ before_install:
   - sudo rm /dev/random
   - sudo mknod /dev/random c 1 9
   # for gui tests
+  - export DBUS_SESSION_BUS_ADDRESS=/dev/null
   - export CHROME_BIN=/usr/bin/google-chrome
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -33,9 +34,9 @@ before_install:
 
 install:
   #install and run tests and run style checking
-  - mvn install -P travis
+  - mvn clean install -P travis
   - cd ui-testing
-  - mvn install -DskipTests
+  - mvn clean install -DskipTests
   - cd ..
 
 script:
@@ -66,9 +67,12 @@ script:
   - mvn tomcat7:run-war-only -P travis &
   - sleep 30
 
-  - cd ../ui-testing
-  - mvn test -P travis &
+  - cd ../selector-service
+  - mvn spring-boot:run &
   - sleep 30
 
+  - cd ../ui-testing
+  - mvn test -P travis
+
 notifications:
   slack: qreal-web:sT5qgA4qZZ9eyLI0yy2Mp81E

Travis/callTomcat.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+iter=1
+all=120
+until [ "$(curl --silent --show-error --connect-timeout 1 -I http://localhost:"${1:-"8080"}"/auth | grep '302 Found')" != "" ];
+do
+  if [ "$iter" -lt "$all" ]
+  then
+    echo "--- sleeping for 10 seconds"
+    sleep 10
+    let iter=$iter+1
+  else
+    echo "Server didn't return 302 found for long time"
+    exit 1
+  fi
+done
+echo "auth-service found"
+iter=1
+all=120
+until [ "$(curl --silent --show-error --connect-timeout 1 -I http://localhost:"${2:-"8082"}"/dashboard | grep '302 Found')" != "" ];
+do
+  if [ "$iter" -lt "$all" ]
+  then
+    echo "--- sleeping for 10 seconds"
+    sleep 10
+    let iter=$iter+1
+  else
+    echo "Server didn't return 302 found for long time"
+    exit 1
+  fi
+done
+echo "dashboard-service found"
+iter=1
+all=120
+until [ "$(curl --silent --show-error --connect-timeout 1 -I http://localhost:"${3:-"8081"}"/editor | grep '302 Found')" != "" ];
+do
+  if [ "$iter" -lt "$all" ]
+  then
+    echo "--- sleeping for 10 seconds"
+    sleep 10
+    let iter=$iter+1
+  else
+    echo "Server didn't return 302 found for long time"
+    exit 1
+  fi
+done
+echo "editor-service found"
+exit 0

Travis/checkstyle/checkstyle.xml

@@ -29,7 +29,9 @@
 
     <module name="TreeWalker">
 
-      <module name="SeparatorWrap" />
+        <module name="SeparatorWrap">
+            <property name="tokens" value="COMMA"/>
+        </module>
 
         <!-- Checks that the outer type name and the file name match. For example, the class Foo must be in a file named Foo.java -->
         <module name="OuterTypeFilename"/>
@@ -68,9 +70,9 @@
             <property name="allowEmptyTypes" value="true"/>
             <property name="allowEmptyLoops" value="true"/>
             <message key="ws.notFollowed"
-             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-             <message key="ws.notPreceded"
-             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
         </module>
         <!--Only one statement per line-->
         <module name="OneStatementPerLine"/>
@@ -90,60 +92,60 @@
         <module name="PackageName">
             <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
             <message key="name.invalidPattern"
-             value="Package name ''{0}'' must match pattern ''{1}''."/>
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypeName">
             <message key="name.invalidPattern"
-             value="Type name ''{0}'' must match pattern ''{1}''."/>
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MemberName">
             <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern"
-             value="Member name ''{0}'' must match pattern ''{1}''."/>
+                     value="Member name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ParameterName">
             <property name="format" value="^([a-z][a-zA-Z0-9]+)|[e]$"/>
             <message key="name.invalidPattern"
-             value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="LocalVariableName">
             <property name="tokens" value="VARIABLE_DEF"/>
             <property name="format" value="^([a-z][a-zA-Z0-9]+)|[e]$"/>
             <property name="allowOneCharVarInForLoop" value="true"/>
             <message key="name.invalidPattern"
-             value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ClassTypeParameterName">
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
             <message key="name.invalidPattern"
-             value="Class type name ''{0}'' must match pattern ''{1}''."/>
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MethodTypeParameterName">
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
             <message key="name.invalidPattern"
-             value="Method type name ''{0}'' must match pattern ''{1}''."/>
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="InterfaceTypeParameterName">
             <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
             <message key="name.invalidPattern"
-             value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
             <message key="name.invalidPattern"
-             value="Method name ''{0}'' must match pattern ''{1}''."/>
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>
 
         <!-- Whitespaces for < and > -->
         <module name="GenericWhitespace">
             <message key="ws.followed"
-             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-             <message key="ws.preceded"
-             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-             <message key="ws.illegalFollow"
-             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-             <message key="ws.notPreceded"
-             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
 
         <module name="Indentation" />
@@ -170,7 +172,7 @@
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
 
-         <module name="JavadocMethod">
+        <module name="JavadocMethod">
             <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingThrowsTags" value="true"/>
@@ -187,5 +189,6 @@
 
         <!--Comments are indeneted at the same level as surrounding code-->
         <module name="CommentsIndentation"/>
+
     </module>
 </module>

Travis/pmd/pmd-ruleset.xml

@@ -11,7 +11,9 @@
 
     <rule ref="rulesets/java/braces.xml"/>
 
-    <rule ref="rulesets/java/codesize.xml"/>
+    <rule ref="rulesets/java/codesize.xml">
+        <exclude name="TooManyMethods" />
+    </rule>
 
     <rule ref="rulesets/java/empty.xml"/>
 

auth-service/src/main/java/com/qreal/wmp/auth/controllers/roles/anonymous/LoginController.java

@@ -3,13 +3,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.SavedRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -20,10 +24,16 @@
  * Controller of register page.
  * Pages: /log (GET) (login page), /logErr (GET) (login error page)
  */
+
+@Configuration
+@PropertySource("classpath:selectors.properties")
 @Controller
 public class LoginController {
 
     private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
+
+    @Value("${selectors.url}")
+    private String selectorServiceUrl;
 
     /**
      * Used to retrieve inital request which could be intercepted by SpringSec.
@@ -56,6 +66,11 @@ public String login(@RequestParam(value = "error", required = false) String erro
                     redirectUrl);
         }
 
+        model.addAttribute("selectors", getConfig());
         return "anonymous/loginView";
     }
+
+    private String getConfig() {
+        return new RestTemplate().getForObject(selectorServiceUrl, String.class);
+    }
 }

auth-service/src/main/resources/selectors.properties

@@ -0,0 +1 @@
+selectors.url=http://localhost:7070/selectors/authform

auth-service/src/main/webapp/WEB-INF/views/anonymous/loginView.jsp

@@ -1,3 +1,4 @@
+<%@ page import="org.codehaus.jettison.json.JSONObject" %>
 <%@taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
@@ -13,6 +14,9 @@
 </head>
 
 <body>
+<%
+    JSONObject object = new JSONObject(request.getAttribute("selectors").toString());
+%>
 <div class="container">
     <div class="row">
         <div class="col-sm-6 col-md-4 col-md-offset-4">
@@ -22,9 +26,12 @@
                      src="https://cdn4.iconfinder.com/data/icons/mechanical-cogs-and-gear-wheel/500/cogwheel_configuration_configure_control_gear_gears_gearwheel_mechanics_pinion_rackwheel_screw-wheel_settings_tool_steel_machinery-512.png"
                      alt="">
                 <form class="form-signin" action="login" method="post">
-                    <input type="text" name="username" class="form-control" placeholder="Email:" required autofocus>
-                    <input type="password" name="password" class="form-control" placeholder="Password:" required>
-                    <button class="btn btn-lg btn-primary btn-block" type="submit">
+                    <input id="<%=object.getJSONObject("usernameInput").getString("id")%>"
+                           type="text" name="username" class="form-control" placeholder="Email:" required autofocus>
+                    <input id="<%=object.getJSONObject("passwordInput").getString("id")%>"
+                           type="password" name="password" class="form-control" placeholder="Password:" required>
+                    <button id="<%=object.getJSONObject("submitButton").getString("id")%>"
+                            class="btn btn-lg btn-primary btn-block" type="submit">
                         Sign in
                     </button>
                     <input type="hidden" name="${_csrf.parameterName}"
@@ -33,7 +40,7 @@
             </div>
 
             <c:if test="${error}">
-                <h2 class="text-center login-title">Password or login wrong</h2>
+                <h2 id="<%=object.getJSONObject("wrongAuthLabel").getString("id")%>" class="text-center login-title">Password or login wrong</h2>
             </c:if>
             <a href="register" class="text-center new-account">Create an account </a>
             <p class="text-center">or</p>

dashboard-service/src/main/java/com/qreal/wmp/dashboard/controller/MainController.java

@@ -54,7 +54,7 @@ public ModelAndView home(HttpSession session) {
         model.setViewName("dashboard/index");
 
         logger.info("For user {} main page was created", AuthenticatedUser.getUserName());
-
+        
         return model;
     }
 

db-services/db-diagram-service/src/main/java/com/qreal/wmp/db/diagram/dao/DiagramDaoImpl.java

@@ -179,6 +179,10 @@ public void deleteFolder(Long folderId) throws AbortedException {
                     DiagramDaoImpl.class.getName());
         }
         Folder folder = (Folder) session.get(Folder.class, folderId);
+        for (Folder child : folder.getChildrenFolders()) {
+            deleteFolder(child.getId());
+        }
+        folder.remove();
         session.delete(folder);
 
         logger.trace("deleteFolder() successfully deleted a folder with id {}", folderId);