Merge branch 'release-1.0.3'

adorsys · Sep 21, 2020 · 24088d5 · 24088d5
2 parents 9de0126 + cd60148
commit 24088d5
Show file tree

Hide file tree

Showing 64 changed files with 369 additions and 199 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,19 +41,19 @@ deploy:
  tags: true
  condition: "$TRAVIS_TAG =~ ^v([[:digit:]]+\\.)+[[:digit:]]+(-[[:digit:]]+)?(-SNAPSHOT)?$"
 
- - provider: script
- skip_cleanup: true
- script: /bin/bash .travis/deploy_develop_to_openshift.sh
- on:
- branch: develop
-
- - provider: script
- skip_cleanup: true
- script: /bin/bash .travis/upload_dockerhub.sh
- on:
- all_branches: true
- tags: true
- condition: "$TRAVIS_TAG =~ ^v([[:digit:]]+\\.)+[[:digit:]]+(-[[:digit:]]+)?(-SNAPSHOT)?$"
+# - provider: script
+# skip_cleanup: true
+# script: /bin/bash .travis/deploy_develop_to_openshift.sh
+# on:
+# branch: develop
+
+# - provider: script
+# skip_cleanup: true
+# script: /bin/bash .travis/upload_dockerhub.sh
+# on:
+# all_branches: true
+# tags: true
+# condition: "$TRAVIS_TAG =~ ^v([[:digit:]]+\\.)+[[:digit:]]+(-[[:digit:]]+)?(-SNAPSHOT)?$"
 
 after_success:
  - /bin/bash .travis/codecov_bash.sh

diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-cli/pom.xml b/datasafe-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
 
  <artifactId>datasafe-cli</artifactId>

diff --git a/datasafe-directory/datasafe-directory-api/pom.xml b/datasafe-directory/datasafe-directory-api/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-directory-api</artifactId>
  <dependencies>

diff --git a/datasafe-directory/datasafe-directory-impl/pom.xml b/datasafe-directory/datasafe-directory-impl/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-directory-impl</artifactId>
  <dependencies>

diff --git a/datasafe-directory/pom.xml b/datasafe-directory/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-encryption/datasafe-encryption-api/pom.xml b/datasafe-encryption/datasafe-encryption-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-encryption-api</artifactId>
  <dependencies>

diff --git a/datasafe-encryption/datasafe-encryption-impl/pom.xml b/datasafe-encryption/datasafe-encryption-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-encryption-impl</artifactId>
  <dependencies>

diff --git a/datasafe-encryption/pom.xml b/datasafe-encryption/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-examples/datasafe-examples-business/pom.xml b/datasafe-examples/datasafe-examples-business/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-examples-business</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-customize-dagger/pom.xml b/datasafe-examples/datasafe-examples-customize-dagger/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-examples-customize-dagger</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-multidfs/pom.xml b/datasafe-examples/datasafe-examples-multidfs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-examples-multidfs</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-versioned-s3/pom.xml b/datasafe-examples/datasafe-examples-versioned-s3/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-examples-versioned-s3</artifactId>
  <dependencies>

diff --git a/datasafe-examples/pom.xml b/datasafe-examples/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-inbox/datasafe-inbox-api/pom.xml b/datasafe-inbox/datasafe-inbox-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-inbox-api</artifactId>
  <dependencies>

diff --git a/datasafe-inbox/datasafe-inbox-impl/pom.xml b/datasafe-inbox/datasafe-inbox-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-inbox-impl</artifactId>
  <dependencies>

diff --git a/datasafe-inbox/pom.xml b/datasafe-inbox/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-long-run-tests</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ys/datasafe/business/impl/e2e/randomactions/RandomActionsOnSimpleDatasafeAdapterTest.java b/...ys/datasafe/business/impl/e2e/randomactions/RandomActionsOnSimpleDatasafeAdapterTest.java
@@ -29,6 +29,7 @@
 import de.adorsys.datasafe.simple.adapter.api.types.ListRecursiveFlag;
 import de.adorsys.datasafe.simple.adapter.impl.DFSTestCredentialsFactory;
 import de.adorsys.datasafe.simple.adapter.impl.SimpleDatasafeServiceImpl;
