mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 20:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added commons project

Browse Source
This commit is contained in:
Markus Kreusch
2015-12-28 20:58:38 +01:00
parent 356ea5c319
commit 62d8cdfe4f
7 changed files with 81 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/commons/pom.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2015 Markus Kreusch This file is licensed under the terms
of the MIT license. See the LICENSE.txt file for more info. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>0.11.0-SNAPSHOT</version>
</parent>
<artifactId>commons</artifactId>
<name>Cryptomator common</name>
<description>Shared utilities</description>
</project>

14
main/commons/src/main/java/org/cryptomator/common/UncheckedInterruptedException.java Normal file
View File

@@ -0,0 +1,14 @@
package org.cryptomator.common;
public class UncheckedInterruptedException extends RuntimeException {
public UncheckedInterruptedException(InterruptedException e) {
super(e);
}
@Override
public InterruptedException getCause() {
return (InterruptedException) super.getCause();
}
}

4
main/filesystem-crypto/pom.xml
View File

@@ -31,6 +31,10 @@
<groupId>org.cryptomator</groupId>
<artifactId>filesystem-nameshortening</artifactId>
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>commons</artifactId>
</dependency>
<!-- Crypto -->
<dependency>

54
main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FifoParallelDataProcessor.java
View File

@@ -11,10 +11,15 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.cryptomator.common.UncheckedInterruptedException;
/**
* Executes long-running computations and returns the result strictly in order of the job submissions, no matter how long each job takes.
* Executes long-running computations and returns the result strictly in order
* of the job submissions, no matter how long each job takes.
*
* The internally used thread pool is shut down automatically as soon as this FifiParallelDataProcessor is no longer referenced (see Finalization behaviour of {@link ThreadPoolExecutor}).
* The internally used thread pool is shut down automatically as soon as this
* FifiParallelDataProcessor is no longer referenced (see Finalization behaviour
* of {@link ThreadPoolExecutor}).
*/
class FifoParallelDataProcessor<T> {
@@ -24,8 +29,11 @@ class FifoParallelDataProcessor<T> {
private final ExecutorService executorService;
/**
* @param numThreads How many jobs can run in parallel.
* @param workQueueSize Maximum number of jobs accepted without blocking, when no results are polled from {@link #processedData()}.
* @param numThreads
* How many jobs can run in parallel.
* @param workQueueSize
* Maximum number of jobs accepted without blocking, when no
* results are polled from {@link #processedData()}.
*/
public FifoParallelDataProcessor(int numThreads, int workQueueSize) {
this.workQueue = new ArrayBlockingQueue<>(workQueueSize);
@@ -33,7 +41,8 @@ class FifoParallelDataProcessor<T> {
}
/**
* Enqueues tasks into the blocking queue, if they can not be executed immediately.
* Enqueues tasks into the blocking queue, if they can not be executed
* immediately.
*
* @see ThreadPoolExecutor#execute(Runnable)
*/
@@ -41,27 +50,30 @@ class FifoParallelDataProcessor<T> {
try {
this.workQueue.put(r);
} catch (InterruptedException e) {
throw new SneakyInterruptedException(e);
throw new UncheckedInterruptedException(e);
}
}
/**
* Enqueues a job for execution. The results of multiple submissions can be polled in FIFO order using {@link #processedData()}.
* Enqueues a job for execution. The results of multiple submissions can be
* polled in FIFO order using {@link #processedData()}.
*
* @param processingJob A task, that will compute a result.
* @param processingJob
* A task, that will compute a result.
* @throws InterruptedException
*/
void submit(Callable<T> processingJob) throws InterruptedException {
try {
Future<T> future = executorService.submit(processingJob);
processedData.offer(new SequencedFutureResult(future, jobSequence.getAndIncrement()));
} catch (SneakyInterruptedException e) {
} catch (UncheckedInterruptedException e) {
throw e.getCause();
}
}
/**
* Submits already pre-processed data, that can be polled in FIFO order from {@link #processedData()}.
* Submits already pre-processed data, that can be polled in FIFO order from
* {@link #processedData()}.
*
* @throws InterruptedException
*/
@@ -72,10 +84,13 @@ class FifoParallelDataProcessor<T> {
}
/**
* Result of previously {@link #submit(Callable) submitted} jobs in the same order as they have been submitted. Blocks if the job didn't finish yet.
* Result of previously {@link #submit(Callable) submitted} jobs in the same
* order as they have been submitted. Blocks if the job didn't finish yet.
*
* @return Next job result
* @throws InterruptedException If the calling thread was interrupted while waiting for the next result.
* @throws InterruptedException
* If the calling thread was interrupted while waiting for the
* next result.
*/
T processedData() throws InterruptedException {
return processedData.take().get();
@@ -110,19 +125,4 @@ class FifoParallelDataProcessor<T> {
}
private static class SneakyInterruptedException extends RuntimeException {
private static final long serialVersionUID = 331817765088138556L;
public SneakyInterruptedException(InterruptedException cause) {
super(cause);
}
@Override
public InterruptedException getCause() {
return (InterruptedException) super.getCause();
}
}
}

3
main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoReadableFile.java
View File

@@ -7,6 +7,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.cryptomator.common.UncheckedInterruptedException;
import org.cryptomator.crypto.engine.FileContentCryptor;
import org.cryptomator.crypto.engine.FileContentDecryptor;
import org.cryptomator.filesystem.ReadableFile;
@@ -60,7 +61,7 @@ class CryptoReadableFile implements ReadableFile {
return bytesRead;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new RuntimeException(e);
throw new UncheckedInterruptedException(e);
}
}

3
main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoWritableFile.java
View File

@@ -10,6 +10,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.cryptomator.common.UncheckedInterruptedException;
import org.cryptomator.crypto.engine.FileContentCryptor;
import org.cryptomator.crypto.engine.FileContentEncryptor;
import org.cryptomator.filesystem.WritableFile;
@@ -47,7 +48,7 @@ class CryptoWritableFile implements WritableFile {
return size;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new RuntimeException(e);
throw new UncheckedInterruptedException(e);
}
}

28
main/pom.xml
View File

@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2014 Sebastian Stenzel
This file is licensed under the terms of the MIT license.
See the LICENSE.txt file for more info.
Contributors:
Sebastian Stenzel - initial API and implementation
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the
terms of the MIT license. See the LICENSE.txt file for more info. Contributors:
Sebastian Stenzel - initial API and implementation -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
@@ -62,6 +58,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>filesystem-api</artifactId>
@@ -149,7 +151,8 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<!-- org.apache.httpcomponents:httpclient is newer, but jackrabbit uses this version. We don't have a reason to upgrade -->
<!-- org.apache.httpcomponents:httpclient is newer, but jackrabbit uses
this version. We don't have a reason to upgrade -->
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons-httpclient.version}</version>
@@ -237,6 +240,8 @@
</dependencies>
<modules>
<module>commons</module>
<module>commons-test</module>
<module>filesystem-api</module>
<module>filesystem-inmemory</module>
<module>filesystem-nio</module>
@@ -244,10 +249,9 @@
<module>filesystem-crypto</module>
<module>crypto-api</module>
<module>crypto-aes</module>
<module>jackrabbit-filesystem-adapter</module>
<module>core</module>
<module>ui</module>
<module>jackrabbit-filesystem-adapter</module>
<module>commons-test</module>
</modules>
<profiles>