Minor release 4.3.1 (#605)

Author: axlbonnet

coverage/pom.xml

@@ -49,11 +49,6 @@
             <artifactId>vip-gatelab</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vip-local</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>vip-portal</artifactId>

pom.xml

@@ -43,7 +43,7 @@ knowledge of the CeCILL-B license and that you accept its terms.
     <properties>
         <!-- project version. Only to change it here (and in CoreConstants.java
            Follow this practice : https://maven.apache.org/maven-ci-friendly.html-->
-        <revision>4.3</revision>
+        <revision>4.3.1</revision>
         <changelist />
         <sha1/>
 

vip-core/src/main/java/fr/insalyon/creatis/vip/core/client/view/CoreConstants.java

@@ -38,7 +38,7 @@
 public class CoreConstants implements IsSerializable {
 
 
-    public static final String VERSION = "v4.3";
+    public static final String VERSION = "v4.3.1";
     // Configuration Labels
     public static final String VO_NAME = "vo.name";
     public static final String VO_ROOT = "vo.root";

vip-datamanagement/src/main/java/fr/insalyon/creatis/vip/datamanager/server/business/GirderStorageBusiness.java

@@ -120,9 +120,9 @@ private String buildUri(
                 filename +
                 "?apiurl=" +
                 apiUrl +
-                "&fileId=" +
+                "&fileId=" +
                 fileId +
-                "&token=" +
+                "&token=" +
                 token;
     }
 

vip-datamanagement/src/main/java/fr/insalyon/creatis/vip/datamanager/server/business/ShanoirStorageBusiness.java

@@ -140,19 +140,19 @@ private String buildDownloadUri(
                 fileName +
                 "?"+ UrlKeys.API_URI.key+"=" +
                 apiUrl +
-                "&"+ UrlKeys.RESOURCE_ID.key+"=" +
+                "&"+ UrlKeys.RESOURCE_ID.key+"=" +
                 resourceId +
-                "&"+ UrlKeys.FORMAT.key+"=" +
+                "&"+ UrlKeys.FORMAT.key+"=" +
                 format +
-                "&"+ UrlKeys.CONVERTER_ID.key+"=" +
+                "&"+ UrlKeys.CONVERTER_ID.key+"=" +
                 converterId +
-                "&"+ UrlKeys.KEYCLOAK_CLIENT_ID.key+"=" +
+                "&"+ UrlKeys.KEYCLOAK_CLIENT_ID.key+"=" +
                 keycloakClientId +
-                "&"+ UrlKeys.REFRESH_TOKEN_URL.key+"=" +
+                "&"+ UrlKeys.REFRESH_TOKEN_URL.key+"=" +
                 refreshTokenUrl +
-                "&"+ UrlKeys.TOKEN.key+"=" +
+                "&"+ UrlKeys.TOKEN.key+"=" +
                 token +
-                "&"+ UrlKeys.REFRESH_TOKEN.key+"=" +
+                "&"+ UrlKeys.REFRESH_TOKEN.key+"=" +
                 refreshToken;
     }
 
@@ -161,17 +161,17 @@ private String buildUploadUri(String filePath, String uploadUrl, String token, S
                 filePath +
                 "?"+ UrlKeys.UPLOAD_URL.key+"=" +
                 uploadUrl +
-                "&"+ UrlKeys.TYPE.key+"=" +
+                "&"+ UrlKeys.TYPE.key+"=" +
                 type +
-                "&"+ UrlKeys.MD5.key+"=" +
+                "&"+ UrlKeys.MD5.key+"=" +
                 md5 +
-                "&"+ UrlKeys.KEYCLOAK_CLIENT_ID.key+"=" +
+                "&"+ UrlKeys.KEYCLOAK_CLIENT_ID.key+"=" +
                 keycloakClientId +
-                "&"+ UrlKeys.REFRESH_TOKEN_URL.key+"=" +
+                "&"+ UrlKeys.REFRESH_TOKEN_URL.key+"=" +
                 refreshTokenUrl +
-                "&"+ UrlKeys.TOKEN.key+"=" +
+                "&"+ UrlKeys.TOKEN.key+"=" +
                 token +
-                "&"+ UrlKeys.REFRESH_TOKEN.key+"=" +
+                "&"+ UrlKeys.REFRESH_TOKEN.key+"=" +
                 refreshToken;
     }
 

vip-datamanagement/src/test/java/fr/insalyon/creatis/vip/datamanager/server/business/ShanoirStorageBusinessTest.java

@@ -30,13 +30,13 @@ public void testShanoirUri() throws BusinessException {
 
         String expectedUri="shanoir:/path/to/file.txt?" +
                 "apiUrl=testShanoirUrl" +
-                "&resourceId=testResourceId" +
-                "&format=testFormat" +
-                "&converterId=testConverterId" +
-                "&keycloak_client_id=testKeycloakClientId" +
-                "&refresh_token_url=testRefreshTokenUrl" +
-                "&token=testToken" +
-                "&refreshToken=testRefreshToken";
+                "&resourceId=testResourceId" +
+                "&format=testFormat" +
+                "&converterId=testConverterId" +
+                "&keycloak_client_id=testKeycloakClientId" +
+                "&refresh_token_url=testRefreshTokenUrl" +
+                "&token=testToken" +
+                "&refreshToken=testRefreshToken";
 
         Assertions.assertEquals(expectedUri, uri);
     }
@@ -62,12 +62,12 @@ public void testShanoirUploadUri() throws BusinessException {
 
         String expectedUri="shanoir:/path/to/dir?" +
                 "upload_url=testUploadUrl" +
-                "&type=File" +
-                "&md5=d41d8cd98f00b204e9800998ecf8427e" +
-                "&keycloak_client_id=testKeycloakClientId" +
-                "&refresh_token_url=testRefreshTokenUrl" +
-                "&token=testToken" +
-                "&refreshToken=testRefreshToken";
+                "&type=File" +
+                "&md5=d41d8cd98f00b204e9800998ecf8427e" +
+                "&keycloak_client_id=testKeycloakClientId" +
+                "&refresh_token_url=testRefreshTokenUrl" +
+                "&token=testToken" +
+                "&refreshToken=testRefreshToken";
 
         Assertions.assertEquals(expectedUri, uploadUri);
     }