fix errors

anchor-reference-server/src/main/java/org/stellar/anchor/reference/model/RateFeeConverter.java

@@ -1,12 +1,12 @@
 package org.stellar.anchor.reference.model;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import java.lang.reflect.Type;
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 import org.stellar.anchor.api.sep.sep38.RateFee;
 import org.stellar.anchor.util.GsonUtils;
-import shadow.com.google.common.reflect.TypeToken;
 
 @Converter
 public class RateFeeConverter implements AttributeConverter<RateFee, String> {

core/src/main/java/org/stellar/anchor/auth/JwtToken.java

@@ -15,6 +15,7 @@ public JwtToken() {}
   long iat; // Issued At
   long exp; // Expiration Time
   String jti; // JWT ID           // Stellar Transaction ID
+
   // String aud;   // Audience
   // long nbf;     // Not Before
 
@@ -81,7 +82,7 @@ public static JwtToken of(
           token.muxedAccount = sub;
           byte[] pubKeyBytes = muxedAccount.getEd25519().getUint256();
           token.account = KeyPair.fromPublicKey(pubKeyBytes).getAccountId();
-          token.muxedAccountId = muxedAccount.getId().getUint64();
+          token.muxedAccountId = muxedAccount.getId().getUint64().getNumber().longValue();
         } catch (Exception ignored) {
         }
       }

core/src/main/java/org/stellar/anchor/sep10/Sep10Service.java

@@ -322,7 +322,7 @@ String generateSep10Jwt(String challengeXdr, String clientDomain)
             sep10Config.getHomeDomain(),
             getDomainFromURI(appConfig.getHostUrl()));
     debug("challenge:", challenge);
