Objects: support parallel test running

crashes with env maxreaders reached though
Separate dhfs-fs/fuse/sync-base
2025-10-28 20:47:49 +01:00 · 2025-04-13 14:54:25 +02:00 · 2025-04-13 14:30:00 +02:00 · 2025-04-13 13:09:36 +02:00 · 2025-04-13 12:08:40 +02:00 · 2025-04-13 11:52:50 +02:00
223 changed files with 2265 additions and 1226 deletions
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -57,7 +57,7 @@ jobs:
      - uses: actions/upload-artifact@v4
        with:
          name: DHFS Server Package
-          path: dhfs-parent/server/target/quarkus-app
+          path: dhfs-parent/dhfs-app/target/quarkus-app

      - uses: actions/upload-artifact@v4
        if: ${{ always() }}
--- a/dhfs-parent/.run/Main
+++ b/dhfs-parent/.run/Main
@@ -1,17 +1,16 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Main 2" type="QsApplicationConfigurationType" factoryName="QuarkusApplication">
-        <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.Main"/>
-        <module name="server"/>
-        <option name="VM_PARAMETERS"
-                value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Dcom.usatiuk.dhfs.supportlib.native-path=$ProjectFileDir$/target/classes/native -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:9010:9011"/>
-        <extension name="coverage">
-            <pattern>
-                <option name="PATTERN" value="com.usatiuk.dhfs.*"/>
-                <option name="ENABLED" value="true"/>
-            </pattern>
-        </extension>
-        <method v="2">
-            <option name="Make" enabled="true"/>
-        </method>
-    </configuration>
+  <configuration default="false" name="Main 2" type="QsApplicationConfigurationType" factoryName="QuarkusApplication">
+    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.app.Main" />
+    <module name="dhfs-app" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Dcom.usatiuk.dhfs.supportlib.native-path=$ProjectFileDir$/target/classes/native -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:9010:9011" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="com.usatiuk.dhfs.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
 </component>
--- a/dhfs-parent/.run/Main.run.xml
+++ b/dhfs-parent/.run/Main.run.xml
@@ -1,18 +1,16 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Main" type="QsApplicationConfigurationType" factoryName="QuarkusApplication"
-                   nameIsGenerated="true">
-        <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.Main"/>
-        <module name="server"/>
-        <option name="VM_PARAMETERS"
-                value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Dcom.usatiuk.dhfs.supportlib.native-path=$ProjectFileDir$/target/classes/native -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9010 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021"/>
-        <extension name="coverage">
-            <pattern>
-                <option name="PATTERN" value="com.usatiuk.dhfs.*"/>
-                <option name="ENABLED" value="true"/>
-            </pattern>
-        </extension>
-        <method v="2">
-            <option name="Make" enabled="true"/>
-        </method>
-    </configuration>
+  <configuration default="false" name="Main" type="QsApplicationConfigurationType" factoryName="QuarkusApplication" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.app.Main" />
+    <module name="dhfs-app" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Dcom.usatiuk.dhfs.supportlib.native-path=$ProjectFileDir$/target/classes/native -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=8080 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="com.usatiuk.dhfs.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
 </component>
