From 628bc2128810247a0e52cb930ca15e6c5c0db86f Mon Sep 17 00:00:00 2001 From: Leandro Pinho Date: Sat, 9 Jul 2022 14:38:13 -0300 Subject: [PATCH] :refactor rename objects --- ...tion.java => BeaconEngineApplication.java} | 4 +- ...10__add_status_code_to_vdf_combination.sql | 2 + ...n.java => BeaconInterfaceApplication.java} | 4 +- .../combination/CombinationServiceTest.java | 40 ++++++++++--------- 4 files changed, 28 insertions(+), 22 deletions(-) rename beacon-engine/src/main/java/br/gov/inmetro/beacon/{BeaconApplication.java => BeaconEngineApplication.java} (86%) create mode 100644 beacon-engine/src/main/resources/db/migration/V2.10__add_status_code_to_vdf_combination.sql rename beacon-interface/src/main/java/com/example/beacon/{Application.java => BeaconInterfaceApplication.java} (92%) diff --git a/beacon-engine/src/main/java/br/gov/inmetro/beacon/BeaconApplication.java b/beacon-engine/src/main/java/br/gov/inmetro/beacon/BeaconEngineApplication.java similarity index 86% rename from beacon-engine/src/main/java/br/gov/inmetro/beacon/BeaconApplication.java rename to beacon-engine/src/main/java/br/gov/inmetro/beacon/BeaconEngineApplication.java index 7db80bd..c82b2da 100644 --- a/beacon-engine/src/main/java/br/gov/inmetro/beacon/BeaconApplication.java +++ b/beacon-engine/src/main/java/br/gov/inmetro/beacon/BeaconEngineApplication.java @@ -12,10 +12,10 @@ @SpringBootApplication @EnableRabbit @EnableAsync -public class BeaconApplication { +public class BeaconEngineApplication { public static void main(String[] args) { - SpringApplication.run(BeaconApplication.class, args); + SpringApplication.run(BeaconEngineApplication.class, args); } @EventListener(ContextRefreshedEvent.class) diff --git a/beacon-engine/src/main/resources/db/migration/V2.10__add_status_code_to_vdf_combination.sql b/beacon-engine/src/main/resources/db/migration/V2.10__add_status_code_to_vdf_combination.sql new file mode 100644 index 0000000..140494f --- /dev/null +++ b/beacon-engine/src/main/resources/db/migration/V2.10__add_status_code_to_vdf_combination.sql @@ -0,0 +1,2 @@ +ALTER TABLE vdf_combination +ADD COLUMN status_code int(11) NOT NULL; \ No newline at end of file diff --git a/beacon-interface/src/main/java/com/example/beacon/Application.java b/beacon-interface/src/main/java/com/example/beacon/BeaconInterfaceApplication.java similarity index 92% rename from beacon-interface/src/main/java/com/example/beacon/Application.java rename to beacon-interface/src/main/java/com/example/beacon/BeaconInterfaceApplication.java index 575c412..e1fb784 100644 --- a/beacon-interface/src/main/java/com/example/beacon/Application.java +++ b/beacon-interface/src/main/java/com/example/beacon/BeaconInterfaceApplication.java @@ -18,10 +18,10 @@ @SpringBootApplication @EnableScheduling @EnableRabbit -public class Application { +public class BeaconInterfaceApplication { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(BeaconInterfaceApplication.class, args); } @EventListener(ContextRefreshedEvent.class) diff --git a/beacon-interface/src/test/java/com/example/beacon/vdf/application/combination/CombinationServiceTest.java b/beacon-interface/src/test/java/com/example/beacon/vdf/application/combination/CombinationServiceTest.java index b111f57..c812a9e 100644 --- a/beacon-interface/src/test/java/com/example/beacon/vdf/application/combination/CombinationServiceTest.java +++ b/beacon-interface/src/test/java/com/example/beacon/vdf/application/combination/CombinationServiceTest.java @@ -1,5 +1,7 @@ package com.example.beacon.vdf.application.combination; +import com.example.beacon.vdf.application.combination.dto.VdfPulseDtoPost; +import com.example.beacon.vdf.application.vdfunicorn.SeedPostDto; import org.bouncycastle.pqc.math.linearalgebra.ByteUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,28 +16,30 @@ import static com.example.beacon.vdf.infra.util.DateUtil.getTimeStampFormated; -//@RunWith(SpringRunner.class) -//@SpringBootTest -//@TestPropertySource("classpath:application-test.properties") +@RunWith(SpringRunner.class) +@SpringBootTest +@TestPropertySource("classpath:application-test.properties") public class CombinationServiceTest { -// @Autowired -// CombinationService combinationService; + @Autowired + CombinationService combinationService; -// @Test -// public void precommitSeedAndOneMore() throws Exception { -// VdfPulseDtoPost vdfPulseDto = new VdfPulseDtoPost(); -// vdfPulseDto.setCertificateId("02288edbdc04bdeeb1c8140a41a1ad40ab2ea7ad27fdd316946f3ec5aff1a7129f1fb5078202d75d42c201878b06d79c45bf37adb55f83aa213200834792b1da"); -// vdfPulseDto.setSeed("100EFBEB29F458E06BF267EBB5CFCE768F9980317555E8C716B7CBE6C2BC07BE4983121D8DC0384AD6EF6ED4FC7C8EFDCB90509649AF3126A621368FA9073D12"); -// vdfPulseDto.setCipherSuite(0); -// vdfPulseDto.setOriginEnum(OriginEnum.NIST); -// -// SeedPostDto seedPostDto = new SeedPostDto("100EFBEB29F458E06BF267EBB5CFCE768F9980317555E8C716B7CBE6C2BC07" + -// "BE4983121D8DC0384AD6EF6ED4FC7C8EFDCB90509649AF3126A621368FA9073D12", -// OriginEnum.NIST.toString()); + @Test + public void precommitSeedAndOneMore() throws Exception { + VdfPulseDtoPost vdfPulseDto = new VdfPulseDtoPost(); + vdfPulseDto.setCertificateId("02288edbdc04bdeeb1c8140a41a1ad40ab2ea7ad27fdd316946f3ec5aff1a7129f1fb5078202d75d42c201878b06d79c45bf37adb55f83aa213200834792b1da"); + vdfPulseDto.setSeed("100EFBEB29F458E06BF267EBB5CFCE768F9980317555E8C716B7CBE6C2BC07BE4983121D8DC0384AD6EF6ED4FC7C8EFDCB90509649AF3126A621368FA9073D12"); + vdfPulseDto.setCipherSuite(0); + vdfPulseDto.setOriginEnum(OriginEnum.NIST); -// combinationService.run(getTimeStampFormated(ZonedDateTime.now())); -// } + SeedPostDto seedPostDto = new SeedPostDto("100EFBEB29F458E06BF267EBB5CFCE768F9980317555E8C716B7CBE6C2BC07BE4983121D8DC0384AD6EF6ED4FC7C8EFDCB90509649AF3126A621368FA9073D12", + "description", + "uri"); + + combinationService.run(getTimeStampFormated(ZonedDateTime.now())); + + System.out.println("FIM"); + } // @Test