From 8f306579223ae069f4bed553340c4717985cbf98 Mon Sep 17 00:00:00 2001 From: Alexandre C Date: Sat, 21 May 2022 11:30:18 -0300 Subject: [PATCH] removed obsolete helper service --- .idea/compiler.xml | 4 +- .idea/misc.xml | 5 ++ near-java-api-helper/pom.xml | 32 ---------- .../deserializer/NearValueDeserializer.java | 31 --------- .../near/api/helper/model/NearValue.java | 34 ---------- .../api/helper/service/NearHelperService.java | 63 ------------------- .../exception/NearHelperServiceException.java | 15 ----- .../src/main/resources/.gitkeep | 0 .../service/NearHelperServiceHelper.java | 18 ------ .../helper/service/NearHelperServiceTest.java | 60 ------------------ .../src/test/resources/log4j2-test.properties | 41 ------------ pom.xml | 5 +- 12 files changed, 10 insertions(+), 298 deletions(-) delete mode 100644 near-java-api-helper/pom.xml delete mode 100644 near-java-api-helper/src/main/java/com/syntifi/near/api/helper/json/deserializer/NearValueDeserializer.java delete mode 100644 near-java-api-helper/src/main/java/com/syntifi/near/api/helper/model/NearValue.java delete mode 100644 near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearHelperService.java delete mode 100644 near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/exception/NearHelperServiceException.java delete mode 100644 near-java-api-helper/src/main/resources/.gitkeep delete mode 100644 near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceHelper.java delete mode 100644 near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceTest.java delete mode 100644 near-java-api-helper/src/test/resources/log4j2-test.properties diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 6256af4c..a7b00c36 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,11 +7,13 @@ - + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 39a59868..4a175a1f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,11 @@ + diff --git a/near-java-api-helper/pom.xml b/near-java-api-helper/pom.xml deleted file mode 100644 index 6a9b7a89..00000000 --- a/near-java-api-helper/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - near-java-api - com.syntifi.near - 0.2.0-SNAPSHOT - - 4.0.0 - - near-java-api-helper - - - - com.syntifi.near - near-java-api-common - 0.2.0-SNAPSHOT - - - com.squareup.retrofit2 - converter-jackson - ${retrofit2.version} - - - com.squareup.retrofit2 - retrofit - ${retrofit2.version} - - - - \ No newline at end of file diff --git a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/json/deserializer/NearValueDeserializer.java b/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/json/deserializer/NearValueDeserializer.java deleted file mode 100644 index f1c93752..00000000 --- a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/json/deserializer/NearValueDeserializer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.syntifi.near.api.helper.json.deserializer; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.syntifi.near.api.helper.model.NearValue; - -import java.io.IOException; - -/** - * Custom serializer for near fiat value - * - * @author Alexandre Carvalho - * @author Andre Bertolace - * @since 0.2.0 - */ -public class NearValueDeserializer extends JsonDeserializer { - public NearValue deserialize(JsonParser p, DeserializationContext ctxt) - throws IOException { - JsonNode node = p.getCodec().readTree(p); - node = node.get("near"); - - return NearValue.builder() - .usDollars(node.get("usd").floatValue()) - .euros(node.get("eur").floatValue()) - .chineseYuan(node.get("cny").floatValue()) - .lastUpdatedAt(node.get("last_updated_at").asLong()) - .build(); - } -} \ No newline at end of file diff --git a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/model/NearValue.java b/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/model/NearValue.java deleted file mode 100644 index cc1df0db..00000000 --- a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/model/NearValue.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.syntifi.near.api.helper.model; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.syntifi.near.api.helper.json.deserializer.NearValueDeserializer; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * NearValue - * - * @author Alexandre Carvalho - * @author Andre Bertolace - * @since 0.2.0 - */ -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonDeserialize(using = NearValueDeserializer.class) -public class NearValue { - @JsonProperty("usd") - private float usDollars; - @JsonProperty("eur") - private float euros; - @JsonProperty("cny") - private float chineseYuan; - @JsonProperty("last_updated_at") - private long lastUpdatedAt; -} diff --git a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearHelperService.java b/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearHelperService.java deleted file mode 100644 index 6821ab92..00000000 --- a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearHelperService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.syntifi.near.api.helper.service; - -import com.syntifi.near.api.common.service.NearObjectMapper; -import com.syntifi.near.api.helper.model.NearValue; -import okhttp3.Headers; -import okhttp3.OkHttpClient; -import retrofit2.Call; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import retrofit2.http.GET; -import retrofit2.http.Path; - -import java.util.List; - -/** - * Near Helper service uses the http helper API to retrieve useful data - * - * @author Alexandre Carvalho - * @author Andre Bertolace - * @since 0.2.0 - */ -public interface NearHelperService { - - /** - * Fetches the value of near in fiat currency - * - * @return the Near fiat value - */ - @GET("/fiat") - Call getNearValue(); - - /** - * Fetches a list of accounts for a given public key - * - * @param publicKey the account public key - * @return list containing all account ids - */ - @GET("publicKey/{publicKey}/accounts") - Call> getNearAccounts(@Path("publicKey") String publicKey); - - /** - * NearHelperService builder - * - * @param url the helper url to connect to - * @return the helper service instance - */ - static NearHelperService usingPeer(String url) { - Headers customHeaders = new Headers.Builder() - .add("Content-Type", "application/json") - .add("Cache-Control", "no-cache") - .build(); - - Retrofit retrofit = new Retrofit.Builder() - .client(new OkHttpClient.Builder() - .addInterceptor( - chain -> chain.proceed(chain.request().newBuilder().headers(customHeaders).build())).build()) - .baseUrl("https://" + url) - .addConverterFactory(JacksonConverterFactory.create(NearObjectMapper.INSTANCE)) - .build(); - - return retrofit.create(NearHelperService.class); - } -} diff --git a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/exception/NearHelperServiceException.java b/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/exception/NearHelperServiceException.java deleted file mode 100644 index 1c6f5fce..00000000 --- a/near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/exception/NearHelperServiceException.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.syntifi.near.api.helper.service.exception; - - -/** - * Thrown on Near helper service error - * - * @author Alexandre Carvalho - * @author Andre Bertolace - * @since 0.2.0 - */ -public class NearHelperServiceException extends RuntimeException{ - public NearHelperServiceException(String message) { - super(message); - } -} diff --git a/near-java-api-helper/src/main/resources/.gitkeep b/near-java-api-helper/src/main/resources/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceHelper.java b/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceHelper.java deleted file mode 100644 index 7245834d..00000000 --- a/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceHelper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.syntifi.near.api.helper.service; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class NearHelperServiceHelper { - - private static final Logger LOGGER = LoggerFactory.getLogger(NearHelperServiceHelper.class); - - public static NearHelperService nearHelperService; - - static { - String peerAddress = "helper.testnet.near.org"; - - LOGGER.debug("======== Running tests with helper {} ========", peerAddress); - nearHelperService = NearHelperService.usingPeer(peerAddress); - } -} diff --git a/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceTest.java b/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceTest.java deleted file mode 100644 index 01bdcdb9..00000000 --- a/near-java-api-helper/src/test/java/com/syntifi/near/api/helper/service/NearHelperServiceTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.syntifi.near.api.helper.service; - -import com.syntifi.near.api.helper.model.NearValue; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import retrofit2.Response; - -import java.io.IOException; -import java.util.List; - -import static com.syntifi.near.api.helper.service.NearHelperServiceHelper.nearHelperService; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -/** - * Basic Service call testing - * - * @author Alexandre Carvalho - * @author Andre Bertolace - * @since 0.0.1 - */ -public class NearHelperServiceTest { - - private static final Logger LOGGER = LoggerFactory.getLogger(NearHelperServiceTest.class); - - @Test - void getNearValue_valid() throws IOException { - Response value = nearHelperService.getNearValue().execute(); - - assertTrue(value.isSuccessful()); - - NearValue nearValue = value.body(); - - assertNotNull(nearValue); - - LOGGER.debug("Response {}", nearValue.getUsDollars()); - LOGGER.debug("Response {}", nearValue.getEuros()); - LOGGER.debug("Response {}", nearValue.getChineseYuan()); - LOGGER.debug("Response {}", nearValue.getLastUpdatedAt()); - - assertNotNull(nearValue); - } - - @Test - void getNearAccounts_valid() throws IOException { - Response> value = nearHelperService.getNearAccounts("ed25519:F8jARHGZdHqnwrxrnv1pFVzzirXZR2vJzeYbvwQbxZyP").execute(); - - assertTrue(value.isSuccessful()); - - List nearAccounts = value.body(); - - assertNotNull(nearAccounts); - - assertEquals(1, nearAccounts.size()); - - assertEquals("syntifi-alice.testnet", nearAccounts.get(0)); - } -} \ No newline at end of file diff --git a/near-java-api-helper/src/test/resources/log4j2-test.properties b/near-java-api-helper/src/test/resources/log4j2-test.properties deleted file mode 100644 index 191afc4d..00000000 --- a/near-java-api-helper/src/test/resources/log4j2-test.properties +++ /dev/null @@ -1,41 +0,0 @@ -status = info -dest = out -name = NearJavaApi - -# property.filename = target/rolling/rollingtest.log - -filter.threshold.type = ThresholdFilter -filter.threshold.level = trace - -appender.console.type = Console -appender.console.name = STDOUT -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %m%n -appender.console.filter.threshold.type = ThresholdFilter -appender.console.filter.threshold.level = debug - -# appender.rolling.type = RollingFile -# appender.rolling.name = RollingFile -# appender.rolling.fileName = ${filename} -# appender.rolling.filePattern = target/rolling2/test1-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz -# appender.rolling.layout.type = PatternLayout -# appender.rolling.layout.pattern = %d %p %C{1.} [%t] %m%n -# appender.rolling.policies.type = Policies -# appender.rolling.policies.time.type = TimeBasedTriggeringPolicy -# appender.rolling.policies.time.interval = 2 -# appender.rolling.policies.time.modulate = true -# appender.rolling.policies.size.type = SizeBasedTriggeringPolicy -# appender.rolling.policies.size.size=100MB -# appender.rolling.strategy.type = DefaultRolloverStrategy -# appender.rolling.strategy.max = 5 - -# logger.rolling.name = com.example.my.app -# logger.rolling.level = debug -# logger.rolling.additivity = false -# logger.rolling.appenderRef.rolling.ref = RollingFile - -rootLogger.level = info -rootLogger.appenderRef.stdout.ref = STDOUT - -logger.tests.name = com.syntifi.near.api -logger.tests.level = debug \ No newline at end of file diff --git a/pom.xml b/pom.xml index e93546d8..8dddd48a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,6 @@ near-java-api-rpc - near-java-api-helper near-java-api-indexer near-java-api-common @@ -59,8 +58,8 @@ 1.18.24 1.6.1-oak 2.9.0 - 2.13.2 - 2.13.2.2 + 2.13.3 + 2.13.3 5.8.2 1.5.0 0.1.0