--- a/dhfs-parent/autoprotomap/deployment/pom.xml
+++ b/dhfs-parent/autoprotomap/deployment/pom.xml
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.usatiuk</groupId>
-        <artifactId>autoprotomap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>autoprotomap-deployment</artifactId>
-    <name>Autoprotomap - Deployment</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>autoprotomap</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-grpc-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <configuration>
-                            <annotationProcessorPaths>
-                                <path>
-                                    <groupId>io.quarkus</groupId>
-                                    <artifactId>quarkus-extension-processor</artifactId>
-                                    <version>${quarkus.platform.version}</version>
-                                </path>
-                            </annotationProcessorPaths>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/AutoprotomapProcessor.java
+++ b/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/AutoprotomapProcessor.java
@@ -1,78 +0,0 @@
-package com.usatiuk.autoprotomap.deployment;
-
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
-import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
-import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.gizmo.SignatureBuilder;
-import jakarta.inject.Singleton;
-import org.jboss.jandex.ClassType;
-import org.jboss.jandex.Type;
-
-class AutoprotomapProcessor {
-    @BuildStep
-    ProtoIndexBuildItem index(ApplicationIndexBuildItem jandex) {
-        var ret = new ProtoIndexBuildItem();
-        var annot = jandex.getIndex().getAnnotations(ProtoMirror.class);
-        for (var a : annot) {
-            var protoTarget = jandex.getIndex().getClassByName(((ClassType) a.value().value()).name());
-//            if (!messageImplementors.contains(protoTarget))
-//                throw new IllegalArgumentException("Expected " + protoTarget + " to be a proto message");
-            System.out.println("Found: " + a.name().toString() + " at " + protoTarget.name().toString() + " of " + a.target().asClass().name().toString());
-            ret.protoMsgToObj.put(protoTarget, a.target().asClass());
-        }
-        return ret;
-    }
-
-    @BuildStep
-    void generateProtoSerializer(ApplicationIndexBuildItem jandex,
-                                 ProtoIndexBuildItem protoIndex,
-                                 BuildProducer<GeneratedBeanBuildItem> generatedClasses) {
-        try {
-            for (var o : protoIndex.protoMsgToObj.entrySet()) {
-                System.out.println("Generating " + o.getKey().toString() + " -> " + o.getValue().toString());
-                var gizmoAdapter = new GeneratedBeanGizmoAdaptor(generatedClasses);
-
-                var msgType = io.quarkus.gizmo.Type.classType(o.getKey().name());
-                var objType = io.quarkus.gizmo.Type.classType(o.getValue().name());
-
-                var type = io.quarkus.gizmo.Type.ParameterizedType.parameterizedType(
-                        io.quarkus.gizmo.Type.classType(ProtoSerializer.class),
-                        msgType, objType);
-
-                var msgJType = Type.create(o.getKey().name(), Type.Kind.CLASS);
-                var objJType = Type.create(o.getValue().name(), Type.Kind.CLASS);
-
-                try (ClassCreator classCreator = ClassCreator.builder()
-                        .className("com.usatiuk.autoprotomap.generated.for" + o.getKey().simpleName())
-                        .signature(SignatureBuilder.forClass().addInterface(type))
-                        .classOutput(gizmoAdapter)
-                        .setFinal(true)
-                        .build()) {
-                    classCreator.addAnnotation(Singleton.class);
-
-                    var generator = new ProtoSerializerGenerator(
-                            jandex.getIndex(),
-                            protoIndex,
-                            classCreator,
-                            msgJType,
-                            objJType
-                    );
-
-                    generator.generate();
-                }
-            }
-        } catch (Throwable e) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(e + "\n");
-            for (var el : e.getStackTrace()) {
-                sb.append(el.toString() + "\n");
-            }
-            System.out.println(sb);
-        }
-    }
-}
--- a/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/Constants.java
+++ b/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/Constants.java
@@ -1,18 +0,0 @@
-package com.usatiuk.autoprotomap.deployment;
-
-public class Constants {
-    public static final String FIELD_PREFIX = "_";
-
-    public static String capitalize(String str) {
-        return str.substring(0, 1).toUpperCase() + str.substring(1);
-    }
-
-    public static String stripPrefix(String str, String prefix) {
-        if (str.startsWith(prefix)) {
-            return str.substring(prefix.length());
-        }
-        return str;
-    }
-
-
-}
--- a/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/Effect.java
+++ b/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/Effect.java
@@ -1,6 +0,0 @@
-package com.usatiuk.autoprotomap.deployment;
-
-@FunctionalInterface
-public interface Effect {
-    void apply();
-}
--- a/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/ProtoIndexBuildItem.java
+++ b/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/ProtoIndexBuildItem.java
@@ -1,10 +0,0 @@
-package com.usatiuk.autoprotomap.deployment;
-
-import io.quarkus.builder.item.SimpleBuildItem;
-import org.apache.commons.collections4.BidiMap;
-import org.apache.commons.collections4.bidimap.DualHashBidiMap;
-import org.jboss.jandex.ClassInfo;
-
-public final class ProtoIndexBuildItem extends SimpleBuildItem {
-    BidiMap<ClassInfo, ClassInfo> protoMsgToObj = new DualHashBidiMap<>();
-}
--- a/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/ProtoSerializerGenerator.java
+++ b/dhfs-parent/autoprotomap/deployment/src/main/java/com/usatiuk/autoprotomap/deployment/ProtoSerializerGenerator.java
@@ -1,342 +0,0 @@
-package com.usatiuk.autoprotomap.deployment;
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Message;
-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import io.quarkus.gizmo.*;
-import jakarta.inject.Inject;
-import org.apache.commons.lang3.tuple.Pair;
-import org.jboss.jandex.*;
-import org.jboss.jandex.Type;
-import org.objectweb.asm.Opcodes;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.IntConsumer;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.usatiuk.autoprotomap.deployment.Constants.*;
-
-public class ProtoSerializerGenerator {
-    private final Index index;
-    private final ProtoIndexBuildItem protoIndex;
-    private final ClassCreator classCreator;
-    private final HashSet<Pair<ClassInfo, ClassInfo>> externalSerializers = new HashSet<>();
-    private final Type topMessageType;
-    private final Type topObjectType;
-
-    public ProtoSerializerGenerator(Index index, ProtoIndexBuildItem protoIndex, ClassCreator classCreator, Type topMessageType, Type topObjectType) {
-        this.index = index;
-        this.protoIndex = protoIndex;
-        this.classCreator = classCreator;
-        this.topMessageType = topMessageType;
-        this.topObjectType = topObjectType;
-    }
-
-    private FieldDescriptor getOutsideSerializer(ClassInfo messageClass, ClassInfo objectClass) {
-        var name = messageClass.name().withoutPackagePrefix() + objectClass.name().withoutPackagePrefix() + "serializer";
-        var msgType = io.quarkus.gizmo.Type.classType(messageClass.name());
-        var objType = io.quarkus.gizmo.Type.classType(objectClass.name());
-        var type = io.quarkus.gizmo.Type.ParameterizedType.parameterizedType(
-                io.quarkus.gizmo.Type.classType(ProtoSerializer.class),
-                msgType, objType);
-        var sig = SignatureBuilder.forField().setType(type).build();
-        var fd = FieldDescriptor.of(classCreator.getClassName(), name, ProtoSerializer.class);
-        if (externalSerializers.add(Pair.of(messageClass, objectClass))) {
-            var fc = classCreator.getFieldCreator(fd);
-            fc.addAnnotation(Inject.class);
-            fc.setSignature(sig);
-            fc.setModifiers(Opcodes.ACC_PUBLIC);
-        }
-        return fd;
-    }
-
-    private void traverseHierarchy(Index index, ClassInfo klass, Consumer<ClassInfo> visitor) {
-        var cur = klass;
-        while (true) {
-            visitor.accept(cur);
-
-            var next = cur.superClassType().name();
-            if (next.equals(DotName.OBJECT_NAME) || next.equals(DotName.RECORD_NAME)) break;
-            cur = index.getClassByName(next);
-        }
-    }
-
-    private ArrayList<FieldInfo> findAllFields(Index index, ClassInfo klass) {
-        ArrayList<FieldInfo> ret = new ArrayList<>();
-        traverseHierarchy(index, klass, cur -> {
-            ret.addAll(cur.fields());
-        });
-        return ret;
-    }
-
-    private void generateBuilderUse(BytecodeCreator bytecodeCreator,
-                                    ResultHandle builder,
-                                    Type messageType, Type objectType,
-                                    ResultHandle object) {
-        var builderType = Type.create(DotName.createComponentized(messageType.name(), "Builder", true), Type.Kind.CLASS);
-
-        var objectClass = index.getClassByName(objectType.name().toString());
-
-        Function<String, String> getterGetter = objectClass.isRecord()
-                ? Function.identity()
-                : s -> "get" + capitalize(stripPrefix(s, FIELD_PREFIX));
-
-        for (var f : findAllFields(index, objectClass)) {
-            var consideredFieldName = stripPrefix(f.name(), FIELD_PREFIX);
-
-            Supplier<ResultHandle> get = () -> {
-                if ((f.flags() & Opcodes.ACC_PUBLIC) != 0)
-                    return bytecodeCreator.readInstanceField(f, object);
-                else {
-                    var fieldGetter = getterGetter.apply(f.name());
-                    return bytecodeCreator.invokeVirtualMethod(
-                            MethodDescriptor.ofMethod(objectType.toString(), fieldGetter, f.type().name().toString()), object);
-                }
-            };
-
-            Effect doSimpleCopy = () -> {
-                var setter = MethodDescriptor.ofMethod(builderType.name().toString(), "set" + capitalize(consideredFieldName),
-                        builderType.name().toString(), f.type().toString());
-
-                var val = get.get();
-                bytecodeCreator.invokeVirtualMethod(setter, builder, val);
-            };
-
-            switch (f.type().kind()) {
-                case CLASS -> {
-                    if (f.type().equals(Type.create(String.class)) || f.type().equals(Type.create(ByteString.class))) {
-                        doSimpleCopy.apply();
-                    } else {
-                        var builderGetter = "get" + capitalize(f.name()) + "Builder";
-                        var protoType = protoIndex.protoMsgToObj.inverseBidiMap().get(index.getClassByName(f.type().name()));
-                        var nestedBuilderType = Type.create(DotName.createComponentized(protoType.name(), "Builder", true), Type.Kind.CLASS);
-                        var nestedBuilder = bytecodeCreator.invokeVirtualMethod(
-                                MethodDescriptor.ofMethod(builderType.toString(), builderGetter, nestedBuilderType.name().toString()), builder);
-
-                        var val = get.get();
-
-                        generateBuilderUse(bytecodeCreator, nestedBuilder, Type.create(protoType.name(), Type.Kind.CLASS), f.type(), val);
-                    }
-                }
-                case PRIMITIVE -> {
-                    doSimpleCopy.apply();
-                }
-                case WILDCARD_TYPE -> throw new UnsupportedOperationException("Wildcards not supported yet");
-                case PARAMETERIZED_TYPE ->
-                        throw new UnsupportedOperationException("Parametrized types not supported yet");
-                case ARRAY -> throw new UnsupportedOperationException("Arrays not supported yet");
-                default -> throw new IllegalStateException("Unexpected type: " + f.type());
-            }
-        }
-    }
-
-    private ResultHandle generateConstructorUse(
-            BytecodeCreator bytecodeCreator,
-            ClassCreator classCreator,
-            Type messageType, Type objectType,
-            ResultHandle message
-    ) {
-        var constructor = findAllArgsConstructor(index, index.getClassByName(objectType.name()));
-        if (constructor == null) {
-            throw new IllegalStateException("No constructor found for type: " + objectType.name());
-        }
-        var argMap = new ResultHandle[constructor.parametersCount()];
-
-        for (int i = 0; i < argMap.length; i++) {
-            var type = constructor.parameterType(i);
-            var strippedName = stripPrefix(constructor.parameterName(i), FIELD_PREFIX);
-
-            IntConsumer doSimpleCopy = (arg) -> {
-                var call = MethodDescriptor.ofMethod(messageType.name().toString(), "get" + capitalize(strippedName),
-                        type.name().toString());
-                argMap[arg] = bytecodeCreator.invokeVirtualMethod(call, message);
-            };
-
-            switch (type.kind()) {
-                case CLASS -> {
-                    if (type.equals(Type.create(String.class)) || type.equals(Type.create(ByteString.class))) {
-                        doSimpleCopy.accept(i);
-                    } else {
-                        var nestedProtoType = protoIndex.protoMsgToObj.inverseBidiMap().get(index.getClassByName(type.name()));
-                        var call = MethodDescriptor.ofMethod(messageType.name().toString(), "get" + capitalize(strippedName),
-                                nestedProtoType.name().toString());
-                        var nested = bytecodeCreator.invokeVirtualMethod(call, message);
-                        argMap[i] = generateConstructorUse(bytecodeCreator, classCreator, Type.create(nestedProtoType.name(), Type.Kind.CLASS), type, nested);
-                    }
-                }
-                case PRIMITIVE -> {
-                    doSimpleCopy.accept(i);
-                }
-                case WILDCARD_TYPE -> throw new UnsupportedOperationException("Wildcards not supported yet");
-                case PARAMETERIZED_TYPE ->
-                        throw new UnsupportedOperationException("Parametrized types not supported yet");
-                case ARRAY -> throw new UnsupportedOperationException("Arrays not supported yet");
-                default -> throw new IllegalStateException("Unexpected type: " + type);
-            }
-        }
-
-        return bytecodeCreator.newInstance(constructor, argMap);
-    }
-
-    private MethodInfo findAllArgsConstructor(Index index, ClassInfo klass) {
-        ArrayList<FieldInfo> fields = findAllFields(index, klass);
-
-        var fieldCount = fields.size();
-        var fieldNames = fields.stream().map(f -> stripPrefix(f.name(), FIELD_PREFIX)).sorted().toList();
-        var fieldNameToType = fields.stream().collect(Collectors.toMap(f -> stripPrefix(f.name(), FIELD_PREFIX), FieldInfo::type));
-
-        for (var m : klass.constructors()) {
-            if (m.parametersCount() != fieldCount) continue;
-            var parameterNames = m.parameters().stream().map(n -> stripPrefix(n.name(), FIELD_PREFIX)).sorted().toList();
-            if (!Objects.equals(fieldNames, parameterNames)) continue;
-
-            for (var p : m.parameters()) {
-                if (!Objects.equals(fieldNameToType.get(stripPrefix(p.name(), FIELD_PREFIX)), p.type())) continue;
-            }
-
-            return m;
-        }
-
-        return null;
-    }
-
-    public void generateAbstract() {
-        var kids = Stream.concat(index.getAllKnownSubclasses(topObjectType.name()).stream(),
-                        index.getAllKnownImplementors(topObjectType.name()).stream())
-                .filter(k -> !k.isAbstract() && !k.isInterface()).toList();
-
-        try (MethodCreator method = classCreator.getMethodCreator("serialize",
-                Message.class, Object.class)) {
-
-            method.setModifiers(Opcodes.ACC_PUBLIC);
-
-            var builderType = Type.create(DotName.createComponentized(topMessageType.name(), "Builder", true), Type.Kind.CLASS);
-
-            var builder = method.invokeStaticMethod(MethodDescriptor.ofMethod(topMessageType.name().toString(), "newBuilder", builderType.name().toString()));
-
-            var arg = method.getMethodParam(0);
-
-            for (var nestedObjClass : kids) {
-                System.out.println("Generating " + nestedObjClass.name() + " serializer for " + topObjectType.name());
-                var nestedObjType = Type.create(nestedObjClass.name(), Type.Kind.CLASS);
-                var nestedMessageClass = protoIndex.protoMsgToObj.inverseBidiMap().get(nestedObjClass);
-                boolean doExternalCall = false;
-                if (nestedMessageClass == null) {
-                    var msgInfo = index.getClassByName(topMessageType.name());
-                    nestedMessageClass = index.getClassByName(msgInfo.method("get" + capitalize(nestedObjType.name().withoutPackagePrefix())).returnType().name());
-                    doExternalCall = true;
-                }
-                var nestedMessageType = Type.create(nestedMessageClass.name(), Type.Kind.CLASS);
-
-                var statement = method.ifTrue(method.instanceOf(arg, nestedObjClass.name().toString()));
-
-                try (var branch = statement.trueBranch()) {
-                    if (doExternalCall) {
-                        var externalSerializer = getOutsideSerializer(nestedMessageClass, nestedObjClass);
-                        var serializerLoaded = branch.readInstanceField(externalSerializer, branch.getThis());
-                        var serialized = branch.invokeInterfaceMethod(
-                                MethodDescriptor.ofMethod(ProtoSerializer.class,
-                                        "serialize", Message.class, Object.class),
-                                serializerLoaded, arg);
-                        branch.invokeVirtualMethod(MethodDescriptor.ofMethod(builderType.name().toString(),
-                                "set" + capitalize(nestedObjType.name().withoutPackagePrefix()),
-                                builderType.name().toString(), nestedMessageType.name().toString()), builder, serialized);
-                    } else {
-                        var nestedBuilderType = Type.create(DotName.createComponentized(nestedMessageType.name(), "Builder", true), Type.Kind.CLASS);
-                        var nestedBuilder = branch.invokeVirtualMethod(MethodDescriptor.ofMethod(builderType.name().toString(),
-                                "get" + capitalize(nestedObjType.name().withoutPackagePrefix()) + "Builder",
-                                nestedBuilderType.name().toString()), builder);
-                        generateBuilderUse(branch, nestedBuilder, nestedMessageType, nestedObjType, arg);
-                    }
-                    var result = branch.invokeVirtualMethod(MethodDescriptor.ofMethod(builderType.name().toString(), "build", topMessageType.name().toString()), builder);
-                    branch.returnValue(result);
-                }
-            }
-            method.throwException(IllegalArgumentException.class, "Unknown object type");
-        }
-
-        try (MethodCreator method = classCreator.getMethodCreator("deserialize",
-                Object.class, Message.class)) {
-            method.setModifiers(Opcodes.ACC_PUBLIC);
-            var arg = method.getMethodParam(0);
-
-            for (var nestedObjClass : kids) {
-                System.out.println("Generating " + nestedObjClass.name() + " deserializer for " + topObjectType.name());
-                var nestedObjType = Type.create(nestedObjClass.name(), Type.Kind.CLASS);
-
-                var nestedMessageClass = protoIndex.protoMsgToObj.inverseBidiMap().get(nestedObjClass);
-                boolean doExternalCall = false;
-                if (nestedMessageClass == null) {
-                    var msgInfo = index.getClassByName(topMessageType.name());
-                    nestedMessageClass = index.getClassByName(msgInfo.method("get" + capitalize(nestedObjType.name().withoutPackagePrefix())).returnType().name());
-                    doExternalCall = true;
-                }
-
-                var nestedMessageType = Type.create(nestedMessageClass.name(), Type.Kind.CLASS);
-
-                var typeCheck = method.invokeVirtualMethod(MethodDescriptor.ofMethod(topMessageType.name().toString(),
-                        "has" + capitalize(nestedObjType.name().withoutPackagePrefix()), boolean.class), arg);
-
-                var statement = method.ifTrue(typeCheck);
-
-                try (var branch = statement.trueBranch()) {
-                    var nestedMessage = branch.invokeVirtualMethod(MethodDescriptor.ofMethod(topMessageType.name().toString(),
-                            "get" + capitalize(nestedObjType.name().withoutPackagePrefix()), nestedMessageType.name().toString()), arg);
-                    if (doExternalCall) {
-                        var externalSerializer = getOutsideSerializer(nestedMessageClass, nestedObjClass);
-                        var serializerLoaded = branch.readInstanceField(externalSerializer, branch.getThis());
-                        branch.returnValue(branch.invokeInterfaceMethod(
-                                MethodDescriptor.ofMethod(ProtoSerializer.class,
-                                        "deserialize", Object.class, Message.class),
-                                serializerLoaded, nestedMessage));
-                    } else {
-                        branch.returnValue(generateConstructorUse(branch, classCreator, nestedMessageType, nestedObjType, nestedMessage));
-                    }
-                }
-            }
-            method.throwException(IllegalArgumentException.class, "Unknown object type");
-        }
-    }
-
-    public void generate() {
-        var objInfo = index.getClassByName(topObjectType.name());
-        if (objInfo.isAbstract() || objInfo.isInterface()) {
-            generateAbstract();
-            return;
-        }
-
-        try (MethodCreator method = classCreator.getMethodCreator("serialize",
-                Message.class, Object.class)) {
-
-            method.setModifiers(Opcodes.ACC_PUBLIC);
-
-            var builderType = Type.create(DotName.createComponentized(topMessageType.name(), "Builder", true), Type.Kind.CLASS);
-
-            var builder = method.invokeStaticMethod(MethodDescriptor.ofMethod(topMessageType.name().toString(), "newBuilder", builderType.name().toString()));
-
-            var arg = method.getMethodParam(0);
-
-            generateBuilderUse(method, builder, topMessageType, topObjectType, arg);
-
-            var result = method.invokeVirtualMethod(MethodDescriptor.ofMethod(builderType.name().toString(), "build", topMessageType.name().toString()), builder);
-
-            method.returnValue(result);
-        }
-
-        try (MethodCreator method = classCreator.getMethodCreator("deserialize",
-                Object.class, Message.class)) {
-            method.setModifiers(Opcodes.ACC_PUBLIC);
-
-            var arg = method.getMethodParam(0);
-
-            method.returnValue(generateConstructorUse(method, classCreator, topMessageType, topObjectType, arg));
-        }
-
-    }
-}
--- a/dhfs-parent/autoprotomap/deployment/src/test/java/com/usatiuk/autoprotomap/test/AutoprotomapDevModeTest.java
+++ b/dhfs-parent/autoprotomap/deployment/src/test/java/com/usatiuk/autoprotomap/test/AutoprotomapDevModeTest.java
@@ -1,22 +0,0 @@
-package com.usatiuk.autoprotomap.test;
-
-import io.quarkus.test.QuarkusDevModeTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-public class AutoprotomapDevModeTest {
-
-    // Start hot reload (DevMode) test with your extension loaded
-    @RegisterExtension
-    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
-
-    @Test
-    public void writeYourOwnDevModeTest() {
-        // Write your dev mode tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
-        Assertions.assertTrue(true, "Add dev mode assertions to " + getClass().getName());
-    }
-}
--- a/dhfs-parent/autoprotomap/deployment/src/test/java/com/usatiuk/autoprotomap/test/AutoprotomapTest.java
+++ b/dhfs-parent/autoprotomap/deployment/src/test/java/com/usatiuk/autoprotomap/test/AutoprotomapTest.java
@@ -1,22 +0,0 @@
-package com.usatiuk.autoprotomap.test;
-
-import io.quarkus.test.QuarkusUnitTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-public class AutoprotomapTest {
-
-    // Start unit test with your extension loaded
-    @RegisterExtension
-    static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
-
-    @Test
-    public void writeYourOwnUnitTest() {
-        // Write your unit tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
-        Assertions.assertTrue(true, "Add some assertions to " + getClass().getName());
-    }
-}
--- a/dhfs-parent/autoprotomap/integration-tests/pom.xml
+++ b/dhfs-parent/autoprotomap/integration-tests/pom.xml
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.usatiuk</groupId>
-        <artifactId>autoprotomap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>autoprotomap-integration-tests</artifactId>
-    <name>Autoprotomap - Integration Tests</name>
-
-    <properties>
-        <skipITs>true</skipITs>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>autoprotomap</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>autoprotomap-deployment</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-grpc</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>generate-code</goal>
-                            <goal>generate-code-tests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <systemPropertyVariables>
-                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner
-                        </native.image.path>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <properties>
-                <skipITs>false</skipITs>
-                <quarkus.native.enabled>true</quarkus.native.enabled>
-            </properties>
-        </profile>
-    </profiles>
-</project>
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/AbstractObject.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/AbstractObject.java
@@ -1,7 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-
-@ProtoMirror(AbstractProto.class)
-public abstract class AbstractObject {
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/CustomObject.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/CustomObject.java
@@ -1,10 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public class CustomObject extends AbstractObject {
-    public int testNum = 0;
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/CustomObjectSerializer.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/CustomObjectSerializer.java
@@ -1,17 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import jakarta.inject.Singleton;
-
-@Singleton
-public class CustomObjectSerializer implements ProtoSerializer<CustomObjectProto, CustomObject> {
-    @Override
-    public CustomObject deserialize(CustomObjectProto message) {
-        return new CustomObject(2);
-    }
-
-    @Override
-    public CustomObjectProto serialize(CustomObject object) {
-        return CustomObjectProto.newBuilder().setTest(1).build();
-    }
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/InterfaceObject.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/InterfaceObject.java
@@ -1,8 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-
-@ProtoMirror(InterfaceObjectProto.class)
-public interface InterfaceObject {
-    String key();
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/NestedObject.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/NestedObject.java
@@ -1,15 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.google.protobuf.ByteString;
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@ProtoMirror(NestedObjectProto.class)
-@AllArgsConstructor
-@Getter
-public class NestedObject extends AbstractObject {
-    public SimpleObject object;
-    public String _nestedName;
-    public ByteString _nestedSomeBytes;
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/RecordObject.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/RecordObject.java
@@ -1,7 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-
-@ProtoMirror(RecordObjectProto.class)
-public record RecordObject(String key) implements InterfaceObject {
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/RecordObject2.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/RecordObject2.java
@@ -1,7 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-
-@ProtoMirror(RecordObject2Proto.class)
-public record RecordObject2(String key, int value) implements InterfaceObject {
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/SimpleObject.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/java/com/usatiuk/autoprotomap/it/SimpleObject.java
@@ -1,15 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.google.protobuf.ByteString;
-import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@ProtoMirror(SimpleObjectProto.class)
-@AllArgsConstructor
-@Getter
-public class SimpleObject extends AbstractObject {
-    public int numfield = 0;
-    private String name;
-    public ByteString someBytes;
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/proto/autoprotomap_test.proto
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/proto/autoprotomap_test.proto
@@ -1,47 +0,0 @@
-syntax = "proto3";
-
-option java_multiple_files = true;
-option java_package = "com.usatiuk.autoprotomap.it";
-option java_outer_classname = "TestProto";
-
-package autoprotomap.test;
-
-message SimpleObjectProto {
-  int32 numfield = 1;
-  string name = 2;
-  bytes someBytes = 3;
-}
-
-message NestedObjectProto {
-  SimpleObjectProto object = 1;
-  string nestedName = 2;
-  bytes nestedSomeBytes = 3;
-}
-
-message CustomObjectProto {
-  int64 test = 1;
-}
-
-message AbstractProto {
-  oneof obj {
-    NestedObjectProto nestedObject = 1;
-    SimpleObjectProto simpleObject = 2;
-    CustomObjectProto customObject = 3;
-  }
-}
-
-message RecordObjectProto {
-  string key = 1;
-}
-
-message RecordObject2Proto {
-  string key = 1;
-  int32 value = 2;
-}
-
-message InterfaceObjectProto {
-  oneof obj {
-    RecordObjectProto recordObject = 1;
-    RecordObject2Proto recordObject2 = 2;
-  }
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/test/java/com/usatiuk/autoprotomap/it/AutoprotomapResourceIT.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/test/java/com/usatiuk/autoprotomap/it/AutoprotomapResourceIT.java
@@ -1,7 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class AutoprotomapResourceIT extends AutoprotomapResourceTest {
-}
--- a/dhfs-parent/autoprotomap/integration-tests/src/test/java/com/usatiuk/autoprotomap/it/AutoprotomapResourceTest.java
+++ b/dhfs-parent/autoprotomap/integration-tests/src/test/java/com/usatiuk/autoprotomap/it/AutoprotomapResourceTest.java
@@ -1,113 +0,0 @@
-package com.usatiuk.autoprotomap.it;
-
-import com.google.protobuf.ByteString;
-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.inject.Inject;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-
-@QuarkusTest
-public class AutoprotomapResourceTest {
-    @Inject
-    ProtoSerializer<SimpleObjectProto, SimpleObject> simpleProtoSerializer;
-    @Inject
-    ProtoSerializer<NestedObjectProto, NestedObject> nestedProtoSerializer;
-    @Inject
-    ProtoSerializer<AbstractProto, AbstractObject> abstractProtoSerializer;
-    @Inject
-    ProtoSerializer<InterfaceObjectProto, InterfaceObject> interfaceProtoSerializer;
-
-    @Test
-    public void testSimple() {
-        var ret = simpleProtoSerializer.serialize(new SimpleObject(1234, "simple test", ByteString.copyFrom(new byte[]{1, 2, 3})));
-        Assertions.assertEquals(1234, ret.getNumfield());
-        Assertions.assertEquals("simple test", ret.getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), ret.getSomeBytes());
-
-        var des = simpleProtoSerializer.deserialize(ret);
-        Assertions.assertEquals(1234, des.getNumfield());
-        Assertions.assertEquals("simple test", des.getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), des.getSomeBytes());
-    }
-
-    @Test
-    public void testNested() {
-        var ret = nestedProtoSerializer.serialize(
-                new NestedObject(
-                        new SimpleObject(333, "nested so", ByteString.copyFrom(new byte[]{1, 2, 3})),
-                        "nested obj", ByteString.copyFrom(new byte[]{4, 5, 6})));
-        Assertions.assertEquals(333, ret.getObject().getNumfield());
-        Assertions.assertEquals("nested so", ret.getObject().getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), ret.getObject().getSomeBytes());
-        Assertions.assertEquals("nested obj", ret.getNestedName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{4, 5, 6}), ret.getNestedSomeBytes());
-
-        var des = nestedProtoSerializer.deserialize(ret);
-        Assertions.assertEquals(333, des.object.numfield);
-        Assertions.assertEquals(333, des.getObject().getNumfield());
-        Assertions.assertEquals("nested so", des.getObject().getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), des.getObject().getSomeBytes());
-        Assertions.assertEquals("nested obj", des.get_nestedName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{4, 5, 6}), des.get_nestedSomeBytes());
-    }
-
-    @Test
-    public void testAbstractSimple() {
-        var ret = abstractProtoSerializer.serialize(new SimpleObject(1234, "simple test", ByteString.copyFrom(new byte[]{1, 2, 3})));
-        Assertions.assertEquals(1234, ret.getSimpleObject().getNumfield());
-        Assertions.assertEquals("simple test", ret.getSimpleObject().getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), ret.getSimpleObject().getSomeBytes());
-
-        var des = (SimpleObject) abstractProtoSerializer.deserialize(ret);
-        Assertions.assertEquals(1234, des.getNumfield());
-        Assertions.assertEquals("simple test", des.getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), des.getSomeBytes());
-    }
-
-    @Test
-    public void testAbstractCustom() {
-        var ret = abstractProtoSerializer.serialize(new CustomObject(1234));
-        Assertions.assertEquals(1, ret.getCustomObject().getTest());
-
-        var des = (CustomObject) abstractProtoSerializer.deserialize(ret);
-        Assertions.assertEquals(2, des.getTestNum());
-    }
-
-    @Test
-    public void testAbstractNested() {
-        var ret = abstractProtoSerializer.serialize(
-                new NestedObject(
-                        new SimpleObject(333, "nested so", ByteString.copyFrom(new byte[]{1, 2, 3})),
-                        "nested obj", ByteString.copyFrom(new byte[]{4, 5, 6})));
-        Assertions.assertEquals(333, ret.getNestedObject().getObject().getNumfield());
-        Assertions.assertEquals("nested so", ret.getNestedObject().getObject().getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), ret.getNestedObject().getObject().getSomeBytes());
-        Assertions.assertEquals("nested obj", ret.getNestedObject().getNestedName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{4, 5, 6}), ret.getNestedObject().getNestedSomeBytes());
-
-        var des = (NestedObject) abstractProtoSerializer.deserialize(ret);
-        Assertions.assertEquals(333, des.object.numfield);
-        Assertions.assertEquals(333, des.getObject().getNumfield());
-        Assertions.assertEquals("nested so", des.getObject().getName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{1, 2, 3}), des.getObject().getSomeBytes());
-        Assertions.assertEquals("nested obj", des.get_nestedName());
-        Assertions.assertEquals(ByteString.copyFrom(new byte[]{4, 5, 6}), des.get_nestedSomeBytes());
-    }
-
-    @Test
-    public void testInterface() {
-        var ret = interfaceProtoSerializer.serialize(new RecordObject("record test"));
-        Assertions.assertEquals("record test", ret.getRecordObject().getKey());
-        var des = (RecordObject) interfaceProtoSerializer.deserialize(ret);
-        Assertions.assertEquals("record test", des.key());
-
-        var ret2 = interfaceProtoSerializer.serialize(new RecordObject2("record test 2", 1234));
-        Assertions.assertEquals("record test 2", ret2.getRecordObject2().getKey());
-        Assertions.assertEquals(1234, ret2.getRecordObject2().getValue());
-        var des2 = (RecordObject2) interfaceProtoSerializer.deserialize(ret2);
-        Assertions.assertEquals("record test 2", des2.key());
-        Assertions.assertEquals(1234, des2.value());
-    }
-}
--- a/dhfs-parent/autoprotomap/pom.xml
+++ b/dhfs-parent/autoprotomap/pom.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.usatiuk.dhfs</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>com.usatiuk</groupId>
-    <artifactId>autoprotomap-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Autoprotomap - Parent</name>
-
-    <modules>
-        <module>deployment</module>
-        <module>runtime</module>
-        <module>integration-tests</module>
-    </modules>
-
-</project>
--- a/dhfs-parent/autoprotomap/runtime/pom.xml
+++ b/dhfs-parent/autoprotomap/runtime/pom.xml
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.usatiuk</groupId>
-        <artifactId>autoprotomap-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>autoprotomap</artifactId>
-    <name>Autoprotomap - Runtime</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-grpc</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-extension-maven-plugin</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>extension-descriptor</goal>
-                        </goals>
-                        <configuration>
-                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
-                            </deployment>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <configuration>
-                            <annotationProcessorPaths>
-                                <path>
-                                    <groupId>io.quarkus</groupId>
-                                    <artifactId>quarkus-extension-processor</artifactId>
-                                    <version>${quarkus.platform.version}</version>
-                                </path>
-                            </annotationProcessorPaths>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/dhfs-parent/autoprotomap/runtime/src/main/java/com/usatiuk/autoprotomap/runtime/ProtoMirror.java
+++ b/dhfs-parent/autoprotomap/runtime/src/main/java/com/usatiuk/autoprotomap/runtime/ProtoMirror.java
@@ -1,12 +0,0 @@
-package com.usatiuk.autoprotomap.runtime;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.CLASS)
-@Target(ElementType.TYPE)
-public @interface ProtoMirror {
-    Class<?> value() default Object.class;
-}
--- a/dhfs-parent/autoprotomap/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/dhfs-parent/autoprotomap/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,9 +0,0 @@
-name: Autoprotomap
-#description: Do something useful.
-metadata:
-#  keywords:
-#    - autoprotomap
-#  guide: ... # To create and publish this guide, see https://github.com/quarkiverse/quarkiverse/wiki#documenting-your-extension
-#  categories:
-#    - "miscellaneous"
-#  status: "preview"
--- a/dhfs-parent/dhfs-app/.dockerignore
+++ b/dhfs-parent/dhfs-app/.dockerignore
--- a/dhfs-parent/dhfs-app/.gitignore
+++ b/dhfs-parent/dhfs-app/.gitignore
--- a/dhfs-parent/dhfs-app/Dockerfile
+++ b/dhfs-parent/dhfs-app/Dockerfile
--- a/dhfs-parent/dhfs-app/docker-compose.yml
+++ b/dhfs-parent/dhfs-app/docker-compose.yml
--- a/dhfs-parent/dhfs-app/pom.xml
+++ b/dhfs-parent/dhfs-app/pom.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.usatiuk.dhfs</groupId>
+    <artifactId>dhfs-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.usatiuk.dhfs</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.openhft</groupId>
+            <artifactId>zero-allocation-hashing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-scheduler</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.SerCeMan</groupId>
+            <artifactId>jnr-fuse</artifactId>
+            <version>44ed40f8ce</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-ffi</artifactId>
+            <version>2.2.16</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-posix</artifactId>
+            <version>3.1.19</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-constants</artifactId>
+            <version>0.10.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.pcollections</groupId>
+            <artifactId>pcollections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk</groupId>
+            <artifactId>kleppmanntree</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>supportlib</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>objects</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>dhfs-fs</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>dhfs-fuse</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>sync-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>1C</forkCount>
+                    <reuseForks>false</reuseForks>
+                    <parallel>classes</parallel>
+                    <systemPropertyVariables>
+                        <junit.jupiter.execution.parallel.enabled>
+                            false
+                        </junit.jupiter.execution.parallel.enabled>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <junit.jupiter.execution.parallel.enabled>
+                            true
+                        </junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>
+                            concurrent
+                        </junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.config.dynamic.factor>
+                            0.5
+                        </junit.jupiter.execution.parallel.config.dynamic.factor>
+                        <junit.platform.output.capture.stdout>true</junit.platform.output.capture.stdout>
+                        <junit.platform.output.capture.stderr>true</junit.platform.output.capture.stderr>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>quarkus-plugin</id>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.jvm
+++ b/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.jvm
--- a/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.legacy-jar
+++ b/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.legacy-jar
--- a/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.native
+++ b/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.native
--- a/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.native-micro
+++ b/dhfs-parent/dhfs-app/src/main/docker/Dockerfile.native-micro
--- a/dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfs/app/Main.java
+++ b/dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfs/app/Main.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.app;

 import io.quarkus.runtime.Quarkus;
 import io.quarkus.runtime.QuarkusApplication;