-    long issuedAt = challenge.getTransaction().getTimeBounds().getMinTime();
+    long issuedAt = challenge.getTransaction().getTimeBounds().getMinTime().longValue();
     Memo memo = challenge.getTransaction().getMemo();
     JwtToken jwtToken =
         JwtToken.of(

core/src/test/kotlin/org/stellar/anchor/sep10/Sep10ServiceTest.kt

@@ -1,6 +1,7 @@
 package org.stellar.anchor.sep10
 
 import com.google.common.io.BaseEncoding
+import com.google.gson.annotations.SerializedName
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import java.io.IOException
@@ -47,7 +48,6 @@ import org.stellar.anchor.util.NetUtil
 import org.stellar.sdk.*
 import org.stellar.sdk.requests.ErrorResponse
 import org.stellar.sdk.responses.AccountResponse
-import shadow.com.google.gson.annotations.SerializedName
 
 @Suppress("unused")
 internal class TestSigner(

integration-tests/src/main/kotlin/org/stellar/anchor/platform/Sep12Client.kt

@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform
 
+import com.google.common.reflect.TypeToken
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
@@ -12,7 +13,6 @@ import org.stellar.anchor.api.sep.sep12.Sep12DeleteCustomerRequest
 import org.stellar.anchor.api.sep.sep12.Sep12GetCustomerResponse
 import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerRequest
 import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerResponse
-import shadow.com.google.common.reflect.TypeToken
 
 const val APPLICATION_JSON_CHARSET_UTF_8 = "application/json; charset=utf-8"
 val TYPE_JSON = APPLICATION_JSON_CHARSET_UTF_8.toMediaType()

platform/src/main/java/org/stellar/anchor/platform/callback/RestCustomerIntegration.java

@@ -4,6 +4,7 @@
 import static org.stellar.anchor.platform.callback.PlatformIntegrationHelper.*;
 import static org.stellar.anchor.platform.callback.RestCustomerIntegration.Converter.*;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import java.lang.reflect.Type;
 import java.net.URI;
@@ -24,7 +25,6 @@
 import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerResponse;
 import org.stellar.anchor.auth.AuthHelper;
 import org.stellar.anchor.util.Log;
-import shadow.com.google.common.reflect.TypeToken;
 
 public class RestCustomerIntegration implements CustomerIntegration {
   private final String anchorEndpoint;

platform/src/main/java/org/stellar/anchor/platform/callback/RestFeeIntegration.java

@@ -3,6 +3,7 @@
 import static okhttp3.HttpUrl.get;
 import static org.stellar.anchor.platform.callback.PlatformIntegrationHelper.*;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import java.lang.reflect.Type;
 import java.net.URI;
@@ -19,7 +20,6 @@
 import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.ServerErrorException;
 import org.stellar.anchor.auth.AuthHelper;
-import shadow.com.google.common.reflect.TypeToken;
 
 public class RestFeeIntegration implements FeeIntegration {
   private final String feeIntegrationEndPoint;

platform/src/main/java/org/stellar/anchor/platform/callback/RestRateIntegration.java

@@ -3,6 +3,7 @@
 import static okhttp3.HttpUrl.get;
 import static org.stellar.anchor.platform.callback.PlatformIntegrationHelper.*;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import java.lang.reflect.Type;
 import java.net.URI;
@@ -21,7 +22,6 @@
 import org.stellar.anchor.api.exception.ServerErrorException;
 import org.stellar.anchor.auth.AuthHelper;
 import org.stellar.anchor.util.Log;
-import shadow.com.google.common.reflect.TypeToken;
 
 public class RestRateIntegration implements RateIntegration {
   private final String anchorEndpoint;

platform/src/main/java/org/stellar/anchor/platform/payment/observer/circle/CirclePaymentService.java

@@ -2,6 +2,7 @@
 
 import static org.stellar.anchor.util.StellarNetworkHelper.toStellarNetwork;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.JsonObject;
 import io.netty.handler.codec.http.HttpHeaderNames;
 import java.lang.reflect.Type;
@@ -26,7 +27,6 @@
 import reactor.netty.http.client.HttpClient;
 import reactor.util.annotation.NonNull;
 import reactor.util.annotation.Nullable;
-import shadow.com.google.common.reflect.TypeToken;
 
 public class CirclePaymentService
     implements PaymentService, CircleResponseErrorHandler, StellarReconciliation {

platform/src/main/java/org/stellar/anchor/platform/payment/observer/circle/model/CirclePayment.java

@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.payment.observer.circle.model;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.*;
 import java.lang.reflect.Type;
 import java.time.Instant;
@@ -10,7 +11,6 @@
 import org.stellar.anchor.platform.payment.common.Payment;
 import org.stellar.anchor.platform.payment.common.PaymentNetwork;
 import org.stellar.anchor.util.GsonUtils;
-import shadow.com.google.common.reflect.TypeToken;
 
 @Data
 public class CirclePayment {

platform/src/main/java/org/stellar/anchor/platform/payment/observer/circle/model/CirclePayout.java

@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.payment.observer.circle.model;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.*;
 import com.google.gson.annotations.SerializedName;
 import java.lang.reflect.Type;
@@ -10,7 +11,6 @@
 import org.stellar.anchor.platform.payment.common.Payment;
 import org.stellar.anchor.platform.payment.common.PaymentNetwork;
 import org.stellar.anchor.util.GsonUtils;
-import shadow.com.google.common.reflect.TypeToken;
 
 @Data
 public class CirclePayout {

platform/src/main/java/org/stellar/anchor/platform/payment/observer/circle/model/CircleTransfer.java

@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.payment.observer.circle.model;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.*;
 import java.lang.reflect.Type;
 import java.time.Instant;
@@ -8,7 +9,6 @@
 import org.stellar.anchor.platform.payment.common.Account;
 import org.stellar.anchor.platform.payment.common.Payment;
 import org.stellar.anchor.util.GsonUtils;
-import shadow.com.google.common.reflect.TypeToken;
 
 @Data
 public class CircleTransfer {

platform/src/main/java/org/stellar/anchor/platform/payment/observer/circle/model/CircleWireDepositInstructions.java

@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.payment.observer.circle.model;
 
+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -8,7 +9,6 @@
 import org.stellar.anchor.platform.payment.common.PaymentNetwork;
 import org.stellar.anchor.platform.payment.observer.circle.util.CircleAsset;
 import org.stellar.anchor.util.GsonUtils;
-import shadow.com.google.common.reflect.TypeToken;
 
 @Data
 public class CircleWireDepositInstructions {

platform/src/main/java/org/stellar/anchor/platform/payment/observer/stellar/StellarPaymentObserver.java

@@ -43,20 +43,23 @@
 import org.stellar.sdk.responses.operations.OperationResponse;
 import org.stellar.sdk.responses.operations.PathPaymentBaseOperationResponse;
 import org.stellar.sdk.responses.operations.PaymentOperationResponse;
-import shadow.com.google.common.base.Optional;
 
 public class StellarPaymentObserver implements HealthCheckable {
   /** The maximum number of results the Stellar Blockchain can return. */
   private static final int MAX_RESULTS = 200;
+
   /** The minimum number of results the Stellar Blockchain can return. */
   private static final int MIN_RESULTS = 1;
+
   /**
    * If the observer had been silent for longer than SILENC_TIMEOUT, a SilenceTimeoutException will
    * be thrown to trigger reconnections.
    */
   private static final long SILENCE_TIMEOUT = 90;
+
   /** If the observer has more than 2 SILENCE_TIMEOUT_RETRIES, it will be marked unhealthy */
   private static final long SILENCE_TIMEOUT_RETRIES = 2;
+
   /** The time interval between silence checks */
   private static final long SILENCE_CHECK_INTERVAL = 5;
 
@@ -165,14 +168,15 @@ public void onEvent(OperationResponse operationResponse) {
           }
 
           @Override
-          public void onFailure(Optional<Throwable> exception, Optional<Integer> statusCode) {
-            handleFailure(exception);
+          public void onFailure(
+              java.util.Optional<Throwable> error, java.util.Optional<Integer> responseCode) {
+            handleFailure(error);
           }
         });
   }
 
   private void updateReceivedMetrics(OperationResponse operationResponse) {
-    if (metricLatestBlockReceived == null) {
+    if (metricLatestBlockReceived == null && operationResponse.getTransaction().isPresent()) {
       metricLatestBlockReceived =
           new AtomicLong(operationResponse.getTransaction().get().getLedger());
       Metrics.gauge(
@@ -189,7 +193,7 @@ private void updateReceivedMetrics(OperationResponse operationResponse) {
   }
 
   private void updateProcessedMetrics(OperationResponse operationResponse) {
-    if (metricLatestBlockProcessed == null) {
+    if (metricLatestBlockProcessed == null && operationResponse.getTransaction().isPresent()) {
       metricLatestBlockProcessed =
           new AtomicLong(operationResponse.getTransaction().get().getLedger());
       Metrics.gauge(
@@ -379,11 +383,13 @@ void handleEvent(OperationResponse operationResponse) {
         observedPayment = ObservedPayment.fromPathPaymentOperationResponse(pathPayment);
       }
     } catch (SepException ex) {
-      Log.warn(
-          String.format(
-              "Payment of id %s contains unsupported memo %s.",
-              operationResponse.getId(),
-              operationResponse.getTransaction().get().getMemo().toString()));
+      if (operationResponse.getTransaction().isPresent()) {
+        Log.warn(
+            String.format(
+                "Payment of id %s contains unsupported memo %s.",
+                operationResponse.getId(),
+                operationResponse.getTransaction().get().getMemo().toString()));
+      }
       Log.warnEx(ex);
     }
 
@@ -422,10 +428,8 @@ void handleEvent(OperationResponse operationResponse) {
 
   void handleFailure(Optional<Throwable> exception) {
     // The SSEStreamer has internal errors. We will give up and let the container
-    // manager to
-    // restart.
-    errorEx("stellar payment observer stream error: ", exception.get());
-
+    // manager to restart.
+    exception.ifPresent(throwable -> errorEx("stellar payment observer stream error: ", throwable));
     // Mark the observer unhealthy
     setStatus(STREAM_ERROR);
   }

platform/src/test/kotlin/org/stellar/anchor/paymentservice/circle/CirclePaymentServiceTest.kt

@@ -1,5 +1,6 @@
 package org.stellar.anchor.paymentservice.circle
 
+import com.google.common.reflect.TypeToken
 import com.google.gson.Gson
 import io.mockk.every
 import io.mockk.mockk
@@ -44,7 +45,6 @@ import org.stellar.sdk.Server
 import org.stellar.sdk.responses.Page
 import org.stellar.sdk.responses.operations.OperationResponse
 import reactor.core.publisher.Mono
-import shadow.com.google.common.reflect.TypeToken
 
 class CirclePaymentServiceTest {
   companion object {

platform/src/test/kotlin/org/stellar/anchor/platform/payment/observer/stellar/StellarPaymentObserverTest.kt

@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.payment.observer.stellar
 
+import com.google.common.base.Optional
 import com.google.gson.reflect.TypeToken
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
@@ -17,7 +18,6 @@ import org.stellar.sdk.requests.SSEStream
 import org.stellar.sdk.responses.GsonSingleton
 import org.stellar.sdk.responses.Page
 import org.stellar.sdk.responses.operations.OperationResponse
-import shadow.com.google.common.base.Optional
 
 class StellarPaymentObserverTest {
   companion object {