Optimize code

Signed-off-by: sdimitrov9 <stoyan.dimitrov@limechain.tech>

Author: sdimitrov9

common/build.gradle.kts

@@ -10,7 +10,6 @@ configurations.all {
 
 dependencies {
     val testClasses by configurations.registering
-    annotationProcessor("jakarta.persistence:jakarta.persistence-api")
     api("org.postgresql:postgresql")
     api("org.springframework.data:spring-data-relational")
     api("org.springframework.boot:spring-boot-starter-data-jdbc")
@@ -21,7 +20,6 @@ dependencies {
     api("com.google.protobuf:protobuf-java")
     api("com.hedera.hashgraph:hedera-protobuf-java-api") { isTransitive = false }
     api("commons-codec:commons-codec")
-    api("io.hypersistence:hypersistence-utils-hibernate-71")
     api("jakarta.servlet:jakarta.servlet-api")
     api("org.apache.commons:commons-lang3")
     api("org.apache.tuweni:tuweni-bytes")

common/src/main/java/org/hiero/mirror/common/CommonConfiguration.java

@@ -35,8 +35,6 @@
 import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
 import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-import org.springframework.data.relational.core.mapping.NamingStrategy;
-import org.springframework.data.relational.core.mapping.Table;
 
 @Configuration(proxyBeanMethods = false)
 @ConfigurationPropertiesScan("org.hiero.mirror")
@@ -66,25 +64,6 @@ HikariConfig hikariConfig() {
         return new HikariConfig();
     }
 
-    /**
-     * Mirror Node Naming Strategy.
-     * Ensures class 'AccountBalance' maps to 'account_balance' and
-     * respects the @Table annotation values.
-     */
-    @Bean
-    public NamingStrategy namingStrategy() {
-        return new NamingStrategy() {
-            @Override
-            public String getTableName(Class<?> type) {
-                var table = type.getAnnotation(Table.class);
-                if (table != null && !table.value().isEmpty()) {
-                    return table.value();
-                }
-                return NamingStrategy.super.getTableName(type);
-            }
-        };
-    }
-
     @Bean
     @ConditionalOnMissingBean(DataSource.class)
     @Lazy
@@ -138,8 +117,8 @@ public JdbcCustomConversions jdbcCustomConversions() {
                 new PostgresHookJdbcConverters.PostgresHookTypeToPGobject(),
                 new PostgresHookJdbcConverters.PGobjectToPostgresHookType(),
                 new PostgresHookJdbcConverters.StringToPostgresHookType(),
-                new RangeToPGobjectWritingConverter(), // Replaces @TypeRegistration
-                new PGobjectToRangeReadingConverter(), // Replaces @TypeRegistration
+                new RangeToPGobjectWritingConverter(),
+                new PGobjectToRangeReadingConverter(),
                 new JsonbWritingConverters.FixedFeesHolderToJsonb(),
                 new JsonbWritingConverters.FractionalFeesHolderToJsonb(),
                 new JsonbWritingConverters.RoyaltyFeesHolderToJsonb(),

common/src/main/java/org/hiero/mirror/common/converter/EntityIdSerializer.java

@@ -6,10 +6,11 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import java.io.IOException;
+import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.hiero.mirror.common.domain.entity.EntityId;
 
-@NoArgsConstructor()
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 @SuppressWarnings("java:S6548")
 public class EntityIdSerializer extends JsonSerializer<EntityId> {
 

common/src/main/java/org/hiero/mirror/common/converter/ObjectToStringSerializer.java

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import io.hypersistence.utils.hibernate.type.util.JsonConfiguration;
 import java.io.IOException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -35,13 +34,6 @@ public class ObjectToStringSerializer extends JsonSerializer<Object> {
                 .registerModule(module)
                 .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
                 .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-
-        // Optional: fails outside Hibernate (e.g. some JDBC-only modules); JsonBinaryType is JPA-specific.
-        try {
-            JsonConfiguration.INSTANCE.getObjectMapperWrapper().setObjectMapper(OBJECT_MAPPER);
-        } catch (Throwable e) {
-            LOG.debug("Skipping Hypersistence JsonConfiguration hook: {}", e.toString());
-        }
     }
 
     public static void init() {

common/src/main/java/org/hiero/mirror/common/converter/RangeToStringSerializer.java

@@ -26,8 +26,6 @@ public void serialize(Range<Long> range, JsonGenerator gen, SerializerProvider p
         String lower = range.hasLowerBound() ? range.lowerEndpoint().toString() : "";
         String upper = range.hasUpperBound() ? range.upperEndpoint().toString() : "";
 
-        // Mirror Node standard: [lower,upper)
-        // This produces the same string format the Hibernate type used to generate
         gen.writeString(String.format("[%s,%s)", lower, upper));
     }
 }

common/src/main/java/org/hiero/mirror/common/domain/addressbook/AddressBook.java

@@ -23,11 +23,9 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class AddressBook {
 
-    // consensusTimestamp + 1ns of transaction containing final fileAppend operation
     @Id
     private Long startConsensusTimestamp;
 
-    // consensusTimestamp of transaction containing final fileAppend operation of next address book
     private Long endConsensusTimestamp;
 
     @EqualsAndHashCode.Exclude
@@ -39,7 +37,6 @@ public class AddressBook {
     @ToString.Exclude
     private byte[] fileData;
 
-    // Converter removed. Handled by global EntityIdConverter bean.
     private EntityId fileId;
 
     private Integer nodeCount;

common/src/main/java/org/hiero/mirror/common/domain/addressbook/AddressBookEntry.java

@@ -42,7 +42,6 @@ public class AddressBookEntry implements Persistable<AddressBookEntry.Id> {
 
     private String memo;
 
-    // Converter removed. Handled by global EntityId Reading/Writing converters.
     private EntityId nodeAccountId;
 
     @ToString.Exclude
@@ -53,7 +52,7 @@ public class AddressBookEntry implements Persistable<AddressBookEntry.Id> {
 
     @EqualsAndHashCode.Exclude
     @ToString.Exclude
-    @Transient // Spring Data version
+    @Transient
     private PublicKey publicKeyObject;
 
     @Builder.Default
@@ -64,17 +63,14 @@ public class AddressBookEntry implements Persistable<AddressBookEntry.Id> {
 
     private Long stake;
 
-    // Convenience accessor so callers can use entry.getConsensusTimestamp() without going through getId()
     public long getConsensusTimestamp() {
         return id != null ? id.getConsensusTimestamp() : 0L;
     }
 
-    // Convenience accessor so callers can use entry.getNodeId() without going through getId()
     public long getNodeId() {
         return id != null ? id.getNodeId() : 0L;
     }
 
-    // Custom getter to maintain the logic for the transient field
     public PublicKey getPublicKeyObject() {
         if (publicKeyObject == null && publicKey != null) {
             publicKeyObject = parsePublicKey();
@@ -114,7 +110,6 @@ public static class Id implements Serializable {
         private long nodeId;
     }
 
-    // Custom builder methods so existing callers can use .consensusTimestamp(x).nodeId(y) without restructuring
     public static class AddressBookEntryBuilder {
         public AddressBookEntryBuilder consensusTimestamp(long consensusTimestamp) {
             if (this.id == null) this.id = new Id();

common/src/main/java/org/hiero/mirror/common/domain/addressbook/AddressBookServiceEndpoint.java

@@ -36,12 +36,9 @@ public Id getId() {
     @JsonIgnore
     @Override
     public boolean isNew() {
-        // Natural IDs for service endpoints should always trigger an INSERT
         return true;
     }
 
-    // Convenience accessors so existing callers keep working without restructuring
-
     public long getConsensusTimestamp() {
         return id != null ? id.getConsensusTimestamp() : 0L;
     }
@@ -107,7 +104,6 @@ public static class Id implements Serializable {
         private String domainName;
     }
 
-    // Custom builder methods so existing callers can set individual key fields directly
     public static class AddressBookServiceEndpointBuilder {
         public AddressBookServiceEndpointBuilder consensusTimestamp(long consensusTimestamp) {
             if (this.id == null) this.id = new Id();

common/src/main/java/org/hiero/mirror/common/domain/addressbook/NodeStake.java

@@ -17,7 +17,7 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Builder(toBuilder = true)
 @Data
-@Table("node_stake") // Explicit naming is best practice
+@Table("node_stake")
 @NoArgsConstructor
 public class NodeStake implements Persistable<NodeStake.Id> {
 
@@ -72,7 +72,6 @@ public Id getId() {
     @JsonIgnore
     @Override
     public boolean isNew() {
-        // Keeps the optimization to skip the "SELECT" check before insert
         return true;
     }
 
@@ -87,7 +86,6 @@ public static class Id implements Serializable {
         private long nodeId;
     }
 
-    /** Bridges {@link Builder} to the flattened {@link #consensusTimestamp} / {@link #nodeId} API. */
     public static class NodeStakeBuilder {
         public NodeStakeBuilder consensusTimestamp(long consensusTimestamp) {
             if (this.id == null) {

common/src/main/java/org/hiero/mirror/common/domain/balance/AccountBalance.java

@@ -37,12 +37,10 @@ public class AccountBalance implements Persistable<AccountBalance.Id>, StreamIte
     @Embedded(onEmpty = Embedded.OnEmpty.USE_NULL)
     private Id id;
 
-    // Convenience accessor so callers can use accountBalance.getConsensusTimestamp() without going through getId()
     public long getConsensusTimestamp() {
         return id != null ? id.getConsensusTimestamp() : 0L;
     }
 
-    // Convenience accessor so callers can use accountBalance.getAccountId() without going through getId()
     public EntityId getAccountId() {
         return id != null ? id.getAccountId() : null;
     }