Merge branch 'dev' of [email protected]:unity-idm/unity.git into dev

Author: ppiernik

documentation/src/main/doc/config/storage.txt

@@ -41,7 +41,7 @@ In mysql console (when logged with admin privileges) execute following commands:
  CREATE DATABASE unitydb;
  CREATE USER 'unity'@'localhost' IDENTIFIED BY 'unitypass';
  GRANT ALTER, CREATE, DELETE, DROP, EXECUTE, INDEX, INSERT, LOCK TABLES, 
-    SELECT, TRIGGER, UPDATE, REFERENCES ON unitydb.* to 'unity'@'localhost';
+    SELECT, TRIGGER, UPDATE, REFERENCES, CREATE ROUTINE, EXECUTE ON unitydb.* to 'unity'@'localhost';
 
 using the desired database name, username and password. If the database is on a different host then the Unity instance,
 change to localhost to a proper host of Unity installation or use +%+ to allow connections from any host.  

documentation/src/main/doc/update.txt

@@ -396,4 +396,12 @@ The 3.13 release does not include database migration. However, it includes a hea
 a major step in preparation for the major release of Unity 4. Taking backup and testing the new release 
 before deploying it to production is especially advised.
 
- 
+==== From 3.13-3.15 to 3.16
+
+In case of MySQL DB, it is required to assign additional permissions to Unity DB user, before upgrading: CREATE ROUTINE and EXECUTE.
+
+For example:
+
+----
+GRANT CREATE ROUTINE, EXECUTE ON * to 'unity'@'localhost';
+----

engine/src/main/java/pl/edu/icm/unity/engine/bulk/BulkQueryServiceImpl.java

@@ -428,28 +428,30 @@ private void buildTree(Collection<String> paths)
 
 		private void addGroup(String path)
 		{
-			if (!pathToGroupNode.containsKey(path))
+			if (pathToGroupNode.containsKey(path))
 			{
-				String[] parts = path.split("/");
-				GroupNode current = root;
-
-				StringBuilder processedPathBuilder = new StringBuilder();
-				for (String part : parts)
+				return;
+			}
+			
+			String[] parts = path.split("/");
+			GroupNode current = root;
+			StringBuilder processedPathBuilder = new StringBuilder();
+			for (String part : parts)
+			{
+				if (part.isEmpty())
+				{
+					continue;
+				}
+				processedPathBuilder.append("/").append(part);
+				String processedPath = processedPathBuilder.toString();
+				
+				if (!pathToGroupNode.containsKey(processedPath))
 				{
-					if (!part.isEmpty())
-					{
-						processedPathBuilder.append("/").append(part);
-						String processedPath = processedPathBuilder.toString();
-						
-						if (!pathToGroupNode.containsKey(processedPath))
-						{
-							GroupNode newNode = new GroupNode(processedPath);
-							current.addChild(processedPath);
-							pathToGroupNode.put(processedPath, newNode);
-						}
-						current = pathToGroupNode.get(processedPath);
-					}
+					GroupNode newNode = new GroupNode(processedPath);
+					current.addChild(processedPath);
+					pathToGroupNode.put(processedPath, newNode);
 				}
+				current = pathToGroupNode.get(processedPath);
 			}
 		}
 

pom.xml

@@ -577,7 +577,7 @@
 			<dependency>
 				<groupId>org.postgresql</groupId>
 				<artifactId>postgresql</artifactId>
-				<version>42.6.0</version>
+				<version>42.6.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.mariadb.jdbc</groupId>

unity-rest-api-docs/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.imunity</groupId>
 		<artifactId>unity-server-parent</artifactId>
-		<version>3.15.0-SNAPSHOT</version>
+		<version>3.16.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>