From 4c8cc3dad3d307863df15bb3dca5008b34810d56 Mon Sep 17 00:00:00 2001 From: shleger Date: Thu, 21 Mar 2024 19:28:59 +0800 Subject: [PATCH] fix: RA-43 fix getType for mapper, fix h2 start (#95) --- .env.h2 | 2 +- .../rosetta/api/block/mapper/BlockToBlockResponse.java | 6 ++++-- .../config/{application-devh2.yaml => application-h2.yaml} | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename api/src/main/resources/config/{application-devh2.yaml => application-h2.yaml} (97%) diff --git a/.env.h2 b/.env.h2 index 3c6791b1d..9de3a91de 100644 --- a/.env.h2 +++ b/.env.h2 @@ -1,7 +1,7 @@ #Use envfile plugin for IDEA #https://plugins.jetbrains.com/plugin/7861-envfile -API_SPRING_PROFILES_ACTIVE=devh2 +API_SPRING_PROFILES_ACTIVE=h2 NETWORK=devkit # devkit, mainnet, testnet, preprod PROTOCOL_MAGIC=42 diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/block/mapper/BlockToBlockResponse.java b/api/src/main/java/org/cardanofoundation/rosetta/api/block/mapper/BlockToBlockResponse.java index 0e3d04cd7..803cdf03b 100644 --- a/api/src/main/java/org/cardanofoundation/rosetta/api/block/mapper/BlockToBlockResponse.java +++ b/api/src/main/java/org/cardanofoundation/rosetta/api/block/mapper/BlockToBlockResponse.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; import lombok.AllArgsConstructor; @@ -34,8 +35,9 @@ public class BlockToBlockResponse { */ public BlockResponse toDto(Block model) { - return modelMapper - .createTypeMap(Block.class, BlockResponse.class) + return Optional + .ofNullable(modelMapper.getTypeMap(Block.class, BlockResponse.class)) + .orElseGet(() -> modelMapper.createTypeMap(Block.class, BlockResponse.class)) .addMappings(mapper -> { mapper.map(Block::getHash, (dest, v) -> currentId(dest).setHash(v)); mapper.map(Block::getNumber, (dest, v) -> currentId(dest).setIndex(v)); diff --git a/api/src/main/resources/config/application-devh2.yaml b/api/src/main/resources/config/application-h2.yaml similarity index 97% rename from api/src/main/resources/config/application-devh2.yaml rename to api/src/main/resources/config/application-h2.yaml index 80223794d..2e136f270 100644 --- a/api/src/main/resources/config/application-devh2.yaml +++ b/api/src/main/resources/config/application-h2.yaml @@ -20,7 +20,7 @@ spring: driver-class-name: org.h2.Driver username: ${DB_ADMIN_USER_NAME:rosetta_db_admin} password: ${DB_ADMIN_USER_SECRET:weakpwd#123_d} - url: jdbc:h2:tcp://localhost:9090/mem:rosetta-java-preprod + url: jdbc:h2:tcp://localhost:9090/mem:${DB_NAME:rosetta-java-preprod} jpa: properties: hibernate: