Optimize code and add tests

sdimitrov9 · sdimitrov9 · commit 44b6915abd91 · 2025-10-29T14:20:47.000+02:00
Signed-off-by: sdimitrov9 &lt;stoyan.dimitrov@limechain.tech&gt;
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/common/Constants.java b/rest-java/src/main/java/org/hiero/mirror/restjava/common/Constants.java
@@ -7,15 +7,17 @@
 @UtilityClass
 public class Constants {
 
+    // Parameter names
     public static final String ACCOUNT_ID = "account.id";
-    public static final String DEFAULT_LIMIT = "25";
     public static final String HOOK_ID = "hook.id";
     public static final String RECEIVER_ID = "receiver.id";
     public static final String SENDER_ID = "sender.id";
     public static final String SERIAL_NUMBER = "serialnumber";
     public static final String TIMESTAMP = "timestamp";
     public static final String TOKEN_ID = "token.id";
 
+    // Defaults and constraints
+    public static final String DEFAULT_LIMIT = "25";
     public static final int MAX_LIMIT = 100;
     public static final int MAX_REPEATED_QUERY_PARAMETERS = 100;
 }
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/controller/HooksController.java b/rest-java/src/main/java/org/hiero/mirror/restjava/controller/HooksController.java
@@ -49,15 +49,15 @@ final class HooksController {
     @GetMapping("/{accountId}/hooks")
     ResponseEntity<HooksResponse> getHooks(
             @PathVariable EntityIdParameter accountId,
-            @RequestParam(name = "hook.id", required = false) @Size(max = MAX_REPEATED_QUERY_PARAMETERS)
+            @RequestParam(name = HOOK_ID, required = false) @Size(max = MAX_REPEATED_QUERY_PARAMETERS)
                     NumberRangeParameter[] hookIds,
             @RequestParam(defaultValue = DEFAULT_LIMIT) @Positive @Max(MAX_LIMIT) int limit,
             @RequestParam(defaultValue = "desc") Sort.Direction order) {
 
         final var hookIdBound = new Bound(hookIds, true, HOOK_ID, HOOK.HOOK_ID);
 
         final var hooksRequest = HooksRequest.builder()
-                .accountId(accountId)
+                .ownerId(accountId)
                 .hookIds(hookIdBound)
                 .limit(limit)
                 .order(order)
@@ -68,12 +68,11 @@ ResponseEntity<HooksResponse> getHooks(
         final var hooksResponse = new HooksResponse();
         hooksResponse.setHooks(hooks);
 
-        if (!hooks.isEmpty() && hooks.size() == limit) {
-            final var sort = Sort.by(order, HOOK_ID);
-            final var pageable = PageRequest.of(0, limit, sort);
-            final var links = linkFactory.create(hooks, pageable, EXTRACTOR);
-            hooksResponse.setLinks(links);
-        }
+        final var sort = Sort.by(order, HOOK_ID);
+        final var pageable = PageRequest.of(0, limit, sort);
+        final var links = linkFactory.create(hooks, pageable, EXTRACTOR);
+        hooksResponse.setLinks(links);
+
         return ResponseEntity.ok(hooksResponse);
     }
 }
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/dto/HooksRequest.java b/rest-java/src/main/java/org/hiero/mirror/restjava/dto/HooksRequest.java
@@ -4,25 +4,25 @@
 
 import java.util.List;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Value;
 import org.hiero.mirror.restjava.common.EntityIdParameter;
 import org.hiero.mirror.restjava.service.Bound;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 
-@Data
+@Value
 @Builder
 public class HooksRequest {
-    private EntityIdParameter accountId;
+    EntityIdParameter ownerId;
 
     @Builder.Default
-    private int limit = 25;
+    int limit = 25;
 
     @Builder.Default
-    private Sort.Direction order = Direction.DESC;
+    Sort.Direction order = Direction.DESC;
 
     @Builder.Default
-    private Bound hookIds = Bound.EMPTY;
+    Bound hookIds = Bound.EMPTY;
 
     public List<Bound> getBounds() {
         return hookIds.isEmpty() ? List.of() : List.of(hookIds);
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/mapper/CommonMapper.java b/rest-java/src/main/java/org/hiero/mirror/restjava/mapper/CommonMapper.java
@@ -117,14 +117,19 @@ default TimestampRange mapRange(Range<Long> source) {
     }
 
     default TimestampRangeNullable mapTimestampRangeNullable(Range<Long> source) {
-        final var timestampRange = mapRange(source);
-        if (timestampRange == null) {
+        if (source == null) {
             return null;
         }
 
-        final var target = new TimestampRangeNullable();
-        target.setFrom(timestampRange.getFrom());
-        target.setTo(timestampRange.getTo());
+        var target = new TimestampRangeNullable();
+        if (source.hasLowerBound()) {
+            target.setFrom(mapTimestamp(source.lowerEndpoint()));
+        }
+
+        if (source.hasUpperBound()) {
+            target.setTo(mapTimestamp(source.upperEndpoint()));
+        }
+
         return target;
     }
 
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/repository/HookRepositoryCustom.java b/rest-java/src/main/java/org/hiero/mirror/restjava/repository/HookRepositoryCustom.java
@@ -2,14 +2,12 @@
 
 package org.hiero.mirror.restjava.repository;
 
-import jakarta.validation.constraints.NotNull;
 import java.util.Collection;
 import org.hiero.mirror.common.domain.entity.EntityId;
 import org.hiero.mirror.common.domain.hook.Hook;
 import org.hiero.mirror.restjava.dto.HooksRequest;
 
 public interface HookRepositoryCustom extends JooqRepository {
 
-    @NotNull
     Collection<Hook> findAll(HooksRequest request, EntityId accountId);
 }
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/repository/HookRepositoryCustomImpl.java b/rest-java/src/main/java/org/hiero/mirror/restjava/repository/HookRepositoryCustomImpl.java
@@ -2,7 +2,6 @@
 
 package org.hiero.mirror.restjava.repository;
 
-import static org.hiero.mirror.restjava.common.RangeOperator.EQ;
 import static org.hiero.mirror.restjava.jooq.domain.Tables.HOOK;
 
 import jakarta.inject.Named;
@@ -11,14 +10,14 @@
 import org.hiero.mirror.common.domain.entity.EntityId;
 import org.hiero.mirror.common.domain.hook.Hook;
 import org.hiero.mirror.restjava.dto.HooksRequest;
-import org.jooq.Condition;
 import org.jooq.DSLContext;
-import org.jooq.Field;
 import org.jooq.SortOrder;
+import org.jspecify.annotations.NullMarked;
 
 @Named
+@NullMarked
 @RequiredArgsConstructor
-public class HookRepositoryCustomImpl implements HookRepositoryCustom {
+final class HookRepositoryCustomImpl implements HookRepositoryCustom {
 
     private final DSLContext dsl;
 
@@ -27,7 +26,7 @@ public Collection<Hook> findAll(HooksRequest request, EntityId accountId) {
 
         final var hookTable = HOOK;
 
-        final var ownerIdCondition = hookTable.OWNER_ID.eq(accountId.getNum());
+        final var ownerIdCondition = hookTable.OWNER_ID.eq(accountId.getId());
         final var hookIdCondition = getBoundConditions(request.getBounds());
         final var orderBy = hookTable.HOOK_ID.sort(request.getOrder().isAscending() ? SortOrder.ASC : SortOrder.DESC);
 
@@ -37,8 +36,4 @@ public Collection<Hook> findAll(HooksRequest request, EntityId accountId) {
                 .limit(request.getLimit())
                 .fetchInto(Hook.class);
     }
-
-    private Condition getBaseCondition(EntityId accountId, Field<Long> baseField) {
-        return getCondition(baseField, EQ, accountId.getId());
-    }
 }
diff --git a/rest-java/src/main/java/org/hiero/mirror/restjava/service/HookServiceImpl.java b/rest-java/src/main/java/org/hiero/mirror/restjava/service/HookServiceImpl.java
@@ -20,7 +20,7 @@ final class HookServiceImpl implements HookService {
 
     @Override
     public Collection<Hook> getHooks(HooksRequest request) {
-        final var id = entityService.lookup(request.getAccountId());
+        final var id = entityService.lookup(request.getOwnerId());
         return hookRepository.findAll(request, id);
     }
 }
diff --git a/rest-java/src/test/java/org/hiero/mirror/restjava/mapper/CommonMapperTest.java b/rest-java/src/test/java/org/hiero/mirror/restjava/mapper/CommonMapperTest.java
@@ -20,6 +20,7 @@
 import org.hiero.mirror.common.util.DomainUtils;
 import org.hiero.mirror.rest.model.Key.TypeEnum;
 import org.hiero.mirror.rest.model.TimestampRange;
+import org.hiero.mirror.rest.model.TimestampRangeNullable;
 import org.hiero.mirror.restjava.exception.InvalidMappingException;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
@@ -180,6 +181,52 @@ void mapRange() {
                 .isEqualTo(range);
     }
 
+    @Test
+    void mapTimestampRangeNullable() {
+        var range = new TimestampRangeNullable();
+        var now = System.nanoTime();
+        var timestampString = StringUtils.leftPad(String.valueOf(now), 10, '0');
+
+        // test1
+        assertThat(commonMapper.mapTimestampRangeNullable(null)).isNull();
+
+        // test2
+        range.setFrom("0.0");
+        range.setTo(null);
+        assertThat(commonMapper.mapTimestampRangeNullable(Range.atLeast(0L)))
+                .usingRecursiveComparison()
+                .isEqualTo(range);
+
+        // test3
+        range.setFrom("0.0");
+        range.setTo(timestampString.substring(0, timestampString.length() - NANO_DIGITS) + "."
+                + timestampString.substring(timestampString.length() - NANO_DIGITS));
+        assertThat(commonMapper.mapTimestampRangeNullable(Range.openClosed(0L, now)))
+                .usingRecursiveComparison()
+                .isEqualTo(range);
+
+        // test4
+        range.setFrom("1586567700.453054000");
+        range.setTo("1586567700.453054000");
+        assertThat(commonMapper.mapTimestampRangeNullable(Range.openClosed(1586567700453054000L, 1586567700453054000L)))
+                .usingRecursiveComparison()
+                .isEqualTo(range);
+
+        // test5
+        range.setFrom("0.000000001");
+        range.setTo("0.000000100");
+        assertThat(commonMapper.mapTimestampRangeNullable(Range.openClosed(1L, 100L)))
+                .usingRecursiveComparison()
+                .isEqualTo(range);
+
+        // test6
+        range.setFrom("0.110000000");
+        range.setTo("1.100000000");
+        assertThat(commonMapper.mapTimestampRangeNullable(Range.openClosed(110000000L, 1100000000L)))
+                .usingRecursiveComparison()
+                .isEqualTo(range);
+    }
+
     @Test
     void mapTimestamp() {
         assertThat(commonMapper.mapTimestamp(null)).isNull();
diff --git a/rest-java/src/test/java/org/hiero/mirror/restjava/repository/HookRepositoryTest.java b/rest-java/src/test/java/org/hiero/mirror/restjava/repository/HookRepositoryTest.java
@@ -36,7 +36,7 @@ void setup() {
     void findAllSorted(Direction direction) {
         // given
         final var request = HooksRequest.builder()
-                .accountId(EntityIdParameter.valueOf("0.0" + ownerId))
+                .ownerId(EntityIdParameter.valueOf("0.0" + ownerId))
                 .limit(5)
                 .order(direction)
                 .build();
@@ -65,7 +65,7 @@ void findAllSorted(Direction direction) {
     void findAllNoMatch() {
         // Request with a non-existent account
         final var request = HooksRequest.builder()
-                .accountId(EntityIdParameter.valueOf("999999"))
+                .ownerId(EntityIdParameter.valueOf("999999"))
                 .limit(5)
                 .order(Direction.ASC)
                 .build();
diff --git a/rest-java/src/test/java/org/hiero/mirror/restjava/service/HookServiceTest.java b/rest-java/src/test/java/org/hiero/mirror/restjava/service/HookServiceTest.java
@@ -39,7 +39,7 @@ void setup() {
     void getHooks() {
         // given
         final var request = HooksRequest.builder()
-                .accountId(new EntityIdNumParameter(ownerId))
+                .ownerId(new EntityIdNumParameter(ownerId))
                 .limit(5)
                 .order(Direction.ASC)
                 .build();
@@ -56,7 +56,7 @@ void getHooksEmptyResult() {
         // given – no hooks for this account
         final var nonexistent = EntityId.of(domainBuilder.id());
         final var request = HooksRequest.builder()
-                .accountId(new EntityIdNumParameter(nonexistent))
+                .ownerId(new EntityIdNumParameter(nonexistent))
                 .limit(5)
                 .order(Direction.ASC)
                 .build();

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ final class HookServiceImpl implements HookService {`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public Collection<Hook> getHooks(HooksRequest request) {`
`23`		`- final var id = entityService.lookup(request.getAccountId());`
	`23`	`+ final var id = entityService.lookup(request.getOwnerId());`
`24`	`24`	`return hookRepository.findAll(request, id);`
`25`	`25`	`}`
`26`	`26`	`}`