Skip to content

Commit 415cb76

Browse files
committed
cleanup
1 parent fc0ac81 commit 415cb76

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

src/main/java/org/cryptomator/cryptofs/dir/C9uConflictResolver.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@ public class C9uConflictResolver {
2323
private static final Logger LOG = LoggerFactory.getLogger(C9uConflictResolver.class);
2424

2525

26-
private final InUseManager inUseManager;
27-
2826
@Inject
29-
public C9uConflictResolver(InUseManager inUseManager) {
30-
this.inUseManager = inUseManager;
27+
public C9uConflictResolver() {
3128
}
3229

3330
/**
3431
* Processes files with {@value Constants#INUSE_FILE_SUFFIX} file extension. (in-use files)
3532
* <p>
36-
* If the in-use file is not valid bas64 encoding, delete the file.
33+
* If the in-use file is not valid base64 encoding, delete the file.
3734
*
3835
* @param node
3936
* @return an empty stream.

src/main/java/org/cryptomator/cryptofs/dir/C9uProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.stream.Stream;
77

88
/**
9-
* Processes in-use files (file extension {@value Constants#INUSE_FILE_SUFFIX}.
9+
* Processes in-use files (file extension {@value Constants#INUSE_FILE_SUFFIX}).
1010
*/
1111
@DirectoryStreamScoped
1212
public class C9uProcessor {

src/test/java/org/cryptomator/cryptofs/dir/C9uConflictResolverTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public class C9uConflictResolverTest {
2020

2121
@BeforeEach
2222
void beforeEach() {
23-
var inUseManager = mock(InUseManager.class);
24-
c9uConflictResolver = new C9uConflictResolver(inUseManager);
23+
c9uConflictResolver = new C9uConflictResolver();
2524
}
2625

2726
@Test

0 commit comments

Comments
 (0)