Merge branch 'signalapp:main' into main

service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeyTransparencyController.java

@@ -151,21 +151,21 @@ public KeyTransparencyMonitorResponse monitor(
     try {
       final AciMonitorRequest aciMonitorRequest = AciMonitorRequest.newBuilder()
           .setAci(ByteString.copyFrom(request.aci().value().toCompactByteArray()))
-          .setEntryPosition(request.aci().entry_position())
+          .setEntryPosition(request.aci().entryPosition())
           .setCommitmentIndex(ByteString.copyFrom(request.aci().commitmentIndex()))
           .build();
 
       final Optional<UsernameHashMonitorRequest> usernameHashMonitorRequest = request.usernameHash().map(usernameHash ->
           UsernameHashMonitorRequest.newBuilder()
               .setUsernameHash(ByteString.copyFrom(usernameHash.value()))
-              .setEntryPosition(usernameHash.entry_position())
+              .setEntryPosition(usernameHash.entryPosition())
               .setCommitmentIndex(ByteString.copyFrom(usernameHash.commitmentIndex()))
               .build());
 
       final Optional<E164MonitorRequest> e164MonitorRequest = request.e164().map(e164 ->
           E164MonitorRequest.newBuilder()
               .setE164(e164.value())
-              .setEntryPosition(e164.entry_position())
+              .setEntryPosition(e164.entryPosition())
               .setCommitmentIndex(ByteString.copyFrom(e164.commitmentIndex()))
               .build());
 

service/src/main/java/org/whispersystems/textsecuregcm/entities/KeyTransparencyMonitorRequest.java

@@ -13,7 +13,6 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
-import java.util.List;
 import java.util.Optional;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.util.ByteArrayAdapter;
@@ -51,7 +50,7 @@ public record AciMonitor(
 
       @Schema(description = "A log tree position maintained by the client for the aci.")
       @Positive
-      long entry_position,
+      long entryPosition,
 
       @Schema(description = "The commitment index derived from a previous search request, encoded in standard unpadded base64")
       @JsonSerialize(using = ByteArrayAdapter.Serializing.class)
@@ -68,7 +67,7 @@ public record E164Monitor(
 
       @Schema(description = "A log tree position maintained by the client for the e164.")
       @Positive
-      long entry_position,
+      long entryPosition,
 
       @Schema(description = "The commitment index derived from a previous search request, encoded in standard unpadded base64")
       @JsonSerialize(using = ByteArrayAdapter.Serializing.class)
@@ -89,7 +88,7 @@ public record UsernameHashMonitor(
 
       @Schema(description = "A log tree position maintained by the client for the username hash.")
       @Positive
-      long entry_position,
+      long entryPosition,
 
       @Schema(description = "The commitment index derived from a previous search request, encoded in standard unpadded base64")
       @JsonSerialize(using = ByteArrayAdapter.Serializing.class)

service/src/main/java/org/whispersystems/textsecuregcm/subscriptions/BraintreeGraphqlClient.java

@@ -94,8 +94,9 @@ CompletableFuture<CreatePayPalOneTimePaymentMutation.CreatePayPalOneTimePayment>
           final CreatePayPalOneTimePaymentMutation.Data data = assertSuccessAndExtractDataFromApolloResponse(apolloResponse);
           if (data.createPayPalOneTimePayment == null) {
             logger.warn(
-                "createPayPalOneTimePayment requestId={} did not have any errors but data was null. response={}",
-                apolloResponse.extensions.getOrDefault("requestId", "<No-Request-Id>"), httpResponse.body());
+                "createPayPalOneTimePayment requestId={} currency={} amount={} did not have any errors but data was null. response={}",
+                apolloResponse.extensions.getOrDefault("requestId", "<No-Request-Id>"),
+                currency, amount, httpResponse.body());
             throw new ServiceUnavailableException();
           }
           return data.createPayPalOneTimePayment;