Save open dia test

.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:
@@ -67,8 +68,7 @@ script:
   - sleep 30
 
   - cd ../ui-testing
-  - mvn test -P travis &
-  - sleep 30
+  - 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"/>
 

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);

db-services/db-diagram-service/src/main/java/com/qreal/wmp/db/diagram/model/Folder.java

@@ -19,6 +19,8 @@
 @ToString(exclude = "parentFolders")
 public class Folder implements Serializable {
 
+    private static final String ROOT_FOLDER = "root";
+
     @Id
     @Column(name = "folder_id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -35,10 +37,10 @@ public class Folder implements Serializable {
     @Transient
     private Long folderParentId;
 
-    @ManyToMany(cascade = CascadeType.REMOVE, fetch = FetchType.EAGER, mappedBy = "childrenFolders")
+    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "childrenFolders")
     private Set<Folder> parentFolders = new HashSet<>();
 
-    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.EAGER)
     @JoinTable(name = "folders_folders", joinColumns = {@JoinColumn(name = "parent_id")},
             inverseJoinColumns = {@JoinColumn(name = "child_id")})
     private Set<Folder> childrenFolders = new HashSet<>();
@@ -95,7 +97,68 @@ public Folder(TFolder tFolder) {
             diagrams = tFolder.getDiagrams().stream().map(Diagram::new).collect(Collectors.toSet());
         }
     }
-
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setFolderName(String folderName) {
+        this.folderName = folderName;
+    }
+
+    public void remove() {
+        parentFolders.forEach(x -> x.removeChild(id));
+        parentFolders.clear();
+    }
+
+    public Set<Folder> getChildrenFolders() {
+        return childrenFolders;
+    }
+
+    public Set<String> getOwners() {
+        return owners;
+    }
+
+    public void setOwners(Set<String> owners) {
+        this.owners = owners;
+    }
+
+    public Long getFolderParentId() {
+        return folderParentId;
+    }
+
+    public void setFolderParentId(Long folderParentId) {
+        this.folderParentId = folderParentId;
+    }
+
+    public Set<Folder> getParentFolders() {
+        return parentFolders;
+    }
+
+    public void setParentFolders(Set<Folder> parentFolders) {
+        this.parentFolders = parentFolders;
+    }
+
+    public void setChildrenFolders(Set<Folder> childrenFolders) {
+        this.childrenFolders = childrenFolders;
+    }
+
+    public Set<Diagram> getDiagrams() {
+        return diagrams;
+    }
+
+    public void setDiagrams(Set<Diagram> diagrams) {
+        this.diagrams = diagrams;
+    }
+
+    public String getFolderName() {
+        return folderName;
+    }
+
     /** Converter from Folder to Thrift TFolder.*/
     public TFolder toTFolder(final String username) {
         TFolder tFolder = new TFolder();
@@ -134,5 +197,9 @@ private void setFolderParentId(String username, TFolder tFolder) {
             tFolder.setFolderParentId(folderParentId);
         }
     }
+
+    private void removeChild(long childId) {
+        childrenFolders.stream().filter(x -> x.id == childId).findFirst().ifPresent(x -> childrenFolders.remove(x));
+    }
 }