Using Ids utility classes (#67)

Author: IsmailMarmoush

.github/workflows/PR.yaml

@@ -28,7 +28,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+          mvn -B -Pjacoco verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
           -Dsonar.host.url="https://sonarcloud.io" \
           -Dsonar.organization=memoria-io \
           -Dsonar.projectKey=memoria-io_atom

.github/workflows/Release.yaml

@@ -29,7 +29,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn --batch-mode deploy org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+          mvn -B -Pjacoco deploy org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
           -Dsonar.host.url="https://sonarcloud.io" \
           -Dsonar.organization=memoria-io \
           -Dsonar.projectKey=memoria-io_atom

core/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>io.memoria</groupId>
         <artifactId>atom</artifactId>
-        <version>24.4.0</version>
+        <version>24.5.0</version>
     </parent>
 
     <groupId>io.memoria.atom</groupId>
     <artifactId>core</artifactId>
-    <version>24.4.0</version>
+    <version>24.5.0</version>
     <packaging>jar</packaging>
     <name>${project.groupId}.${project.artifactId}</name>
     <description>Core Module</description>

core/src/main/java/io/memoria/atom/core/id/Id.java

@@ -29,18 +29,6 @@ public Id(Id id) {
     this.value = id.value;
   }
 
-  public static Id of(String value) {
-    return new Id(value);
-  }
-
-  public static Id of(long value) {
-    return new Id(value);
-  }
-
-  public static Id of(UUID uuid) {
-    return new Id(uuid);
-  }
-
   public String value() {
     return value;
   }

core/src/main/java/io/memoria/atom/core/id/Ids.java

@@ -0,0 +1,19 @@
+package io.memoria.atom.core.id;
+
+import java.util.UUID;
+
+public class Ids {
+  private Ids() {}
+
+  public static Id of(String value) {
+    return new Id(value);
+  }
+
+  public static Id of(long value) {
+    return new Id(value);
+  }
+
+  public static Id of(UUID uuid) {
+    return new Id(uuid);
+  }
+}

core/src/test/java/io/memoria/atom/core/domain/PartitionedTest.java

@@ -1,6 +1,7 @@
 package io.memoria.atom.core.domain;
 
 import io.memoria.atom.core.id.Id;
+import io.memoria.atom.core.id.Ids;
 import io.memoria.atom.core.math.MathOps;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -28,7 +29,7 @@ public class PartitionedTest {
   @MethodSource("totalPartitions")
   void uuidShardsShouldBeNormal(int totalPartitions) {
     // Given
-    var shards = createShards(_ -> Id.of(UUID.randomUUID()));
+    var shards = createShards(_ -> Ids.of(UUID.randomUUID()));
     var partitionSizeList = partitionSizeList(shards, totalPartitions).stream().map(Long::doubleValue).toList();
     int maxOutliers = getMaxOutliers(totalPartitions);
 
@@ -43,7 +44,7 @@ void uuidShardsShouldBeNormal(int totalPartitions) {
   @MethodSource("totalPartitions")
   void longShardsShouldBeNormal(int totalPartitions) {
     // Given
-    var shards = createShards(Id::of);
+    var shards = createShards(Ids::of);
     var partitionSizeList = partitionSizeList(shards, totalPartitions).stream().map(Long::doubleValue).toList();
 
     // When

core/src/test/java/io/memoria/atom/core/id/IdTest.java

@@ -22,8 +22,8 @@ void idEquality() {
     var uuidStr = uuid.toString();
 
     // When
-    var id1 = Id.of(uuid);
-    var id2 = Id.of(uuidStr);
+    var id1 = Ids.of(uuid);
+    var id2 = Ids.of(uuidStr);
 
     // Then
     Assertions.assertThat(id1).isEqualTo(id2).hasToString(uuidStr);
@@ -32,31 +32,31 @@ void idEquality() {
 
   @Test
   void happyPath() {
-    var id = Id.of(UuidCreator.getTimeOrderedEpoch());
+    var id = Ids.of(UuidCreator.getTimeOrderedEpoch());
     Assertions.assertThat(id.value()).isNotEmpty();
   }
 
   @Test
   void validation() {
     String str = null;
     //noinspection ConstantValue
-    Assertions.assertThatNullPointerException().isThrownBy(() -> Id.of(str));
-    Assertions.assertThatIllegalArgumentException().isThrownBy(() -> Id.of(-1L));
-    Assertions.assertThatIllegalArgumentException().isThrownBy(() -> Id.of(""));
+    Assertions.assertThatNullPointerException().isThrownBy(() -> Ids.of(str));
+    Assertions.assertThatIllegalArgumentException().isThrownBy(() -> Ids.of(-1L));
+    Assertions.assertThatIllegalArgumentException().isThrownBy(() -> Ids.of(""));
   }
 
   @Test
   void uuidOrdering() {
     TreeMap<Id, Integer> map = new TreeMap<>();
-    IntStream.range(0, 1000).forEach(i -> map.put(Id.of(UuidCreator.getTimeOrderedEpoch()), i));
+    IntStream.range(0, 1000).forEach(i -> map.put(Ids.of(UuidCreator.getTimeOrderedEpoch()), i));
     var atomic = new AtomicInteger(0);
     map.forEach((k, v) -> Assertions.assertThat(v).isEqualTo(atomic.getAndIncrement()));
   }
 
   @Test
   void seqIdOrdering() {
     TreeMap<Id, Integer> map = new TreeMap<>();
-    IntStream.range(0, 1000).forEach(i -> map.put(Id.of(i), i));
+    IntStream.range(0, 1000).forEach(i -> map.put(Ids.of(i), i));
     var atomic = new AtomicInteger(0);
     map.forEach((k, v) -> Assertions.assertThat(v).isEqualTo(atomic.getAndIncrement()));
   }

core/src/test/java/io/memoria/atom/core/id/IdsTest.java

@@ -0,0 +1,28 @@
+package io.memoria.atom.core.id;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class IdsTest {
+  @Test
+  void testOfString() {
+    Id id = Ids.of("123");
+    assertEquals("123", id.value());
+  }
+
+  @Test
+  void testOfLong() {
+    Id id = Ids.of(123L);
+    assertEquals("123", id.value());
+  }
+
+  @Test
+  void testOfUUID() {
+    UUID uuid = UUID.randomUUID();
+    Id id = Ids.of(uuid);
+    assertEquals(uuid.toString(), id.value());
+  }
+}

docker-compose.yaml

@@ -0,0 +1,27 @@
+version: '3.8'
+
+services:
+  sonarqube:
+    image: sonarqube:latest
+    container_name: sonarqube
+    ports:
+      - "127.0.0.1:9000:9000"
+    environment:
+      - SONAR_JDBC_URL=jdbc:postgresql://db:5432/sonar
+      - SONAR_JDBC_USERNAME=sonar
+      - SONAR_JDBC_PASSWORD=sonar
+    depends_on:
+      - db
+
+  db:
+    image: postgres:latest
+    container_name: sonarqube_db
+    environment:
+      - POSTGRES_USER=sonar
+      - POSTGRES_PASSWORD=sonar
+      - POSTGRES_DB=sonar
+    volumes:
+      - sonarqube_db_data:/var/lib/postgresql/data
+
+volumes:
+  sonarqube_db_data:

eventsourcing/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>io.memoria</groupId>
         <artifactId>atom</artifactId>
-        <version>24.4.0</version>
+        <version>24.5.0</version>
     </parent>
 
     <groupId>io.memoria.atom</groupId>
     <artifactId>eventsourcing</artifactId>
-    <version>24.4.0</version>
+    <version>24.5.0</version>
     <packaging>jar</packaging>
     <name>${project.groupId}.${project.artifactId}</name>
     <description>eventsourcing Module</description>