tests

README.md

@@ -23,9 +23,9 @@ Add the following dependency to your project:
 - Maven
     ```xml
   <dependency>
-    <groupId>com.originalflipster</groupId>
-    <artifactId>cloud-lock</artifactId>
-    <version>0.1.0</version>
+        <groupId>com.originalflipster</groupId>
+        <artifactId>cloud-lock</artifactId>
+        <version>0.0.7</version>
   </dependency>
   ```
 - Gradle

pom.xml

@@ -71,6 +71,12 @@
             <version>12.27.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-nio</artifactId>
+            <version>0.127.21</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>

src/main/java/com/originalflipster/cloud/lock/StorageLock.java

@@ -17,15 +17,15 @@ final class StorageLock {
     private static final long LIFETIME_MINUTES = 1L;
     private static final long HEARTBEAT_SECONDS = 5L;
 
-    private final CloudStorage providerLock;
+    private final CloudStorage storage;
 
-    StorageLock(final CloudStorage cloudLock) {
-        this.providerLock = Objects.requireNonNull(cloudLock);
+    StorageLock(final CloudStorage storage) {
+        this.storage = Objects.requireNonNull(storage);
     }
 
     boolean acquireLock() {
-        if (!providerLock.lockFileExists()) {
-            var gotLock = providerLock.lock();
+        if (!storage.lockFileExists()) {
+            var gotLock = storage.lock();
             if (!gotLock) {
                 LOG.info("failed acquiring lock");
                 return false;
@@ -34,13 +34,13 @@ boolean acquireLock() {
             return true;
         }
 
-        LocalDateTime lockTime = LocalDateTime.parse(providerLock.getLockContent());
+        LocalDateTime lockTime = LocalDateTime.parse(storage.getLockContent());
         var minutesBetween = MINUTES.between(lockTime, LocalDateTime.now());
 
         if (minutesBetween > LIFETIME_MINUTES) {
             //FIXME check necessity
-            providerLock.deleteLock();
-            boolean gotLock = providerLock.lock();
+            storage.deleteLock();
+            boolean gotLock = storage.lock();
             if (!gotLock) {
                 LOG.info("failed acquiring lock");
                 return false;
@@ -53,11 +53,11 @@ boolean acquireLock() {
     }
 
     void releaseLock() {
-        if (!providerLock.hasLock()) {
+        if (!storage.hasLock()) {
             LOG.warn("trying to release lock, but no lock present");
             return;
         }
-        LocalDateTime lockTime = LocalDateTime.parse(providerLock.getLockContent());
+        LocalDateTime lockTime = LocalDateTime.parse(storage.getLockContent());
         if (!LocalDateTime.now().isAfter(lockTime.plus(HEARTBEAT_SECONDS, SECONDS))) {
             LOG.info("waiting minimum lock hold duration until releasing lock again...");
             try {
@@ -67,8 +67,8 @@ void releaseLock() {
                 //
             }
         }
-        providerLock.deleteLock();
+        storage.deleteLock();
         LOG.info("lock released");
-        providerLock.unlock();
+        storage.unlock();
     }
 }

src/main/java/com/originalflipster/cloud/lock/storage/AlibabaObjectStorage.java

@@ -2,6 +2,7 @@
 
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.ObjectMetadata;
@@ -35,6 +36,15 @@ final class AlibabaObjectStorage implements CloudStorage {
         this.accessKeySecret = accessKeySecret;
     }
 
+    AlibabaObjectStorage(final String bucketName, final String lockFile, final String endpoint, final OSSClient ossClient) {
+        this.bucketName = bucketName;
+        this.lockFile = lockFile;
+        this.endpoint = endpoint;
+        this.ossClient = ossClient;
+        this.accessKeyId = "";
+        this.accessKeySecret = "";
+    }
+
     private OSS getClient() {
         if (ossClient == null) {
             ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);

src/test/java/com/originalflipster/cloud/lock/StorageLockTest.java

@@ -0,0 +1,42 @@
+package com.originalflipster.cloud.lock;
+
+import com.originalflipster.cloud.lock.storage.CloudStorage;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StorageLockTest {
+
+
+    private static final class MockStorage implements CloudStorage {
+
+        @Override
+        public boolean lockFileExists() {
+            return false;
+        }
+
+        @Override
+        public boolean lock() {
+            return false;
+        }
+
+        @Override
+        public String getLockContent() {
+            return null;
+        }
+
+        @Override
+        public boolean hasLock() {
+            return false;
+        }
+
+        @Override
+        public void deleteLock() {
+
+        }
+
+        @Override
+        public void unlock() {
+
+        }
+    }
+}

src/test/java/com/originalflipster/cloud/lock/storage/AlibabaObjectStorageTest.java

@@ -1,6 +1,6 @@
 package com.originalflipster.cloud.lock.storage;
 
-import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.GetObjectRequest;
 import com.aliyun.oss.model.OSSObject;
@@ -25,13 +25,13 @@ class AlibabaObjectStorageTest {
     private static final String BUCKET_NAME = "test-bucket";
     private static final String LOCK_FILE = "lock-file";
 
-    private OSS ossClient;
+    private OSSClient ossClient;
     private AlibabaObjectStorage alibabaObjectStorage;
 
     @BeforeEach
     void setUp() {
-        ossClient = mock(OSS.class);
-        //alibabaObjectStorage = new AlibabaObjectStorage(BUCKET_NAME, LOCK_FILE, () -> ossClient);
+        ossClient = mock(OSSClient.class);
+        alibabaObjectStorage = new AlibabaObjectStorage(BUCKET_NAME, LOCK_FILE, "",  ossClient);
     }
 
     @Test