+import de.adorsys.datasafe.simple.adapter.impl.config.PathEncryptionConfig;
 import de.adorsys.datasafe.types.api.actions.ListRequest;
 import de.adorsys.datasafe.types.api.actions.ReadRequest;
 import de.adorsys.datasafe.types.api.actions.RemoveRequest;
@@ -89,7 +90,7 @@ void testRandomActionsParallelThreads(StorageDescriptor descriptor, int threadCo
 
  private DefaultDatasafeServices datasafeServicesFromSimpleDatasafeAdapter(StorageDescriptor descriptor) {
  SimpleDatasafeService datasafeService = new SimpleDatasafeServiceImpl(
- DFSTestCredentialsFactory.credentials(descriptor), new MutableEncryptionConfig()
+ DFSTestCredentialsFactory.credentials(descriptor), new MutableEncryptionConfig(), new PathEncryptionConfig(true)
  );
 
  return new DefaultDatasafeServices() {

diff --git a/datasafe-long-run-tests/pom.xml b/datasafe-long-run-tests/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-metainfo/datasafe-metainfo-version-api/pom.xml b/datasafe-metainfo/datasafe-metainfo-version-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-metainfo-version-api</artifactId>
  <dependencies>

diff --git a/datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml b/datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-metainfo-version-impl</artifactId>
  <dependencies>

diff --git a/datasafe-metainfo/pom.xml b/datasafe-metainfo/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/datasafe-privatestore-api/pom.xml b/datasafe-privatestore/datasafe-privatestore-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/datasafe-privatestore-impl/pom.xml b/datasafe-privatestore/datasafe-privatestore-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/pom.xml b/datasafe-privatestore/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml
@@ -5,11 +5,11 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
 
  <artifactId>datasafe-rest-impl</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  <name>datasafe-rest-impl</name>
  <description>Spring Boot DataSafe Application</description>
 

diff --git a/datasafe-runtime-delegate/pom.xml b/datasafe-runtime-delegate/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <artifactId>datasafe-runtime-delegate</artifactId>
  <dependencies>

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-api/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-simple-adapter</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -21,6 +21,11 @@
  <artifactId>datasafe-encryption-api</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>de.adorsys</groupId>
+ <artifactId>datasafe-inbox-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
 
  <dependency>
  <groupId>org.slf4j</groupId>

diff --git a/...apter-api/src/main/java/de/adorsys/datasafe/simple/adapter/api/SimpleDatasafeService.java b/...apter-api/src/main/java/de/adorsys/datasafe/simple/adapter/api/SimpleDatasafeService.java
@@ -2,6 +2,7 @@
 
 import de.adorsys.datasafe.encrypiton.api.types.UserID;
 import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth;
+import de.adorsys.datasafe.inbox.api.InboxService;
 import de.adorsys.datasafe.simple.adapter.api.types.DSDocument;
 import de.adorsys.datasafe.simple.adapter.api.types.DSDocumentStream;
 import de.adorsys.datasafe.simple.adapter.api.types.DocumentDirectoryFQN;
@@ -46,6 +47,8 @@ public interface SimpleDatasafeService {
 
  List<DocumentFQN> list(UserIDAuth userIDAuth, DocumentDirectoryFQN documentDirectoryFQN, ListRecursiveFlag recursiveFlag);
 
+ InboxService getInboxService();
+
  // deletes all users and their files from storage
  void cleanupDb();
 }

diff --git a/...pi/src/main/java/de/adorsys/datasafe/simple/adapter/api/types/AmazonS3DFSCredentials.java b/...pi/src/main/java/de/adorsys/datasafe/simple/adapter/api/types/AmazonS3DFSCredentials.java
@@ -32,11 +32,7 @@ public class AmazonS3DFSCredentials extends DFSCredentials {
  @Builder.Default
  private final int requestTimeout = 0;
 
-
  public String getContainer() {
  return rootBucket.split("/")[0];
  }
-
-
-
 }
diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-simple-adapter</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>