AssumedUnique annotation instead of virtual method

server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java

@@ -2,6 +2,7 @@ package com.usatiuk.dhfs.files.objects;
 
 import com.google.protobuf.ByteString;
 import com.usatiuk.dhfs.files.conflicts.NoOpConflictResolver;
+import com.usatiuk.dhfs.objects.jrepository.AssumedUnique;
 import com.usatiuk.dhfs.objects.jrepository.JObjectData;
 import com.usatiuk.dhfs.objects.persistence.ChunkDataP;
 import com.usatiuk.dhfs.objects.repository.ConflictResolver;
@@ -16,6 +17,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Getter
+@AssumedUnique
 public class ChunkData extends JObjectData {
     @Serial
     private static final long serialVersionUID = 1;
@@ -85,11 +87,6 @@ public class ChunkData extends JObjectData {
         return List.of();
     }
 
-    @Override
-    public boolean assumeUnique() {
-        return true;
-    }
-
     @Override
     public long estimateSize() {
         return _data.getData().size();

server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkInfo.java

@@ -1,6 +1,7 @@
 package com.usatiuk.dhfs.files.objects;
 
 import com.usatiuk.dhfs.files.conflicts.NoOpConflictResolver;
+import com.usatiuk.dhfs.objects.jrepository.AssumedUnique;
 import com.usatiuk.dhfs.objects.jrepository.JObjectData;
 import com.usatiuk.dhfs.objects.jrepository.Movable;
 import com.usatiuk.dhfs.objects.repository.ConflictResolver;
@@ -14,6 +15,7 @@ import java.util.List;
 @Getter
 @EqualsAndHashCode(callSuper = false)
 @Movable
+@AssumedUnique
 public class ChunkInfo extends JObjectData {
     @Serial
     private static final long serialVersionUID = 1;
@@ -51,11 +53,6 @@ public class ChunkInfo extends JObjectData {
         return List.of(ChunkData.getNameFromHash(_hash));
     }
 
-    @Override
-    public boolean assumeUnique() {
-        return true;
-    }
-
     @Override
     public long estimateSize() {
         return _hash.length() * 2L;

server/src/main/java/com/usatiuk/dhfs/objects/jrepository/AssumedUnique.java

@@ -0,0 +1,11 @@
+package com.usatiuk.dhfs.objects.jrepository;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface AssumedUnique {
+}

server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectData.java

@@ -14,10 +14,6 @@ public abstract class JObjectData implements Serializable {
 
     public abstract Class<? extends ConflictResolver> getConflictResolver();
 
-    public boolean assumeUnique() {
-        return false;
-    }
-
     public Class<? extends JObjectData> getRefType() {
         throw new UnsupportedOperationException("This object shouldn't have refs");
     }

server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectManagerImpl.java

@@ -127,7 +127,7 @@ public class JObjectManagerImpl implements JObjectManager {
             try {
                 ret = getFromMap(object.getName());
                 if (ret != null) {
-                    if (!object.assumeUnique())
+                    if (!object.getClass().isAnnotationPresent(AssumedUnique.class))
                         throw new IllegalArgumentException("Trying to insert different object with same key");
                 } else {
                     newObj = new JObject<D>(jObjectResolver, object.getName(), persistentRemoteHostsService.getSelfUuid(), object);
@@ -144,7 +144,9 @@ public class JObjectManagerImpl implements JObjectManager {
                 JObject<D> finalRet = (JObject<D>) ret;
                 boolean finalCreated = created;
                 ret.runWriteLocked(JObject.ResolutionStrategy.NO_RESOLUTION, (m, d, b, i) -> {
-                    if (object.getClass().isAnnotationPresent(PushResolution.class) && object.assumeUnique() && finalRet.getData() == null) {
+                    if (object.getClass().isAnnotationPresent(PushResolution.class)
+                            && object.getClass().isAnnotationPresent(AssumedUnique.class)
+                            && finalRet.getData() == null) {
                         finalRet.externalResolution(object);
                     }
 

server/src/main/java/com/usatiuk/dhfs/objects/repository/peersync/PersistentPeerInfo.java

@@ -1,6 +1,7 @@
 package com.usatiuk.dhfs.objects.repository.peersync;
 
 import com.usatiuk.dhfs.files.conflicts.NoOpConflictResolver;
+import com.usatiuk.dhfs.objects.jrepository.AssumedUnique;
 import com.usatiuk.dhfs.objects.jrepository.JObjectData;
 import com.usatiuk.dhfs.objects.jrepository.PushResolution;
 import com.usatiuk.dhfs.objects.repository.ConflictResolver;
@@ -18,6 +19,7 @@ import java.util.UUID;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @PushResolution
+@AssumedUnique
 public class PersistentPeerInfo extends JObjectData {
     @Serial
     private static final long serialVersionUID = 1;
@@ -34,10 +36,6 @@ public class PersistentPeerInfo extends JObjectData {
         return getNameFromUuid(_uuid);
     }
 
-    public boolean assumeUnique() {
-        return true;
-    }
-
     @Override
     public Class<? extends ConflictResolver> getConflictResolver() {
         return NoOpConflictResolver.class;