stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

just a tiny bit of cleanup

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-07-07 09:48:12 +02:00
parent f5fbf2e695
commit b4e64b9eeb
7 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/usatiuk/dhfs/storage/files/conflicts/DirectoryConflictResolver.java
View File

@@ -8,7 +8,6 @@ import com.usatiuk.dhfs.storage.objects.jrepository.JObjectData;
import com.usatiuk.dhfs.storage.objects.jrepository.JObjectManager;
import com.usatiuk.dhfs.storage.objects.repository.distributed.ConflictResolver;
import com.usatiuk.dhfs.storage.objects.repository.distributed.PersistentRemoteHostsService;
import com.usatiuk.dhfs.storage.objects.repository.distributed.RemoteObjectServiceClient;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.quarkus.logging.Log;
@@ -23,9 +22,6 @@ public class DirectoryConflictResolver implements ConflictResolver {
@Inject
PersistentRemoteHostsService persistentRemoteHostsService;
@Inject
RemoteObjectServiceClient remoteObjectServiceClient;
@Inject
JObjectManager jObjectManager;

4
server/src/main/java/com/usatiuk/dhfs/storage/files/conflicts/FileConflictResolver.java
View File

@@ -10,7 +10,6 @@ import com.usatiuk.dhfs.storage.objects.jrepository.JObjectData;
import com.usatiuk.dhfs.storage.objects.jrepository.JObjectManager;
import com.usatiuk.dhfs.storage.objects.repository.distributed.ConflictResolver;
import com.usatiuk.dhfs.storage.objects.repository.distributed.PersistentRemoteHostsService;
import com.usatiuk.dhfs.storage.objects.repository.distributed.RemoteObjectServiceClient;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.quarkus.logging.Log;
@@ -27,9 +26,6 @@ public class FileConflictResolver implements ConflictResolver {
@Inject
PersistentRemoteHostsService persistentRemoteHostsService;
@Inject
RemoteObjectServiceClient remoteObjectServiceClient;
@Inject
JObjectManager jObjectManager;

2
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java
View File

@@ -201,7 +201,7 @@ public class JObject<T extends JObjectData> implements Serializable, Comparable<
var ret = fn.apply(_metaPart, _dataPart.get(), this::bumpVer, invalidateFn);
_resolver.updateDeletionState(this);
if (_resolver._bumpVerification) {
if (_resolver.bumpVerification) {
if (_dataPart.get() != null && _dataPart.get().assumeUnique())
if (!Objects.equals(ver, _metaPart.getChangelog()))
throw new IllegalStateException("Object changed but is assumed immutable: " + getName());

6
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectManagerImpl.java
View File

@@ -28,12 +28,6 @@ public class JObjectManagerImpl implements JObjectManager {
@Inject
JObjectResolver jObjectResolver;
@Inject
JObjectWriteback jObjectWriteback;
@Inject
JObjectRefProcessor jobjectRefProcessor;
@Inject
PersistentRemoteHostsService persistentRemoteHostsService;

6
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectRefProcessor.java
View File

@@ -1,7 +1,6 @@
package com.usatiuk.dhfs.storage.objects.jrepository;
import com.google.common.collect.Streams;
import com.usatiuk.dhfs.storage.objects.repository.persistence.ObjectPersistentStore;
import io.quarkus.logging.Log;
import io.quarkus.runtime.Shutdown;
import io.quarkus.runtime.Startup;
@@ -23,11 +22,6 @@ public class JObjectRefProcessor {
@Inject
JObjectManager jObjectManager;
@Inject
JObjectWriteback jObjectWriteback;
@Inject
ObjectPersistentStore objectPersistentStore;
@Startup
void init() {

2
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectResolver.java
View File

@@ -48,7 +48,7 @@ public class JObjectResolver {
boolean refVerification;
@ConfigProperty(name = "dhfs.objects.bump_verification")
boolean _bumpVerification;
boolean bumpVerification;
public <T extends JObjectData> void registerWriteListener(Class<T> klass, JObject.ObjectFnWrite<T, Void> fn) {
_writeListeners.put(klass, fn);

2
server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/peertrust/PeerTrustManager.java
View File

@@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicReference;
@ApplicationScoped
public class PeerTrustManager implements X509TrustManager {
private AtomicReference<X509TrustManager> trustManager = new AtomicReference<>();
private final AtomicReference<X509TrustManager> trustManager = new AtomicReference<>();
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {