Hidding Impl type

input-output-hk · Oct 26, 2020 · 941cfa3 · 941cfa3
1 parent dce74d0
commit 941cfa3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/src/it/java/iog/psg/cardano/TestMain.java b/src/it/java/iog/psg/cardano/TestMain.java
@@ -1,7 +1,7 @@
 package iog.psg.cardano;
 
 import akka.actor.ActorSystem;
-import iog.psg.cardano.jpi.CardanoApiImpl;
+import iog.psg.cardano.jpi.CardanoApi;
 import iog.psg.cardano.jpi.*;
 import scala.Enumeration;
 
@@ -22,7 +22,7 @@ public static void main(String[] args) throws CardanoApiException, ExecutionExce
                             .withActorSystem(as)
                             .withExecutorService(es);
 
-            CardanoApiImpl api = builder.build();
+            CardanoApi api = builder.build();
             String passphrase = "password10";
             String menmString = "receive post siren monkey mistake morning teach section mention rural idea say offer number ribbon toward rigid pluck begin ticket auto";
             List<String> menmLst = Arrays.asList(menmString.split(" "));

diff --git a/src/main/java/iog/psg/cardano/jpi/CardanoApiBuilder.java b/src/main/java/iog/psg/cardano/jpi/CardanoApiBuilder.java
@@ -67,7 +67,7 @@ public CardanoApiImpl build() {
         } else {
             helpExecute = new HelpExecute(ec, actorSystem) {
                 @Override
-                public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApiImpl.CardanoApiRequest<T> request) throws CardanoApiException {
+                public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApi.CardanoApiRequest<T> request) throws CardanoApiException {
                     return apiRequestExecutor.execute(request);
                 }
             };

diff --git a/src/main/scala/iog/psg/cardano/CardanoApi.scala b/src/main/scala/iog/psg/cardano/CardanoApi.scala
@@ -25,10 +25,11 @@ object CardanoApi {
   def apply(baseUriWithPort: String)(implicit ec: ExecutionContext, as: ActorSystem): CardanoApi =
     new CardanoApiImpl(baseUriWithPort)
 
-  final case class ErrorMessage(message: String, code: String)
+  implicit val defaultMaxWaitTime: FiniteDuration = 15.seconds
 
   type CardanoApiResponse[T] = Either[ErrorMessage, T]
 
+  final case class ErrorMessage(message: String, code: String)
   final case class CardanoApiRequest[T](request: HttpRequest, mapper: HttpResponse => Future[CardanoApiResponse[T]])
 
   object Order extends Enumeration {
@@ -37,8 +38,6 @@ object CardanoApi {
     val descendingOrder = Value("descending")
   }
 
-  implicit val defaultMaxWaitTime: FiniteDuration = 15.seconds
-
   object CardanoApiOps {
 
     implicit class FlattenOp[T](val knot: Future[CardanoApiResponse[Future[CardanoApiResponse[T]]]]) extends AnyVal {

diff --git a/src/test/java/iog/psg/cardano/jpi/CardanoApiFixture.java b/src/test/java/iog/psg/cardano/jpi/CardanoApiFixture.java
@@ -6,11 +6,11 @@
 
 public class CardanoApiFixture {
 
-    public CardanoApiImpl getJpi() {
+    public CardanoApi getJpi() {
         return jpi;
     }
 
-    private final CardanoApiImpl jpi;
+    private final CardanoApi jpi;
 
     private CardanoApiFixture() {
         jpi = null;

diff --git a/src/test/java/iog/psg/cardano/jpi/JpiResponseCheck.java b/src/test/java/iog/psg/cardano/jpi/JpiResponseCheck.java
@@ -15,7 +15,7 @@
 
 public class JpiResponseCheck {
 
-    public final CardanoApiImpl jpi;
+    public final CardanoApi jpi;
     private final long timeout;
     private final TimeUnit timeoutUnit;
 
@@ -25,7 +25,7 @@ private JpiResponseCheck() {
         timeoutUnit = null;
     }
 
-    public JpiResponseCheck(CardanoApiImpl jpi, long timeout, TimeUnit timeoutUnit) {
+    public JpiResponseCheck(CardanoApi jpi, long timeout, TimeUnit timeoutUnit) {
         this.jpi = jpi;
         this.timeoutUnit = timeoutUnit;
         this.timeout = timeout;
@@ -109,11 +109,11 @@ public CardanoApiCodec.CreateTransactionResponse getTx(String walletId, String t
         return jpi.getTransaction(walletId, txId).toCompletableFuture().get(timeout, timeoutUnit);
     }
 
-    public static CardanoApiImpl buildWithPredefinedApiExecutor(iog.psg.cardano.ApiRequestExecutor executor, ActorSystem as) {
+    public static CardanoApi buildWithPredefinedApiExecutor(iog.psg.cardano.ApiRequestExecutor executor, ActorSystem as) {
         CardanoApiBuilder builder = CardanoApiBuilder.create("http://fake:1234/").withApiExecutor(new ApiRequestExecutor() {
             @Override
-            public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApiImpl.CardanoApiRequest<T> request) throws CardanoApiException {
-                Future<Either<iog.psg.cardano.CardanoApiImpl.ErrorMessage, T>> sResponse = executor.execute(request, as.dispatcher(), as);
+            public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApi.CardanoApiRequest<T> request) throws CardanoApiException {
+                Future<Either<iog.psg.cardano.CardanoApi.ErrorMessage, T>> sResponse = executor.execute(request, as.dispatcher(), as);
                 CompletionStage<T> jResponse = toJava(HelpExecute.unwrap(sResponse, as.dispatcher()));
                 return jResponse;
             }
@@ -122,10 +122,10 @@ public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApiImpl.CardanoApiR
         return builder.build();
     }
 
-    public static CardanoApiImpl buildWithDummyApiExecutor() {
+    public static CardanoApi buildWithDummyApiExecutor() {
         CardanoApiBuilder builder = CardanoApiBuilder.create("http://fake/").withApiExecutor(new ApiRequestExecutor() {
             @Override
-            public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApiImpl.CardanoApiRequest<T> request) throws CardanoApiException {
+            public <T> CompletionStage<T> execute(iog.psg.cardano.CardanoApi.CardanoApiRequest<T> request) throws CardanoApiException {
                 CompletableFuture<T> result = new CompletableFuture<>();
 
                 if(request.request().uri().path().endsWith("wallets", true)) {

diff --git a/src/test/scala/iog/psg/cardano/CardanoJpiSpec.scala b/src/test/scala/iog/psg/cardano/CardanoJpiSpec.scala
@@ -4,9 +4,8 @@ import java.time.ZonedDateTime
 import java.util.concurrent.CompletionStage
 
 import akka.actor.ActorSystem
-import iog.psg.cardano.jpi.{AddressFilter, CardanoApiImpl, JpiResponseCheck, ListTransactionsParamBuilder}
+import iog.psg.cardano.jpi.{AddressFilter, JpiResponseCheck, ListTransactionsParamBuilder}
 import iog.psg.cardano.util._
-import org.scalatest.Assertions
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
@@ -211,7 +210,7 @@ class CardanoJpiSpec
     with DummyModel
     with JsonFiles {
     override implicit val as: ActorSystem = getCurrentSpecAS
-    lazy val customApi: CardanoApiImpl = JpiResponseCheck.buildWithPredefinedApiExecutor(inMemoryExecutor, as)
+    lazy val customApi: jpi.CardanoApi = JpiResponseCheck.buildWithPredefinedApiExecutor(inMemoryExecutor, as)
   }
 
 }