stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 20:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

some moving around

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-12-02 23:22:30 +01:00
parent ce2822595b
commit 5af1d8a712
41 changed files with 451 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
dhfs-parent/objects-alloc/deployment/pom.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>objects-alloc-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>objects-alloc-deployment</artifactId>
<name>DHFS objects allocation - Deployment</name>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc-deployment</artifactId>
</dependency>
<dependency>
<groupId>com.usatiuk</groupId>
<artifactId>objects-alloc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-internal</artifactId>
<scope>test</scope>
</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>

14
dhfs-parent/objects-alloc/deployment/src/main/java/com/usatiuk/objects/alloc/deployment/ObjectsAllocProcessor.java Normal file
View File

@@ -0,0 +1,14 @@
package com.usatiuk.objects.alloc.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
class ObjectsAllocProcessor {
private static final String FEATURE = "objects-alloc";
@BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
}

23
dhfs-parent/objects-alloc/deployment/src/test/java/com/usatiuk/objects/alloc/test/ObjectsAllocDevModeTest.java Normal file
View File

@@ -0,0 +1,23 @@
package com.usatiuk.objects.alloc.test;
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;
import io.quarkus.test.QuarkusDevModeTest;
public class ObjectsAllocDevModeTest {
// 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());
}
}

23
dhfs-parent/objects-alloc/deployment/src/test/java/com/usatiuk/objects/alloc/test/ObjectsAllocTest.java Normal file
View File

@@ -0,0 +1,23 @@
package com.usatiuk.objects.alloc.test;
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;
import io.quarkus.test.QuarkusUnitTest;
public class ObjectsAllocTest {
// 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());
}
}

97
dhfs-parent/objects-alloc/integration-tests/pom.xml Normal file
View File

@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>objects-alloc-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>objects-alloc-integration-tests</artifactId>
<name>DHFS objects allocation - Integration Tests</name>
<properties>
<skipITs>true</skipITs>
</properties>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>com.usatiuk</groupId>
<artifactId>objects-alloc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>build</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-image</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>

32
dhfs-parent/objects-alloc/integration-tests/src/main/java/com/usatiuk/objects/alloc/it/ObjectsAllocResource.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.usatiuk.objects.alloc.it;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
@Path("/objects-alloc")
@ApplicationScoped
public class ObjectsAllocResource {
// add some rest methods here
@GET
public String hello() {
return "Hello objects-alloc";
}
}

0
dhfs-parent/objects-alloc/integration-tests/src/main/resources/application.properties Normal file
View File

7
dhfs-parent/objects-alloc/integration-tests/src/test/java/com/usatiuk/objects/alloc/it/ObjectsAllocResourceIT.java Normal file
View File

@@ -0,0 +1,7 @@
package com.usatiuk.objects.alloc.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
@QuarkusIntegrationTest
public class ObjectsAllocResourceIT extends ObjectsAllocResourceTest {
}

21
dhfs-parent/objects-alloc/integration-tests/src/test/java/com/usatiuk/objects/alloc/it/ObjectsAllocResourceTest.java Normal file
View File

@@ -0,0 +1,21 @@
package com.usatiuk.objects.alloc.it;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.is;
import org.junit.jupiter.api.Test;
import io.quarkus.test.junit.QuarkusTest;
@QuarkusTest
public class ObjectsAllocResourceTest {
@Test
public void testHelloEndpoint() {
given()
.when().get("/objects-alloc")
.then()
.statusCode(200)
.body(is("Hello objects-alloc"));
}
}

22
dhfs-parent/objects-alloc/pom.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>objects-alloc-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DHFS objects allocation - Parent</name>
<modules>
<module>deployment</module>
<module>runtime</module>
</modules>
</project>

64
dhfs-parent/objects-alloc/runtime/pom.xml Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>objects-alloc-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>objects-alloc</artifactId>
<name>DHFS objects allocation - Runtime</name>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>com.usatiuk.dhfs</groupId>
<artifactId>objects-common</artifactId>
<version>1.0-SNAPSHOT</version>
</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>

5
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ObjectAllocator.java → dhfs-parent/objects-alloc/runtime/src/main/java/com/usatiuk/objects/alloc/runtime/ObjectAllocator.java
View File