--- a/dhfs-parent/autoprotomap/integration-tests/src/main/resources/application.properties
+++ b/dhfs-parent/autoprotomap/integration-tests/src/main/resources/application.properties
--- a/dhfs-parent/dhfs-app/src/main/resources/application.properties
+++ b/dhfs-parent/dhfs-app/src/main/resources/application.properties
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsImage.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsImage.java
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/ResyncIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/ResyncIT.java
--- a/dhfs-parent/dhfs-app/src/test/resources/application.properties
+++ b/dhfs-parent/dhfs-app/src/test/resources/application.properties
--- a/dhfs-parent/dhfs-fs/.dockerignore
+++ b/dhfs-parent/dhfs-fs/.dockerignore
@@ -0,0 +1,5 @@
+*
+!target/*-runner
+!target/*-runner.jar
+!target/lib/*
+!target/quarkus-app/*
--- a/dhfs-parent/dhfs-fs/.gitignore
+++ b/dhfs-parent/dhfs-fs/.gitignore
@@ -0,0 +1,43 @@
+#Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties
+.flattened-pom.xml
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Local environment
+.env
+
+# Plugin directory
+/.quarkus/cli/plugins/
--- a/dhfs-parent/dhfs-fs/Dockerfile
+++ b/dhfs-parent/dhfs-fs/Dockerfile
@@ -0,0 +1,2 @@
+FROM azul/zulu-openjdk-debian:21-jre-latest
+RUN apt update && apt install -y libfuse2 curl
--- a/dhfs-parent/dhfs-fs/docker-compose.yml
+++ b/dhfs-parent/dhfs-fs/docker-compose.yml
@@ -0,0 +1,43 @@
+version: "3.2"
+
+services:
+  dhfs1:
+    build: .
+    privileged: true
+    devices:
+      - /dev/fuse
+    volumes:
+      - $HOME/dhfs/dhfs1:/dhfs_root
+      - $HOME/dhfs/dhfs1_f:/dhfs_root/fuse:rshared
+      - ./target/quarkus-app:/app
+    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
+     -Ddhfs.objects.root=/dhfs_root/d 
+     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0 
+     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+     -jar /app/quarkus-run.jar"
+    ports:
+      - 8080:8080
+      - 8081:8443
+      - 5005:5005
+  dhfs2:
+    build: .
+    privileged: true
+    devices:
+      - /dev/fuse
+    volumes:
+      - $HOME/dhfs/dhfs2:/dhfs_root
+      - $HOME/dhfs/dhfs2_f:/dhfs_root/fuse:rshared
+      - ./target/quarkus-app:/app
+    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+     --add-exports java.base/jdk.internal.access=ALL-UNNAMED
+     --add-opens=java.base/java.nio=ALL-UNNAMED
+     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
+     -Ddhfs.objects.root=/dhfs_root/d 
+     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0
+     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010
+     -jar /app/quarkus-run.jar"
+    ports:
+      - 8090:8080
+      - 8091:8443
+      - 5010:5010
--- a/dhfs-parent/dhfs-fs/pom.xml
+++ b/dhfs-parent/dhfs-fs/pom.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.usatiuk.dhfs</groupId>
+    <artifactId>dhfs-fs</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.usatiuk.dhfs</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.openhft</groupId>
+            <artifactId>zero-allocation-hashing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-scheduler</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.SerCeMan</groupId>
+            <artifactId>jnr-fuse</artifactId>
+            <version>44ed40f8ce</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-ffi</artifactId>
+            <version>2.2.16</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-posix</artifactId>
+            <version>3.1.19</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-constants</artifactId>
+            <version>0.10.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.pcollections</groupId>
+            <artifactId>pcollections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk</groupId>
+            <artifactId>kleppmanntree</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>supportlib</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>objects</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>sync-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>1C</forkCount>
+                    <reuseForks>false</reuseForks>
+                    <parallel>classes</parallel>
+                    <systemPropertyVariables>
+                        <junit.jupiter.execution.parallel.enabled>
+                            false
+                        </junit.jupiter.execution.parallel.enabled>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <junit.jupiter.execution.parallel.enabled>
+                            true
+                        </junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>
+                            concurrent
+                        </junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.config.dynamic.factor>
+                            0.5
+                        </junit.jupiter.execution.parallel.config.dynamic.factor>
+                        <junit.platform.output.capture.stdout>true</junit.platform.output.capture.stdout>
+                        <junit.platform.output.capture.stderr>true</junit.platform.output.capture.stderr>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>quarkus-plugin</id>
+                        <goals>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.jvm
+++ b/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.jvm
@@ -0,0 +1,97 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the container image run:
+#
+# ./mvnw package
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/server-jvm .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-jvm
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-jvm
+#
+# This image uses the `run-java.sh` script to run the application.
+# This scripts computes the command line to execute your Java application, and
+# includes memory/GC tuning.
+# You can configure the behavior using the following environment properties:
+# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
+# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
+#   in JAVA_OPTS (example: "-Dsome.property=foo")
+# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
+#   used to calculate a default maximal heap memory based on a containers restriction.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
+#   of the container available memory as set here. The default is `50` which means 50%
+#   of the available memory is used as an upper boundary. You can skip this mechanism by
+#   setting this value to `0` in which case no `-Xmx` option is added.
+# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
+#   is used to calculate a default initial heap memory based on the maximum heap memory.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
+#   of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
+#   is used as the initial heap size. You can skip this mechanism by setting this value
+#   to `0` in which case no `-Xms` option is added (example: "25")
+# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
+#   This is used to calculate the maximum value of the initial heap memory. If used in
+#   a container without any memory constraints for the container then this option has
+#   no effect. If there is a memory constraint then `-Xms` is limited to the value set
+#   here. The default is 4096MB which means the calculated value of `-Xms` never will
+#   be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
+# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
+#   when things are happening. This option, if set to true, will set
+#  `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
+# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
+#    true").
+# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
+# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
+#   https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
+# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
+# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
+#   (example: "20")
+# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
+#   (example: "40")
+# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
+#   (example: "4")
+# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
+#   previous GC times. (example: "90")
+# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
+# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
+# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
+#   contain the necessary JRE command-line options to specify the required GC, which
+#   will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
+# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
+# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
+# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
+#   accessed directly. (example: "foo.example.com,bar.example.com")
+#
+###
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
+
+ENV LANGUAGE='en_US:en'
+
+
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
+COPY --chown=185 target/quarkus-app/*.jar /deployments/
+COPY --chown=185 target/quarkus-app/app/ /deployments/app/
+COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
+
+EXPOSE 8080
+USER 185
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
+
--- a/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.legacy-jar
+++ b/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.legacy-jar
@@ -0,0 +1,93 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the container image run:
+#
+# ./mvnw package -Dquarkus.package.jar.type=legacy-jar
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/server-legacy-jar .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-legacy-jar
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-legacy-jar
+#
+# This image uses the `run-java.sh` script to run the application.
+# This scripts computes the command line to execute your Java application, and
+# includes memory/GC tuning.
+# You can configure the behavior using the following environment properties:
+# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
+# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
+#   in JAVA_OPTS (example: "-Dsome.property=foo")
+# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
+#   used to calculate a default maximal heap memory based on a containers restriction.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
+#   of the container available memory as set here. The default is `50` which means 50%
+#   of the available memory is used as an upper boundary. You can skip this mechanism by
+#   setting this value to `0` in which case no `-Xmx` option is added.
+# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
+#   is used to calculate a default initial heap memory based on the maximum heap memory.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
+#   of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
+#   is used as the initial heap size. You can skip this mechanism by setting this value
+#   to `0` in which case no `-Xms` option is added (example: "25")
+# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
+#   This is used to calculate the maximum value of the initial heap memory. If used in
+#   a container without any memory constraints for the container then this option has
+#   no effect. If there is a memory constraint then `-Xms` is limited to the value set
+#   here. The default is 4096MB which means the calculated value of `-Xms` never will
+#   be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
+# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
+#   when things are happening. This option, if set to true, will set
+#  `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
+# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
+#    true").
+# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
+# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
+#   https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
+# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
+# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
+#   (example: "20")
+# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
+#   (example: "40")
+# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
+#   (example: "4")
+# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
+#   previous GC times. (example: "90")
+# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
+# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
+# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
+#   contain the necessary JRE command-line options to specify the required GC, which
+#   will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
+# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
+# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
+# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
+#   accessed directly. (example: "foo.example.com,bar.example.com")
+#
+###
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
+
+ENV LANGUAGE='en_US:en'
+
+
+COPY target/lib/* /deployments/lib/
+COPY target/*-runner.jar /deployments/quarkus-run.jar
+
+EXPOSE 8080
+USER 185
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
--- a/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.native
+++ b/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.native
@@ -0,0 +1,27 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+#
+# Before building the container image run:
+#
+# ./mvnw package -Dnative
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native -t quarkus/server .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server
+#
+###
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
+WORKDIR /work/
+RUN chown 1001 /work \
+    && chmod "g+rwX" /work \
+    && chown 1001:root /work
+COPY --chown=1001:root target/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
--- a/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.native-micro
+++ b/dhfs-parent/dhfs-fs/src/main/docker/Dockerfile.native-micro
@@ -0,0 +1,30 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+# It uses a micro base image, tuned for Quarkus native executables.
+# It reduces the size of the resulting container image.
+# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
+#
+# Before building the container image run:
+#
+# ./mvnw package -Dnative
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/server .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server
+#
+###
+FROM quay.io/quarkus/quarkus-micro-image:2.0
+WORKDIR /work/
+RUN chown 1001 /work \
+    && chmod "g+rwX" /work \
+    && chown 1001:root /work
+COPY --chown=1001:root target/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java
@@ -1,6 +1,6 @@
 package com.usatiuk.dhfs.files.objects;

-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
+import com.usatiuk.dhfs.ProtoSerializer;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.persistence.ChunkDataP;
 import com.usatiuk.dhfs.persistence.JObjectKeyP;
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/File.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/File.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java
@@ -1,6 +1,6 @@
 package com.usatiuk.dhfs.files.objects;

-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
+import com.usatiuk.dhfs.ProtoSerializer;
 import com.usatiuk.dhfs.persistence.FileDtoP;
 import com.usatiuk.dhfs.utils.SerializationHelper;
 import jakarta.inject.Singleton;
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DirectoryNotEmptyException.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DirectoryNotEmptyException.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrRes.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrRes.java
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrType.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrType.java
--- a/dhfs-parent/dhfs-fs/src/main/resources/META-INF/beans.xml
+++ b/dhfs-parent/dhfs-fs/src/main/resources/META-INF/beans.xml
--- a/dhfs-parent/dhfs-fs/src/main/resources/application.properties
+++ b/dhfs-parent/dhfs-fs/src/main/resources/application.properties
@@ -0,0 +1,34 @@
+quarkus.grpc.server.use-separate-server=false
+dhfs.objects.peerdiscovery.port=42069
+dhfs.objects.peerdiscovery.interval=4s
+dhfs.objects.peerdiscovery.broadcast=true
+dhfs.objects.sync.timeout=30
+dhfs.objects.sync.ping.timeout=5
+dhfs.objects.invalidation.threads=16
+dhfs.objects.invalidation.delay=1000
+dhfs.objects.reconnect_interval=5s
+dhfs.objects.write_log=false
+dhfs.objects.periodic-push-op-interval=5m
+dhfs.fuse.root=${HOME}/dhfs_default/fuse
+dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
+dhfs.fuse.debug=false
+dhfs.fuse.enabled=true
+dhfs.files.allow_recursive_delete=false
+dhfs.files.target_chunk_size=2097152
+dhfs.files.target_chunk_alignment=19
+dhfs.objects.deletion.delay=1000
+dhfs.objects.deletion.can-delete-retry-delay=10000
+dhfs.objects.ref_verification=true
+dhfs.files.use_hash_for_chunks=false
+dhfs.objects.autosync.threads=16
+dhfs.objects.autosync.download-all=false
+dhfs.objects.move-processor.threads=16
+dhfs.objects.ref-processor.threads=16
+dhfs.objects.opsender.batch-size=100
+dhfs.objects.lock_timeout_secs=2
+dhfs.local-discovery=true
+dhfs.peerdiscovery.timeout=10000
+quarkus.log.category."com.usatiuk".min-level=TRACE
+quarkus.log.category."com.usatiuk".level=TRACE
+quarkus.http.insecure-requests=enabled
+quarkus.http.ssl.client-auth=required
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
@@ -0,0 +1,29 @@
+package com.usatiuk.dhfs;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+abstract public class TempDataProfile implements QuarkusTestProfile {
+    protected void getConfigOverrides(Map<String, String> toPut) {
+    }
+
+    @Override
+    final public Map<String, String> getConfigOverrides() {
+        Path tempDirWithPrefix;
+        try {
+            tempDirWithPrefix = Files.createTempDirectory("dhfs-test");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        var ret = new HashMap<String, String>();
+        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
+        ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
+        getConfigOverrides(ret);
+        return ret;
+    }
+}
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
@@ -0,0 +1,40 @@
+package com.usatiuk.dhfs;
+
+import io.quarkus.logging.Log;
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Objects;
+
+@ApplicationScoped
+public class TestDataCleaner {
+    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    String tempDirectory;
+
+    void init(@Observes @Priority(1) StartupEvent event) throws IOException {
+        try {
+            purgeDirectory(Path.of(tempDirectory).toFile());
+        } catch (Exception ignored) {
+            Log.warn("Couldn't cleanup test data on init");
+        }
+    }
+
+    void shutdown(@Observes @Priority(1000000000) ShutdownEvent event) throws IOException {
+        purgeDirectory(Path.of(tempDirectory).toFile());
+    }
+
+    void purgeDirectory(File dir) {
+        for (File file : Objects.requireNonNull(dir.listFiles())) {
+            if (file.isDirectory())
+                purgeDirectory(file);
+            file.delete();
+        }
+    }
+}
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/Benchmarker.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/Benchmarker.java
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestNoChunkingTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestNoChunkingTest.java
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestSmallChunkingTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestSmallChunkingTest.java
--- a/dhfs-parent/dhfs-fs/src/test/resources/application.properties
+++ b/dhfs-parent/dhfs-fs/src/test/resources/application.properties
@@ -0,0 +1,12 @@
+dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test
+dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test
+dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test
+dhfs.objects.ref_verification=true
+dhfs.objects.deletion.delay=0
+quarkus.log.category."com.usatiuk.dhfs".level=TRACE
+quarkus.log.category."com.usatiuk.dhfs".min-level=TRACE
+quarkus.class-loading.parent-first-artifacts=com.usatiuk.dhfs:supportlib
+quarkus.http.test-port=0
+quarkus.http.test-ssl-port=0
+dhfs.local-discovery=false
+dhfs.objects.persistence.snapshot-extra-checks=true
--- a/dhfs-parent/dhfs-fuse/.dockerignore
+++ b/dhfs-parent/dhfs-fuse/.dockerignore
@@ -0,0 +1,5 @@
+*
+!target/*-runner
+!target/*-runner.jar
+!target/lib/*
+!target/quarkus-app/*
--- a/dhfs-parent/dhfs-fuse/.gitignore
+++ b/dhfs-parent/dhfs-fuse/.gitignore
@@ -0,0 +1,43 @@
+#Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties
+.flattened-pom.xml
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Local environment
+.env
+
+# Plugin directory
+/.quarkus/cli/plugins/
--- a/dhfs-parent/dhfs-fuse/Dockerfile
+++ b/dhfs-parent/dhfs-fuse/Dockerfile
@@ -0,0 +1,2 @@
+FROM azul/zulu-openjdk-debian:21-jre-latest
+RUN apt update && apt install -y libfuse2 curl
--- a/dhfs-parent/dhfs-fuse/docker-compose.yml
+++ b/dhfs-parent/dhfs-fuse/docker-compose.yml
@@ -0,0 +1,43 @@
+version: "3.2"
+
+services:
+  dhfs1:
+    build: .
+    privileged: true
+    devices:
+      - /dev/fuse
+    volumes:
+      - $HOME/dhfs/dhfs1:/dhfs_root
+      - $HOME/dhfs/dhfs1_f:/dhfs_root/fuse:rshared
+      - ./target/quarkus-app:/app
+    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
+     -Ddhfs.objects.root=/dhfs_root/d 
+     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0 
+     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+     -jar /app/quarkus-run.jar"
+    ports:
+      - 8080:8080
+      - 8081:8443
+      - 5005:5005
+  dhfs2:
+    build: .
+    privileged: true
+    devices:
+      - /dev/fuse
+    volumes:
+      - $HOME/dhfs/dhfs2:/dhfs_root
+      - $HOME/dhfs/dhfs2_f:/dhfs_root/fuse:rshared
+      - ./target/quarkus-app:/app
+    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
+     --add-exports java.base/jdk.internal.access=ALL-UNNAMED
+     --add-opens=java.base/java.nio=ALL-UNNAMED
+     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
+     -Ddhfs.objects.root=/dhfs_root/d 
+     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0
+     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010
+     -jar /app/quarkus-run.jar"
+    ports:
+      - 8090:8080
+      - 8091:8443
+      - 5010:5010
--- a/dhfs-parent/dhfs-fuse/pom.xml
+++ b/dhfs-parent/dhfs-fuse/pom.xml
@@ -3,8 +3,8 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.usatiuk.dhfs</groupId>
-    <artifactId>server</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <artifactId>dhfs-fuse</artifactId>
+    <version>1.0-SNAPSHOT</version>

    <parent>
        <groupId>com.usatiuk.dhfs</groupId>
@@ -23,17 +23,6 @@
            <artifactId>awaitility</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>autoprotomap</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.usatiuk</groupId>
-            <artifactId>autoprotomap-deployment</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
        <dependency>
            <groupId>org.bouncycastle</groupId>
            <artifactId>bcprov-jdk18on</artifactId>
@@ -148,6 +137,16 @@
            <artifactId>objects</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>dhfs-fs</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usatiuk.dhfs</groupId>
+            <artifactId>sync-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
        <dependency>
            <groupId>com.usatiuk.dhfs</groupId>
            <artifactId>utils</artifactId>
--- a/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.jvm
+++ b/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.jvm
@@ -0,0 +1,97 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the container image run:
+#
+# ./mvnw package
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/server-jvm .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-jvm
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-jvm
+#
+# This image uses the `run-java.sh` script to run the application.
+# This scripts computes the command line to execute your Java application, and
+# includes memory/GC tuning.
+# You can configure the behavior using the following environment properties:
+# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
+# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
+#   in JAVA_OPTS (example: "-Dsome.property=foo")
+# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
+#   used to calculate a default maximal heap memory based on a containers restriction.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
+#   of the container available memory as set here. The default is `50` which means 50%
+#   of the available memory is used as an upper boundary. You can skip this mechanism by
+#   setting this value to `0` in which case no `-Xmx` option is added.
+# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
+#   is used to calculate a default initial heap memory based on the maximum heap memory.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
+#   of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
+#   is used as the initial heap size. You can skip this mechanism by setting this value
+#   to `0` in which case no `-Xms` option is added (example: "25")
+# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
+#   This is used to calculate the maximum value of the initial heap memory. If used in
+#   a container without any memory constraints for the container then this option has
+#   no effect. If there is a memory constraint then `-Xms` is limited to the value set
+#   here. The default is 4096MB which means the calculated value of `-Xms` never will
+#   be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
+# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
+#   when things are happening. This option, if set to true, will set
+#  `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
+# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
+#    true").
+# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
+# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
+#   https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
+# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
+# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
+#   (example: "20")
+# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
+#   (example: "40")
+# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
+#   (example: "4")
+# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
+#   previous GC times. (example: "90")
+# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
+# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
+# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
+#   contain the necessary JRE command-line options to specify the required GC, which
+#   will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
+# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
+# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
+# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
+#   accessed directly. (example: "foo.example.com,bar.example.com")
+#
+###
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
+
+ENV LANGUAGE='en_US:en'
+
+
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
+COPY --chown=185 target/quarkus-app/*.jar /deployments/
+COPY --chown=185 target/quarkus-app/app/ /deployments/app/
+COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
+
+EXPOSE 8080
+USER 185
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
+
--- a/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.legacy-jar
+++ b/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.legacy-jar
@@ -0,0 +1,93 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the container image run:
+#
+# ./mvnw package -Dquarkus.package.jar.type=legacy-jar
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/server-legacy-jar .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-legacy-jar
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 quarkus/server-legacy-jar
+#
+# This image uses the `run-java.sh` script to run the application.
+# This scripts computes the command line to execute your Java application, and
+# includes memory/GC tuning.
+# You can configure the behavior using the following environment properties:
+# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
+# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
+#   in JAVA_OPTS (example: "-Dsome.property=foo")
+# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
+#   used to calculate a default maximal heap memory based on a containers restriction.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
+#   of the container available memory as set here. The default is `50` which means 50%
+#   of the available memory is used as an upper boundary. You can skip this mechanism by
+#   setting this value to `0` in which case no `-Xmx` option is added.
+# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
+#   is used to calculate a default initial heap memory based on the maximum heap memory.
+#   If used in a container without any memory constraints for the container then this
+#   option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
+#   of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
+#   is used as the initial heap size. You can skip this mechanism by setting this value
+#   to `0` in which case no `-Xms` option is added (example: "25")
+# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
+#   This is used to calculate the maximum value of the initial heap memory. If used in
+#   a container without any memory constraints for the container then this option has
+#   no effect. If there is a memory constraint then `-Xms` is limited to the value set
+#   here. The default is 4096MB which means the calculated value of `-Xms` never will
+#   be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
+# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
+#   when things are happening. This option, if set to true, will set
+#  `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
+# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
+#    true").
+# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
+# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
+#   https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
+# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
+# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
+#   (example: "20")
+# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
+#   (example: "40")
+# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
+#   (example: "4")
+# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
+#   previous GC times. (example: "90")
+# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
+# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
+# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
+#   contain the necessary JRE command-line options to specify the required GC, which
+#   will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
+# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
+# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
+# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
+#   accessed directly. (example: "foo.example.com,bar.example.com")
+#
+###
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
+
+ENV LANGUAGE='en_US:en'
+
+
+COPY target/lib/* /deployments/lib/
+COPY target/*-runner.jar /deployments/quarkus-run.jar
+
+EXPOSE 8080
+USER 185
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
--- a/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.native
+++ b/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.native
@@ -0,0 +1,27 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+#
+# Before building the container image run:
+#
+# ./mvnw package -Dnative
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native -t quarkus/server .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server
+#
+###
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
+WORKDIR /work/
+RUN chown 1001 /work \
+    && chmod "g+rwX" /work \
+    && chown 1001:root /work
+COPY --chown=1001:root target/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
--- a/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.native-micro
+++ b/dhfs-parent/dhfs-fuse/src/main/docker/Dockerfile.native-micro
@@ -0,0 +1,30 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+# It uses a micro base image, tuned for Quarkus native executables.
+# It reduces the size of the resulting container image.
+# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
+#
+# Before building the container image run:
+#
+# ./mvnw package -Dnative
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/server .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/server
+#
+###
+FROM quay.io/quarkus/quarkus-micro-image:2.0
+WORKDIR /work/
+RUN chown 1001 /work \
+    && chmod "g+rwX" /work \
+    && chown 1001:root /work
+COPY --chown=1001:root target/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
--- a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/DhfsFuse.java
+++ b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/DhfsFuse.java
@@ -7,6 +7,7 @@ import com.usatiuk.dhfs.files.service.DirectoryNotEmptyException;
 import com.usatiuk.dhfs.files.service.GetattrRes;
 import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;
+import com.usatiuk.objects.JObjectKey;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.logging.Log;
@@ -30,6 +31,8 @@ import ru.serce.jnrfuse.struct.Timespec;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;

 import static jnr.posix.FileStat.*;

@@ -50,6 +53,24 @@ public class DhfsFuse extends FuseStubFS {
    @Inject
    DhfsFileService fileService;

+    private final ConcurrentHashMap<Long, JObjectKey> _openHandles = new ConcurrentHashMap<>();
+    private final AtomicLong _fh = new AtomicLong(1);
+
+    private long allocateHandle(JObjectKey key) {
+        while (true) {
+            var newFh = _fh.getAndIncrement();
+            if (newFh == 0) continue;
+            if (_openHandles.putIfAbsent(newFh, key) == null) {
+                return newFh;
+            }
+        }
+    }
+
+    private JObjectKey getFromHandle(long handle) {
+        assert handle != 0;
+        return _openHandles.get(handle);
+    }
+
    void init(@Observes @Priority(100000) StartupEvent event) {
        if (!enabled) return;
        Paths.get(root).toFile().mkdirs();
@@ -174,7 +195,9 @@ public class DhfsFuse extends FuseStubFS {
    @Override
    public int open(String path, FuseFileInfo fi) {
        try {
-            if (fileService.open(path).isEmpty()) return -ErrorCodes.ENOENT();
+            var opened = fileService.open(path);
+            if (opened.isEmpty()) return -ErrorCodes.ENOENT();
+            fi.fh.set(allocateHandle(opened.get()));
            return 0;
        } catch (Throwable e) {
            Log.error("When open " + path, e);
@@ -182,15 +205,20 @@ public class DhfsFuse extends FuseStubFS {
        }
    }

+    @Override
+    public int release(String path, FuseFileInfo fi) {
+        assert fi.fh.get() != 0;
+        _openHandles.remove(fi.fh.get());
+        return 0;
+    }
+
    @Override
    public int read(String path, Pointer buf, long size, long offset, FuseFileInfo fi) {
        if (size < 0) return -ErrorCodes.EINVAL();
        if (offset < 0) return -ErrorCodes.EINVAL();
        try {
-            var fileOpt = fileService.open(path);
-            if (fileOpt.isEmpty()) return -ErrorCodes.ENOENT();
-            var file = fileOpt.get();
-            var read = fileService.read(fileOpt.get(), offset, (int) size);
+            var fileKey = getFromHandle(fi.fh.get());
+            var read = fileService.read(fileKey, offset, (int) size);
            if (read.isEmpty()) return 0;
            UnsafeByteOperations.unsafeWriteTo(read.get(), new JnrPtrByteOutput(jnrPtrByteOutputAccessors, buf, size));
            return read.get().size();
@@ -204,8 +232,7 @@ public class DhfsFuse extends FuseStubFS {
    public int write(String path, Pointer buf, long size, long offset, FuseFileInfo fi) {
        if (offset < 0) return -ErrorCodes.EINVAL();
        try {
-            var fileOpt = fileService.open(path);
-            if (fileOpt.isEmpty()) return -ErrorCodes.ENOENT();
+            var fileKey = getFromHandle(fi.fh.get());
            var buffer = UninitializedByteBuffer.allocateUninitialized((int) size);

            if (buffer.isDirect()) {
@@ -218,7 +245,7 @@ public class DhfsFuse extends FuseStubFS {
                buf.get(0, buffer.array(), 0, (int) size);
            }

-            var written = fileService.write(fileOpt.get(), offset, UnsafeByteOperations.unsafeWrap(buffer));
+            var written = fileService.write(fileKey, offset, UnsafeByteOperations.unsafeWrap(buffer));
            return written.intValue();
        } catch (Throwable e) {
            Log.error("When writing " + path, e);
@@ -231,7 +258,8 @@ public class DhfsFuse extends FuseStubFS {
        try {
            var ret = fileService.create(path, mode);
            if (ret.isEmpty()) return -ErrorCodes.ENOSPC();
-            else return 0;
+            fi.fh.set(allocateHandle(ret.get()));
+            return 0;
        } catch (Throwable e) {
            Log.error("When creating " + path, e);
            return -ErrorCodes.EIO();
--- a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutput.java
+++ b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutput.java
--- a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutputAccessors.java
+++ b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutputAccessors.java
--- a/dhfs-parent/dhfs-fuse/src/main/resources/META-INF/beans.xml
+++ b/dhfs-parent/dhfs-fuse/src/main/resources/META-INF/beans.xml
--- a/dhfs-parent/dhfs-fuse/src/main/resources/application.properties
+++ b/dhfs-parent/dhfs-fuse/src/main/resources/application.properties
@@ -0,0 +1,34 @@
+quarkus.grpc.server.use-separate-server=false
+dhfs.objects.peerdiscovery.port=42069
+dhfs.objects.peerdiscovery.interval=4s
+dhfs.objects.peerdiscovery.broadcast=true
+dhfs.objects.sync.timeout=30
+dhfs.objects.sync.ping.timeout=5
+dhfs.objects.invalidation.threads=16
+dhfs.objects.invalidation.delay=1000
+dhfs.objects.reconnect_interval=5s
+dhfs.objects.write_log=false
+dhfs.objects.periodic-push-op-interval=5m
+dhfs.fuse.root=${HOME}/dhfs_default/fuse
+dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
+dhfs.fuse.debug=false
+dhfs.fuse.enabled=true
+dhfs.files.allow_recursive_delete=false
+dhfs.files.target_chunk_size=2097152
+dhfs.files.target_chunk_alignment=19
+dhfs.objects.deletion.delay=1000
+dhfs.objects.deletion.can-delete-retry-delay=10000
+dhfs.objects.ref_verification=true
+dhfs.files.use_hash_for_chunks=false
+dhfs.objects.autosync.threads=16
+dhfs.objects.autosync.download-all=false
+dhfs.objects.move-processor.threads=16
+dhfs.objects.ref-processor.threads=16
+dhfs.objects.opsender.batch-size=100
+dhfs.objects.lock_timeout_secs=2
+dhfs.local-discovery=true
+dhfs.peerdiscovery.timeout=10000
+quarkus.log.category."com.usatiuk".min-level=TRACE
+quarkus.log.category."com.usatiuk".level=TRACE
+quarkus.http.insecure-requests=enabled
+quarkus.http.ssl.client-auth=required
--- a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
+++ b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
@@ -0,0 +1,29 @@
+package com.usatiuk.dhfs;
+
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+abstract public class TempDataProfile implements QuarkusTestProfile {
+    protected void getConfigOverrides(Map<String, String> toPut) {
+    }
+
+    @Override
+    final public Map<String, String> getConfigOverrides() {
+        Path tempDirWithPrefix;
+        try {
+            tempDirWithPrefix = Files.createTempDirectory("dhfs-test");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        var ret = new HashMap<String, String>();
+        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
+        ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
+        getConfigOverrides(ret);
+        return ret;
+    }
+}
--- a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
+++ b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
@@ -0,0 +1,40 @@
+package com.usatiuk.dhfs;
+
+import io.quarkus.logging.Log;
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Objects;
+
+@ApplicationScoped
+public class TestDataCleaner {
+    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    String tempDirectory;
+
+    void init(@Observes @Priority(1) StartupEvent event) throws IOException {
+        try {
+            purgeDirectory(Path.of(tempDirectory).toFile());
+        } catch (Exception ignored) {
+            Log.warn("Couldn't cleanup test data on init");
+        }
+    }
+
+    void shutdown(@Observes @Priority(1000000000) ShutdownEvent event) throws IOException {
+        purgeDirectory(Path.of(tempDirectory).toFile());
+    }
+
+    void purgeDirectory(File dir) {
+        for (File file : Objects.requireNonNull(dir.listFiles())) {
+            if (file.isDirectory())
+                purgeDirectory(file);
+            file.delete();
+        }
+    }
+}
--- a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java
+++ b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java
--- a/dhfs-parent/dhfs-fuse/src/test/resources/application.properties
+++ b/dhfs-parent/dhfs-fuse/src/test/resources/application.properties
@@ -0,0 +1,12 @@
+dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test
+dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test
+dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test
+dhfs.objects.ref_verification=true
+dhfs.objects.deletion.delay=0
+quarkus.log.category."com.usatiuk.dhfs".level=TRACE
+quarkus.log.category."com.usatiuk.dhfs".min-level=TRACE
+quarkus.class-loading.parent-first-artifacts=com.usatiuk.dhfs:supportlib
+quarkus.http.test-port=0
+quarkus.http.test-ssl-port=0
+dhfs.local-discovery=false
+dhfs.objects.persistence.snapshot-extra-checks=true
--- a/dhfs-parent/objects/pom.xml
+++ b/dhfs-parent/objects/pom.xml
@@ -88,6 +88,11 @@
                    <forkCount>1C</forkCount>
                    <reuseForks>false</reuseForks>
                    <parallel>classes</parallel>
+                    <systemPropertyVariables>
+                        <junit.jupiter.execution.parallel.enabled>
+                            false
+                        </junit.jupiter.execution.parallel.enabled>
+                    </systemPropertyVariables>
                </configuration>
            </plugin>
            <plugin>
@@ -99,7 +104,6 @@
                    <execution>
                        <id>quarkus-plugin</id>
                        <goals>
-                            <goal>build</goal>
                            <goal>generate-code</goal>
                            <goal>generate-code-tests</goal>
                        </goals>
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/SerializingObjectPersistentStore.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/SerializingObjectPersistentStore.java
@@ -59,7 +59,7 @@ public class SerializingObjectPersistentStore {

    private TxManifestRaw prepareManifest(TxManifestObj<? extends JDataVersionedWrapper> objs) {
        return new TxManifestRaw(
-                objs.written().stream()
+                objs.written().parallelStream()
                        .map(e -> Pair.of(e.getKey(), serializer.serialize(e.getValue())))
                        .toList()
                , objs.deleted());
--- a/dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestImpl.java
+++ b/dhfs-parent/objects/src/test/java/com/usatiuk/objects/ObjectsTestImpl.java
@@ -7,10 +7,7 @@ import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;
 import jakarta.inject.Inject;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.RepeatedTest;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;

@@ -57,121 +54,121 @@ public abstract class ObjectsTestImpl {
    }

    @Test
-    void createObject() {
+    void createObject(TestInfo testInfo) {
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("ParentCreate"), "John");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "ParentCreate"), "John");
            curTx.put(newParent);
        });

        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("ParentCreate")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentCreate")).orElse(null);
            Assertions.assertEquals("John", parent.name());
        });
    }

    @Test
-    void onCommitHookTest() {
+    void onCommitHookTest(TestInfo testInfo) {
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("ParentOnCommitHook"), "John");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "ParentOnCommitHook"), "John");
            curTx.put(newParent);
            curTx.onCommit(() -> txm.run(() -> {
-                curTx.put(new Parent(JObjectKey.of("ParentOnCommitHook2"), "John2"));
+                curTx.put(new Parent(JObjectKey.of(testInfo.getDisplayName() + "ParentOnCommitHook2"), "John2"));
            }));
        });
        txm.run(() -> {
            curTx.onCommit(() -> txm.run(() -> {
-                curTx.put(new Parent(JObjectKey.of("ParentOnCommitHook3"), "John3"));
+                curTx.put(new Parent(JObjectKey.of(testInfo.getDisplayName() + "ParentOnCommitHook3"), "John3"));
            }));
        });
        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("ParentOnCommitHook")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentOnCommitHook")).orElse(null);
            Assertions.assertEquals("John", parent.name());
-            var parent2 = curTx.get(Parent.class, new JObjectKeyImpl("ParentOnCommitHook2")).orElse(null);
+            var parent2 = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentOnCommitHook2")).orElse(null);
            Assertions.assertEquals("John2", parent2.name());
-            var parent3 = curTx.get(Parent.class, new JObjectKeyImpl("ParentOnCommitHook3")).orElse(null);
+            var parent3 = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentOnCommitHook3")).orElse(null);
            Assertions.assertEquals("John3", parent3.name());
        });
    }

    @Test
-    void createGetObject() {
+    void createGetObject(TestInfo testInfo) {
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("ParentCreateGet"), "John");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "ParentCreateGet"), "John");
            curTx.put(newParent);
-            var parent = curTx.get(Parent.class, JObjectKey.of("ParentCreateGet")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentCreateGet")).orElse(null);
            Assertions.assertEquals("John", parent.name());
        });

        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("ParentCreateGet")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentCreateGet")).orElse(null);
            Assertions.assertEquals("John", parent.name());
        });
    }

    @RepeatedTest(100)
-    void createDeleteObject() {
+    void createDeleteObject(TestInfo testInfo) {
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("ParentCreateDeleteObject"), "John");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "ParentCreateDeleteObject"), "John");
            curTx.put(newParent);
        });

        txm.run(() -> {
-            var parent = curTx.get(Parent.class, JObjectKey.of("ParentCreateDeleteObject")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentCreateDeleteObject")).orElse(null);
            Assertions.assertEquals("John", parent.name());
        });

        txm.run(() -> {
-            curTx.delete(new JObjectKeyImpl("ParentCreateDeleteObject"));
+            curTx.delete(JObjectKey.of(testInfo.getDisplayName() + "ParentCreateDeleteObject"));
        });

        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("ParentCreateDeleteObject")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "ParentCreateDeleteObject")).orElse(null);
            Assertions.assertNull(parent);
        });
    }

    @Test
-    void createCreateObject() {
+    void createCreateObject(TestInfo testInfo) {
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("Parent7"), "John");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "Parent7"), "John");
            curTx.put(newParent);
        });
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("Parent7"), "John2");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "Parent7"), "John2");
            curTx.put(newParent);
        });
        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("Parent7")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent7")).orElse(null);
            Assertions.assertEquals("John2", parent.name());
        });
    }

    @Test
-    void editObject() {
+    void editObject(TestInfo testInfo) {
        txm.run(() -> {
-            var newParent = new Parent(JObjectKey.of("Parent3"), "John");
+            var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "Parent3"), "John");
            curTx.put(newParent);
        });

        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("Parent3"), LockingStrategy.OPTIMISTIC).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent3"), LockingStrategy.OPTIMISTIC).orElse(null);
            Assertions.assertEquals("John", parent.name());
            curTx.put(parent.withName("John2"));
        });
        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("Parent3"), LockingStrategy.WRITE).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent3"), LockingStrategy.WRITE).orElse(null);
            Assertions.assertEquals("John2", parent.name());
            curTx.put(parent.withName("John3"));
        });
        txm.run(() -> {
-            var parent = curTx.get(Parent.class, new JObjectKeyImpl("Parent3")).orElse(null);
+            var parent = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent3")).orElse(null);
            Assertions.assertEquals("John3", parent.name());
        });
    }

    @Test
    @Disabled
-    void createObjectConflict() {
+    void createObjectConflict(TestInfo testInfo) {
        AtomicBoolean thread1Failed = new AtomicBoolean(true);
        AtomicBoolean thread2Failed = new AtomicBoolean(true);

@@ -187,8 +184,8 @@ public abstract class ObjectsTestImpl {
                    } catch (Throwable e) {
                        throw new RuntimeException(e);
                    }
-                    var got = curTx.get(Parent.class, new JObjectKeyImpl("Parent2")).orElse(null);
-                    var newParent = new Parent(JObjectKey.of("Parent2"), "John");
+                    var got = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent2")).orElse(null);
+                    var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "Parent2"), "John");
                    curTx.put(newParent);
                    Log.warn("Thread 1 commit");
                }, 0);
@@ -207,8 +204,8 @@ public abstract class ObjectsTestImpl {
                    } catch (Throwable e) {
                        throw new RuntimeException(e);
                    }
-                    var got = curTx.get(Parent.class, new JObjectKeyImpl("Parent2")).orElse(null);
-                    var newParent = new Parent(JObjectKey.of("Parent2"), "John2");
+                    var got = curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent2")).orElse(null);
+                    var newParent = new Parent(JObjectKey.of(testInfo.getDisplayName() + "Parent2"), "John2");
                    curTx.put(newParent);
                    Log.warn("Thread 2 commit");
                }, 0);
@@ -226,7 +223,7 @@ public abstract class ObjectsTestImpl {
        }

        var got = txm.run(() -> {
-            return curTx.get(Parent.class, new JObjectKeyImpl("Parent2")).orElse(null);
+            return curTx.get(Parent.class, JObjectKey.of(testInfo.getDisplayName() + "Parent2")).orElse(null);
        });

        if (!thread1Failed.get()) {
@@ -241,8 +238,8 @@ public abstract class ObjectsTestImpl {

    @ParameterizedTest
    @EnumSource(LockingStrategy.class)
-    void editConflict(LockingStrategy strategy) {
-        String key = "Parent4" + strategy.name();
+    void editConflict(LockingStrategy strategy, TestInfo testInfo) {
+        String key = testInfo.getDisplayName() + "Parent4" + strategy.name();
        txm.run(() -> {
            var newParent = new Parent(JObjectKey.of(key), "John3");
            curTx.put(newParent);
@@ -263,7 +260,7 @@ public abstract class ObjectsTestImpl {
                    } catch (Throwable e) {
                        throw new RuntimeException(e);
                    }
-                    var parent = curTx.get(Parent.class, new JObjectKeyImpl(key), strategy).orElse(null);
+                    var parent = curTx.get(Parent.class, JObjectKey.of(key), strategy).orElse(null);
                    curTx.put(parent.withName("John"));
                    Log.warn("Thread 1 commit");
                }, 0);
@@ -279,7 +276,7 @@ public abstract class ObjectsTestImpl {
                Log.warn("Thread 2");
                barrier.await(); // Ensure thread 2 tx id is larger than thread 1
                txm.runTries(() -> {
-                    var parent = curTx.get(Parent.class, new JObjectKeyImpl(key), strategy).orElse(null);
+                    var parent = curTx.get(Parent.class, JObjectKey.of(key), strategy).orElse(null);
                    curTx.put(parent.withName("John2"));
                    Log.warn("Thread 2 commit");
                }, 0);
@@ -298,7 +295,7 @@ public abstract class ObjectsTestImpl {
        }

        var got = txm.run(() -> {
-            return curTx.get(Parent.class, new JObjectKeyImpl(key)).orElse(null);
+            return curTx.get(Parent.class, JObjectKey.of(key)).orElse(null);
        });

        if (!thread1Failed.get() && !thread2Failed.get()) {
@@ -322,8 +319,8 @@ public abstract class ObjectsTestImpl {

    @ParameterizedTest
    @EnumSource(LockingStrategy.class)
-    void editConflict2(LockingStrategy strategy) {
-        String key = "EditConflict2" + strategy.name();
+    void editConflict2(LockingStrategy strategy, TestInfo testInfo) {
+        String key = testInfo.getDisplayName() + "EditConflict2" + strategy.name();
        txm.run(() -> {
            var newParent = new Parent(JObjectKey.of(key), "John3");
            curTx.put(newParent);
@@ -344,7 +341,7 @@ public abstract class ObjectsTestImpl {
                    } catch (Throwable e) {
                        throw new RuntimeException(e);
                    }
-                    var parent = curTx.get(Parent.class, new JObjectKeyImpl(key), strategy).orElse(null);
+                    var parent = curTx.get(Parent.class, JObjectKey.of(key), strategy).orElse(null);
                    curTx.put(parent.withName("John"));
                    Log.warn("Thread 1 commit");
                }, 0);
@@ -365,7 +362,7 @@ public abstract class ObjectsTestImpl {
                    } catch (Throwable e) {
                        throw new RuntimeException(e);
                    }
-                    var parent = curTx.get(Parent.class, new JObjectKeyImpl(key), strategy).orElse(null);
+                    var parent = curTx.get(Parent.class, JObjectKey.of(key), strategy).orElse(null);
                    curTx.put(parent.withName("John2"));
                    Log.warn("Thread 2 commit");
                }, 0);
@@ -384,7 +381,7 @@ public abstract class ObjectsTestImpl {
        }

        var got = txm.run(() -> {
-            return curTx.get(Parent.class, new JObjectKeyImpl(key)).orElse(null);
+            return curTx.get(Parent.class, JObjectKey.of(key)).orElse(null);
        });

        Assertions.assertFalse(!thread1Failed.get() && !thread2Failed.get());
@@ -402,8 +399,8 @@ public abstract class ObjectsTestImpl {
    }

    @RepeatedTest(100)
-    void snapshotTest1() {
-        var key = "SnapshotTest1";
+    void snapshotTest1(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "SnapshotTest1";
        var barrier1 = new CyclicBarrier(2);
        var barrier2 = new CyclicBarrier(2);
        try (ExecutorService ex = Executors.newFixedThreadPool(3)) {
@@ -435,7 +432,7 @@ public abstract class ObjectsTestImpl {
                                throw new RuntimeException(e);
                            }
                            Log.info("Thread 1 reading");
-                            Assertions.assertTrue(curTx.get(Parent.class, new JObjectKeyImpl(key)).isEmpty());
+                            Assertions.assertTrue(curTx.get(Parent.class, JObjectKey.of(key)).isEmpty());
                            Log.info("Thread 1 done reading");
                        });
                        Log.info("Thread 1 finished");
@@ -452,14 +449,14 @@ public abstract class ObjectsTestImpl {
            throw new RuntimeException(e);
        }
        txm.run(() -> {
-            Assertions.assertEquals("John", curTx.get(Parent.class, new JObjectKeyImpl(key)).orElseThrow().name());
+            Assertions.assertEquals("John", curTx.get(Parent.class, JObjectKey.of(key)).orElseThrow().name());
        });
-        deleteAndCheck(new JObjectKeyImpl(key));
+        deleteAndCheck(JObjectKey.of(key));
    }

    @RepeatedTest(100)
-    void snapshotTest2() {
-        var key = "SnapshotTest2";
+    void snapshotTest2(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "SnapshotTest2";
        var barrier1 = new CyclicBarrier(2);
        var barrier2 = new CyclicBarrier(2);
        txm.run(() -> {
@@ -494,7 +491,7 @@ public abstract class ObjectsTestImpl {
                                throw new RuntimeException(e);
                            }
                            Log.info("Thread 1 reading");
-                            Assertions.assertEquals("John", curTx.get(Parent.class, new JObjectKeyImpl(key)).orElseThrow().name());
+                            Assertions.assertEquals("John", curTx.get(Parent.class, JObjectKey.of(key)).orElseThrow().name());
                            Log.info("Thread 1 done reading");
                        });
                        Log.info("Thread 1 finished");
@@ -511,14 +508,14 @@ public abstract class ObjectsTestImpl {
            throw new RuntimeException(e);
        }
        txm.run(() -> {
-            Assertions.assertEquals("John2", curTx.get(Parent.class, new JObjectKeyImpl(key)).orElseThrow().name());
+            Assertions.assertEquals("John2", curTx.get(Parent.class, JObjectKey.of(key)).orElseThrow().name());
        });
-        deleteAndCheck(new JObjectKeyImpl(key));
+        deleteAndCheck(JObjectKey.of(key));
    }

    @RepeatedTest(100)
-    void snapshotTest3() {
-        var key = "SnapshotTest3";
+    void snapshotTest3(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "SnapshotTest3";
        var barrier0 = new CountDownLatch(1);
        var barrier1 = new CyclicBarrier(2);
        var barrier2 = new CyclicBarrier(2);
@@ -559,7 +556,7 @@ public abstract class ObjectsTestImpl {
                                throw new RuntimeException(e);
                            }
                            Log.info("Thread 1 reading");
-                            Assertions.assertEquals("John", curTx.get(Parent.class, new JObjectKeyImpl(key)).orElseThrow().name());
+                            Assertions.assertEquals("John", curTx.get(Parent.class, JObjectKey.of(key)).orElseThrow().name());
                            Log.info("Thread 1 done reading");
                        });
                        Log.info("Thread 1 finished");
@@ -576,14 +573,14 @@ public abstract class ObjectsTestImpl {
            throw new RuntimeException(e);
        }
        txm.run(() -> {
-            Assertions.assertEquals("John2", curTx.get(Parent.class, new JObjectKeyImpl(key)).orElseThrow().name());
+            Assertions.assertEquals("John2", curTx.get(Parent.class, JObjectKey.of(key)).orElseThrow().name());
        });
-        deleteAndCheck(new JObjectKeyImpl(key));
+        deleteAndCheck(JObjectKey.of(key));
    }

    @RepeatedTest(100)
-    void simpleIterator1() {
-        var key = "SimpleIterator1";
+    void simpleIterator1(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "SimpleIterator1";
        var key1 = key + "_1";
        var key2 = key + "_2";
        var key3 = key + "_3";
@@ -596,7 +593,7 @@ public abstract class ObjectsTestImpl {
            curTx.put(new Parent(JObjectKey.of(key4), "John4"));
        });
        txm.run(() -> {
-            var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key));
+            var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key));
            var got = iter.next();
            Assertions.assertEquals(key1, got.getKey().name());
            got = iter.next();
@@ -610,8 +607,8 @@ public abstract class ObjectsTestImpl {
    }

    @RepeatedTest(100)
-    void simpleIterator2() {
-        var key = "SimpleIterator2";
+    void simpleIterator2(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "SimpleIterator2";
        var key1 = key + "_1";
        var key2 = key + "_2";
        var key3 = key + "_3";
@@ -624,7 +621,7 @@ public abstract class ObjectsTestImpl {
            curTx.put(new Parent(JObjectKey.of(key4), "John4"));
        });
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                var got = iter.next();
                Assertions.assertEquals(key1, got.getKey().name());
                got = iter.next();
@@ -636,7 +633,7 @@ public abstract class ObjectsTestImpl {
            }
        });
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.LT, new JObjectKeyImpl(key + "_5"))) {
+            try (var iter = curTx.getIterator(IteratorStart.LT, JObjectKey.of(key + "_5"))) {
                var got = iter.next();
                Assertions.assertEquals(key4, got.getKey().name());
                Assertions.assertTrue(iter.hasPrev());
@@ -648,22 +645,22 @@ public abstract class ObjectsTestImpl {
            }
        });
        txm.run(() -> {
-            curTx.delete(new JObjectKeyImpl(key));
-            curTx.delete(new JObjectKeyImpl(key1));
-            curTx.delete(new JObjectKeyImpl(key2));
-            curTx.delete(new JObjectKeyImpl(key3));
-            curTx.delete(new JObjectKeyImpl(key4));
+            curTx.delete(JObjectKey.of(key));
+            curTx.delete(JObjectKey.of(key1));
+            curTx.delete(JObjectKey.of(key2));
+            curTx.delete(JObjectKey.of(key3));
+            curTx.delete(JObjectKey.of(key4));
        });
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                Assertions.assertTrue(!iter.hasNext() || !iter.next().getKey().name().startsWith(key));
            }
        });
    }

    @RepeatedTest(100)
-    void concurrentIterator1() {
-        var key = "ConcurrentIterator1";
+    void concurrentIterator1(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "ConcurrentIterator1";
        var key1 = key + "_1";
        var key2 = key + "_2";
        var key3 = key + "_3";
@@ -696,7 +693,7 @@ public abstract class ObjectsTestImpl {
                try {
                    barrier.await();
                    barrier2.await();
-                    try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+                    try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                        var got = iter.next();
                        Assertions.assertEquals(key1, got.getKey().name());
                        got = iter.next();
@@ -711,7 +708,7 @@ public abstract class ObjectsTestImpl {
        });
        Log.info("All threads finished");
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                var got = iter.next();
                Assertions.assertEquals(key1, got.getKey().name());
                got = iter.next();
@@ -723,22 +720,22 @@ public abstract class ObjectsTestImpl {
            }
        });
        txm.run(() -> {
-            curTx.delete(new JObjectKeyImpl(key));
-            curTx.delete(new JObjectKeyImpl(key1));
-            curTx.delete(new JObjectKeyImpl(key2));
-            curTx.delete(new JObjectKeyImpl(key3));
-            curTx.delete(new JObjectKeyImpl(key4));
+            curTx.delete(JObjectKey.of(key));
+            curTx.delete(JObjectKey.of(key1));
+            curTx.delete(JObjectKey.of(key2));
+            curTx.delete(JObjectKey.of(key3));
+            curTx.delete(JObjectKey.of(key4));
        });
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                Assertions.assertTrue(!iter.hasNext() || !iter.next().getKey().name().startsWith(key));
            }
        });
    }

    @RepeatedTest(100)
-    void concurrentIterator2() {
-        var key = "ConcurrentIterator2";
+    void concurrentIterator2(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "ConcurrentIterator2";
        var key1 = key + "_1";
        var key2 = key + "_2";
        var key3 = key + "_3";
@@ -772,7 +769,7 @@ public abstract class ObjectsTestImpl {
                try {
                    barrier.await();
                    barrier2.await();
-                    try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+                    try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                        var got = iter.next();
                        Assertions.assertEquals(key1, got.getKey().name());
                        got = iter.next();
@@ -790,7 +787,7 @@ public abstract class ObjectsTestImpl {
        });
        Log.info("All threads finished");
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                var got = iter.next();
                Assertions.assertEquals(key1, got.getKey().name());
                got = iter.next();
@@ -803,22 +800,22 @@ public abstract class ObjectsTestImpl {
            }
        });
        txm.run(() -> {
-            curTx.delete(new JObjectKeyImpl(key));
-            curTx.delete(new JObjectKeyImpl(key1));
-            curTx.delete(new JObjectKeyImpl(key2));
-            curTx.delete(new JObjectKeyImpl(key3));
-            curTx.delete(new JObjectKeyImpl(key4));
+            curTx.delete(JObjectKey.of(key));
+            curTx.delete(JObjectKey.of(key1));
+            curTx.delete(JObjectKey.of(key2));
+            curTx.delete(JObjectKey.of(key3));
+            curTx.delete(JObjectKey.of(key4));
        });
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                Assertions.assertTrue(!iter.hasNext() || !iter.next().getKey().name().startsWith(key));
            }
        });
    }

    @RepeatedTest(100)
-    void concurrentIterator3() {
-        var key = "ConcurrentIterator3";
+    void concurrentIterator3(TestInfo testInfo) {
+        var key = testInfo.getDisplayName() + "ConcurrentIterator3";
        var key1 = key + "_1";
        var key2 = key + "_2";
        var key3 = key + "_3";
@@ -841,7 +838,7 @@ public abstract class ObjectsTestImpl {
                    throw new RuntimeException(e);
                }
                curTx.put(new Parent(JObjectKey.of(key3), "John3"));
-                curTx.delete(new JObjectKeyImpl(key2));
+                curTx.delete(JObjectKey.of(key2));
                Log.info("Thread 1 committing");
            });
            Log.info("Thread 1 commited");
@@ -852,7 +849,7 @@ public abstract class ObjectsTestImpl {
                try {
                    barrier.await();
                    barrier2.await();
-                    try (var iter = curTx.getIterator(IteratorStart.LE, new JObjectKeyImpl(key3))) {
+                    try (var iter = curTx.getIterator(IteratorStart.LE, JObjectKey.of(key3))) {
                        var got = iter.next();
                        Assertions.assertEquals(key2, got.getKey().name());
                        Assertions.assertEquals("John2", ((Parent) got.getValue()).name());
@@ -878,7 +875,7 @@ public abstract class ObjectsTestImpl {
                        got = iter.next();
                        Assertions.assertEquals(key4, got.getKey().name());
                    }
-                    try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+                    try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                        var got = iter.next();
                        Assertions.assertEquals(key1, got.getKey().name());
                        got = iter.next();
@@ -896,7 +893,7 @@ public abstract class ObjectsTestImpl {
        });
        Log.info("All threads finished");
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                var got = iter.next();
                Assertions.assertEquals(key1, got.getKey().name());
                got = iter.next();
@@ -906,37 +903,37 @@ public abstract class ObjectsTestImpl {
            }
        });
        txm.run(() -> {
-            curTx.delete(new JObjectKeyImpl(key));
-            curTx.delete(new JObjectKeyImpl(key1));
-            curTx.delete(new JObjectKeyImpl(key3));
-            curTx.delete(new JObjectKeyImpl(key4));
+            curTx.delete(JObjectKey.of(key));
+            curTx.delete(JObjectKey.of(key1));
+            curTx.delete(JObjectKey.of(key3));
+            curTx.delete(JObjectKey.of(key4));
        });
        txm.run(() -> {
-            try (var iter = curTx.getIterator(IteratorStart.GT, new JObjectKeyImpl(key))) {
+            try (var iter = curTx.getIterator(IteratorStart.GT, JObjectKey.of(key))) {
                Assertions.assertTrue(!iter.hasNext() || !iter.next().getKey().name().startsWith(key));
            }
        });
    }

    @RepeatedTest(100)
-    void allParallel() {
+    void allParallel(TestInfo testInfo) {
        Just.runAll(
-                () -> createObject(),
-                () -> createGetObject(),
-                () -> createDeleteObject(),
-                () -> createCreateObject(),
-                () -> editConflict(LockingStrategy.WRITE),
-                () -> editConflict(LockingStrategy.OPTIMISTIC),
-                () -> editConflict2(LockingStrategy.WRITE),
-                () -> editConflict2(LockingStrategy.OPTIMISTIC),
-                () -> snapshotTest1(),
-                () -> snapshotTest2(),
-                () -> snapshotTest3(),
-                () -> simpleIterator1(),
-                () -> simpleIterator2(),
-                () -> concurrentIterator1(),
-                () -> concurrentIterator2(),
-                () -> concurrentIterator3()
+                () -> createObject(testInfo),
+                () -> createGetObject(testInfo),
+                () -> createDeleteObject(testInfo),
+                () -> createCreateObject(testInfo),
+                () -> editConflict(LockingStrategy.WRITE, testInfo),
+                () -> editConflict(LockingStrategy.OPTIMISTIC, testInfo),
+                () -> editConflict2(LockingStrategy.WRITE, testInfo),
+                () -> editConflict2(LockingStrategy.OPTIMISTIC, testInfo),
+                () -> snapshotTest1(testInfo),
+                () -> snapshotTest2(testInfo),
+                () -> snapshotTest3(testInfo),
+                () -> simpleIterator1(testInfo),
+                () -> simpleIterator2(testInfo),
+                () -> concurrentIterator1(testInfo),
+                () -> concurrentIterator2(testInfo),
+                () -> concurrentIterator3(testInfo)
        );
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stepan Usatiuk	146870c281	Objects: support parallel test running crashes with env maxreaders reached though	2025-04-13 14:54:25 +02:00
Stepan Usatiuk	9178e7ee2d	Separate dhfs-fs/fuse/sync-base	2025-04-13 14:30:00 +02:00
Stepan Usatiuk	7c605135c5	Some native image support but it still doesn't work because of JNR	2025-04-13 13:09:36 +02:00
Stepan Usatiuk	491afd454b	Objects: serialize written objects in parallel	2025-04-13 12:08:40 +02:00
Stepan Usatiuk	bb65aab166	Server: remember opened files ids	2025-04-13 11:52:50 +02:00