Server: remove Serializable where not needed

This commit is contained in:
2024-11-30 15:55:07 +01:00
parent a0bcb68391
commit 6d2137bb3f
11 changed files with 8 additions and 27 deletions

View File

@@ -1,11 +1,9 @@
package com.usatiuk.kleppmanntree;
import java.io.Serializable;
public record LogEffect<TimestampT extends Comparable<TimestampT>, PeerIdT extends Comparable<PeerIdT>, MetaT extends NodeMeta, NodeIdT>(
LogEffectOld<TimestampT, PeerIdT, MetaT, NodeIdT> oldInfo,
OpMove<TimestampT, PeerIdT, MetaT, NodeIdT> effectiveOp,
NodeIdT newParentId,
MetaT newMeta,
NodeIdT childId) implements Serializable {
NodeIdT childId) {
}

View File

@@ -1,8 +1,6 @@
package com.usatiuk.kleppmanntree;
import java.io.Serializable;
public record LogEffectOld<TimestampT extends Comparable<TimestampT>, PeerIdT extends Comparable<PeerIdT>, MetaT extends NodeMeta, NodeIdT>
(OpMove<TimestampT, PeerIdT, MetaT, NodeIdT> oldEffectiveMove,
NodeIdT oldParent,
MetaT oldMeta) implements Serializable {}
MetaT oldMeta) {}

View File

@@ -1,8 +1,7 @@
package com.usatiuk.kleppmanntree;
import java.io.Serializable;
import java.util.List;
public record LogRecord<TimestampT extends Comparable<TimestampT>, PeerIdT extends Comparable<PeerIdT>, MetaT extends NodeMeta, NodeIdT>
(OpMove<TimestampT, PeerIdT, MetaT, NodeIdT> op,
List<LogEffect<TimestampT, PeerIdT, MetaT, NodeIdT>> effects) implements Serializable {}
List<LogEffect<TimestampT, PeerIdT, MetaT, NodeIdT>> effects) {}

View File

@@ -1,7 +1,5 @@
package com.usatiuk.kleppmanntree;
import java.io.Serializable;
public record OpMove<TimestampT extends Comparable<TimestampT>, PeerIdT extends Comparable<PeerIdT>, MetaT extends NodeMeta, NodeIdT>
(CombinedTimestamp<TimestampT, PeerIdT> timestamp, NodeIdT newParentId, MetaT newMeta,
NodeIdT childId) implements Serializable {}
NodeIdT childId) {}

View File

@@ -3,13 +3,12 @@ package com.usatiuk.kleppmanntree;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@Getter
@Setter
public class TreeNode<TimestampT extends Comparable<TimestampT>, PeerIdT extends Comparable<PeerIdT>, MetaT extends NodeMeta, NodeIdT> implements Serializable {
public class TreeNode<TimestampT extends Comparable<TimestampT>, PeerIdT extends Comparable<PeerIdT>, MetaT extends NodeMeta, NodeIdT> {
private final NodeIdT _id;
private NodeIdT _parent = null;
private OpMove<TimestampT, PeerIdT, MetaT, NodeIdT> _lastEffectiveOp = null;

View File

@@ -4,16 +4,11 @@ import com.usatiuk.autoprotomap.runtime.ProtoMirror;
import com.usatiuk.dhfs.objects.persistence.JObjectDataP;
import com.usatiuk.dhfs.objects.repository.ConflictResolver;
import java.io.Serial;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
@ProtoMirror(JObjectDataP.class)
public abstract class JObjectData implements Serializable {
@Serial
private static final long serialVersionUID = 1;
public abstract class JObjectData {
public abstract String getName();
public Class<? extends ConflictResolver> getConflictResolver() {

View File

@@ -13,13 +13,10 @@ import lombok.Setter;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
public class ObjectMetadata implements Serializable {
@Serial
private static final long serialVersionUID = 1;
public class ObjectMetadata {
@Getter
private final String _name;
@Getter

View File

@@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class PersistentRemoteHostsData implements Serializable {
@Serial
private static final long serialVersionUID = 1;
private static final long serialVersionUID = 1L;
@Getter
private final UUID _selfUuid = UUID.randomUUID();

View File

@@ -1,7 +1,6 @@
package com.usatiuk.dhfs.objects.repository.peerdiscovery;
import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
import io.quarkus.arc.lookup.LookupIfProperty;
import io.quarkus.arc.properties.IfBuildProperty;
import io.quarkus.logging.Log;
import io.quarkus.runtime.ShutdownEvent;

View File

@@ -2,7 +2,6 @@ package com.usatiuk.dhfs.objects.repository.peerdiscovery;
import com.google.protobuf.InvalidProtocolBufferException;
import com.usatiuk.dhfs.objects.repository.PeerManager;
import io.quarkus.arc.lookup.LookupIfProperty;
import io.quarkus.arc.properties.IfBuildProperty;
import io.quarkus.logging.Log;
import io.quarkus.runtime.ShutdownEvent;

View File

@@ -2,7 +2,6 @@ package com.usatiuk.dhfs.fuse;
import com.usatiuk.dhfs.TempDataProfile;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.QuarkusTestProfile;
import io.quarkus.test.junit.TestProfile;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.Assertions;