@@ -1,4 +1,7 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.objects.alloc.runtime;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
public interface ObjectAllocator {
<T extends JData> T create(Class<T> type, JObjectKey key);

9
dhfs-parent/objects-alloc/runtime/src/main/resources/META-INF/quarkus-extension.yaml Normal file
View File

@@ -0,0 +1,9 @@
name: DHFS objects allocation
#description: Do something useful.
metadata:
# keywords:
# - objects-alloc
# guide: ... # To create and publish this guide, see https://github.com/quarkiverse/quarkiverse/wiki#documenting-your-extension
# categories:
# - "miscellaneous"
# status: "preview"

20
dhfs-parent/objects-common/pom.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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>
<artifactId>objects-common</artifactId>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JData.java → dhfs-parent/objects-common/src/main/java/com/usatiuk/objects/common/JData.java
View File

@@ -1,5 +1,6 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.objects.common;
// TODO: This could be maybe moved to a separate module?
// The base class for JObject data
// Only one instance of this exists per key, the instance in the manager is canonical
// When committing a transaction, the instance is checked against it, if it isn't the same, a race occurred.

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectKey.java → dhfs-parent/objects-common/src/main/java/com/usatiuk/objects/common/JObjectKey.java
View File

@@ -1,4 +1,4 @@
package com.usatiuk.dhfs.objects;
package com.usatiuk.objects.common;
import java.io.Serializable;

16
dhfs-parent/objects/pom.xml
View File

@@ -64,6 +64,22 @@
<artifactId>supportlib</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.usatiuk</groupId>
<artifactId>objects-alloc</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.usatiuk</groupId>
<artifactId>objects-alloc-deployment</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.usatiuk.dhfs</groupId>
<artifactId>objects-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/CurrentTransaction.java
View File

@@ -2,6 +2,8 @@ package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
import com.usatiuk.dhfs.objects.transaction.Transaction;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

5
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java
View File

@@ -8,6 +8,9 @@ import com.usatiuk.dhfs.objects.transaction.TransactionPrivate;
import com.usatiuk.dhfs.objects.transaction.TxRecord;
import com.usatiuk.dhfs.utils.DataLocker;
import com.usatiuk.dhfs.utils.VoidFn;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.objects.alloc.runtime.ObjectAllocator;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -21,7 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
// Manages all access to JData objects.
// Manages all access to com.usatiuk.objects.common.JData objects.
// In particular, it serves as a source of truth for what is committed to the backing storage.
// All data goes through it, it is responsible for transaction atomicity
@ApplicationScoped

1
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/ObjectSerializer.java
View File

@@ -1,6 +1,7 @@
package com.usatiuk.dhfs.objects;
import com.google.protobuf.ByteString;
import com.usatiuk.objects.common.JData;
public interface ObjectSerializer<T extends JData> {
ByteString serialize(T obj);

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TxBundle.java
View File

@@ -1,5 +1,7 @@
package com.usatiuk.dhfs.objects;
import com.usatiuk.objects.common.JData;
public interface TxBundle {
long getId();

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/FileObjectPersistentStore.java
View File

@@ -2,13 +2,12 @@ package com.usatiuk.dhfs.objects.persistence;
import com.google.protobuf.ByteString;
import com.google.protobuf.UnsafeByteOperations;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.dhfs.supportlib.UninitializedByteBuffer;
import com.usatiuk.dhfs.utils.ByteUtils;
import com.usatiuk.dhfs.utils.SerializationHelper;
import com.usatiuk.dhfs.utils.StatusRuntimeExceptionNoStacktrace;
import io.grpc.Status;
import io.quarkus.arc.lookup.LookupIfProperty;
import io.quarkus.arc.properties.IfBuildProperty;
import io.quarkus.logging.Log;
import io.quarkus.runtime.ShutdownEvent;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/MemoryObjectPersistentStore.java
View File

@@ -1,8 +1,7 @@
package com.usatiuk.dhfs.objects.persistence;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.JObjectKey;
import io.quarkus.arc.lookup.LookupIfProperty;
import com.usatiuk.objects.common.JObjectKey;
import io.quarkus.arc.properties.IfBuildProperty;
import jakarta.enterprise.context.ApplicationScoped;

3
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/ObjectPersistentStore.java
View File

@@ -1,8 +1,7 @@
package com.usatiuk.dhfs.objects.persistence;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JObjectKey;
import javax.annotation.Nonnull;
import java.util.Collection;

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/persistence/TxManifest.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects.persistence;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JObjectKey;
import java.io.Serializable;
import java.util.List;

4
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/Transaction.java
View File

@@ -1,7 +1,7 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
import java.util.Optional;

6
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java
View File

@@ -1,8 +1,8 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.ObjectAllocator;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.objects.alloc.runtime.ObjectAllocator;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import lombok.AccessLevel;

4
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionObjectSource.java
View File

@@ -1,7 +1,7 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
import java.util.Optional;
import java.util.concurrent.locks.ReadWriteLock;

8
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java
View File

@@ -1,8 +1,8 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.ObjectAllocator;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.objects.alloc.runtime.ObjectAllocator;
public class TxRecord {
public interface TxObjectRecord<T> {
@@ -50,7 +50,7 @@ public class TxRecord {
}
public record TxObjectRecordCopyLock<T extends JData>(TransactionObjectSource.TransactionObject<T> original,
ObjectAllocator.ChangeTrackingJData<T> copy)
ObjectAllocator.ChangeTrackingJData<T> copy)
implements TxObjectRecordWrite<T> {
@Override
public T getIfStrategyCompatible(JObjectKey key, LockingStrategy strategy) {

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/ObjectsTest.java
View File

@@ -2,6 +2,8 @@ package com.usatiuk.dhfs.objects;
import com.usatiuk.dhfs.objects.data.Parent;
import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.objects.alloc.runtime.ObjectAllocator;
import io.quarkus.logging.Log;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;

4
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/ChangeTrackerBase.java
View File

@@ -1,7 +1,7 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.ObjectAllocator;
import com.usatiuk.objects.alloc.runtime.ObjectAllocator;
import com.usatiuk.objects.common.JData;
import lombok.Getter;
import java.io.Serializable;

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/KidDataCT.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.dhfs.objects.data.Kid;
import lombok.Getter;

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/KidDataNormal.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.dhfs.objects.data.Kid;
import lombok.Getter;
import lombok.Setter;

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/ParentDataCT.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JObjectKey;
import com.usatiuk.dhfs.objects.data.Parent;
import lombok.Getter;

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/ParentDataNormal.java
View File

@@ -1,7 +1,7 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.data.Parent;
import com.usatiuk.objects.common.JObjectKey;
import lombok.Getter;
import lombok.Setter;

4
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/TestData.java
View File

@@ -1,7 +1,7 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
public abstract class TestData implements JData {
private boolean _changed = false;

6
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/allocator/TestObjectAllocator.java
View File

@@ -1,10 +1,10 @@
package com.usatiuk.dhfs.objects.allocator;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.dhfs.objects.ObjectAllocator;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.alloc.runtime.ObjectAllocator;
import com.usatiuk.dhfs.objects.data.Kid;
import com.usatiuk.dhfs.objects.data.Parent;
import com.usatiuk.objects.common.JObjectKey;
import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Kid.java
View File

@@ -1,6 +1,6 @@
package com.usatiuk.dhfs.objects.data;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.objects.common.JData;
public interface Kid extends JData {
String getName();

5
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/data/Parent.java
View File

@@ -1,12 +1,13 @@
package com.usatiuk.dhfs.objects.data;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.JObjectKey;
import com.usatiuk.objects.common.JData;
import com.usatiuk.objects.common.JObjectKey;
public interface Parent extends JData {
JObjectKey getName();
String getLastName();
void setLastName(String lastName);
JObjectKey getKidKey();

2
dhfs-parent/objects/src/test/java/com/usatiuk/dhfs/objects/serializer/TestJDataSerializer.java
View File

@@ -2,9 +2,9 @@ package com.usatiuk.dhfs.objects.serializer;
import com.google.protobuf.ByteString;
import com.usatiuk.dhfs.objects.JData;
import com.usatiuk.dhfs.objects.ObjectSerializer;
import com.usatiuk.dhfs.utils.SerializationHelper;
import com.usatiuk.objects.common.JData;
import jakarta.enterprise.context.ApplicationScoped;
import java.io.Serializable;

2
dhfs-parent/pom.xml
View File

@@ -17,6 +17,8 @@
<module>autoprotomap</module>
<module>objects</module>
<module>utils</module>
<module>objects-alloc</module>
<module>objects-common</module>
</modules>
<properties>