diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/CommandSubmissionClient.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/CommandSubmissionClient.java index 61f2b121a6..aa9e1121e9 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/CommandSubmissionClient.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/CommandSubmissionClient.java @@ -5,7 +5,6 @@ package com.daml.ledger.rxjava; import com.daml.ledger.javaapi.data.Command; import com.google.protobuf.Empty; -import com.google.protobuf.Timestamp; import io.reactivex.Single; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/DamlLedgerClient.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/DamlLedgerClient.java index c280aeb3d0..9ef24d4d5c 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/DamlLedgerClient.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/DamlLedgerClient.java @@ -11,9 +11,7 @@ import io.grpc.netty.NettyChannelBuilder; import io.netty.handler.ssl.SslContext; import org.checkerframework.checker.nullness.qual.NonNull; -import java.util.LinkedList; import java.util.Optional; -import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; /** diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/LedgerViewFlowable.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/LedgerViewFlowable.java index 91cd3de183..1d8d97cd99 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/LedgerViewFlowable.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/LedgerViewFlowable.java @@ -3,8 +3,8 @@ package com.daml.ledger.rxjava.components; -import com.daml.ledger.rxjava.components.helpers.*; import com.daml.ledger.javaapi.data.*; +import com.daml.ledger.rxjava.components.helpers.*; import com.google.rpc.Status; import io.reactivex.Flowable; import io.reactivex.Single; diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/CommandsAndPendingSet.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/CommandsAndPendingSet.java index 8ef97d5f79..e21e57c6c0 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/CommandsAndPendingSet.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/CommandsAndPendingSet.java @@ -3,8 +3,8 @@ package com.daml.ledger.rxjava.components.helpers; -import com.daml.ledger.javaapi.data.SubmitCommandsRequest; import com.daml.ledger.javaapi.data.Identifier; +import com.daml.ledger.javaapi.data.SubmitCommandsRequest; import org.checkerframework.checker.nullness.qual.NonNull; import org.pcollections.HashTreePMap; import org.pcollections.PMap; diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/TemplateUtils.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/TemplateUtils.java index 4cadb48fef..4be39a967d 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/TemplateUtils.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/components/helpers/TemplateUtils.java @@ -7,7 +7,7 @@ import com.daml.ledger.javaapi.data.Identifier; import com.daml.ledger.javaapi.data.Record; import com.daml.ledger.javaapi.data.Template; import com.daml.ledger.javaapi.data.Value; -import com.daml.ledger.rxjava.components.helpers.CreatedContract; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandCompletionClientImpl.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandCompletionClientImpl.java index 59eaf46b5b..fbf2d4afc0 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandCompletionClientImpl.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandCompletionClientImpl.java @@ -3,11 +3,11 @@ package com.daml.ledger.rxjava.grpc; -import com.daml.ledger.rxjava.CommandCompletionClient; import com.daml.ledger.javaapi.data.CompletionEndResponse; import com.daml.ledger.javaapi.data.CompletionStreamRequest; import com.daml.ledger.javaapi.data.CompletionStreamResponse; import com.daml.ledger.javaapi.data.LedgerOffset; +import com.daml.ledger.rxjava.CommandCompletionClient; import com.daml.ledger.rxjava.grpc.helpers.StubHelper; import com.daml.ledger.rxjava.util.ClientPublisherFlowable; import com.digitalasset.grpc.adapter.ExecutionSequencerFactory; diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandSubmissionClientImpl.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandSubmissionClientImpl.java index b23a627fe0..dd8035a2ef 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandSubmissionClientImpl.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/CommandSubmissionClientImpl.java @@ -3,9 +3,9 @@ package com.daml.ledger.rxjava.grpc; -import com.daml.ledger.rxjava.CommandSubmissionClient; import com.daml.ledger.javaapi.data.Command; import com.daml.ledger.javaapi.data.SubmitRequest; +import com.daml.ledger.rxjava.CommandSubmissionClient; import com.daml.ledger.rxjava.grpc.helpers.StubHelper; import com.digitalasset.ledger.api.v1.CommandSubmissionServiceGrpc; import com.digitalasset.ledger.api.v1.CommandSubmissionServiceOuterClass; diff --git a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/TransactionClientImpl.java b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/TransactionClientImpl.java index cc9138620e..2a4e057b60 100644 --- a/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/TransactionClientImpl.java +++ b/language-support/java/bindings-rxjava/src/main/java/com/daml/ledger/rxjava/grpc/TransactionClientImpl.java @@ -3,8 +3,8 @@ package com.daml.ledger.rxjava.grpc; -import com.daml.ledger.rxjava.TransactionsClient; import com.daml.ledger.javaapi.data.*; +import com.daml.ledger.rxjava.TransactionsClient; import com.daml.ledger.rxjava.util.ClientPublisherFlowable; import com.digitalasset.grpc.adapter.ExecutionSequencerFactory; import com.digitalasset.ledger.api.v1.TransactionServiceGrpc; diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/DamlLedgerClientTest.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/DamlLedgerClientTest.scala index b4904ef69b..383912523b 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/DamlLedgerClientTest.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/DamlLedgerClientTest.scala @@ -9,7 +9,6 @@ import java.util.concurrent.TimeUnit import com.daml.ledger.javaapi.data.LedgerOffset.Absolute import com.daml.ledger.javaapi.data.{Command, CreateCommand, Identifier, Record} import com.daml.ledger.rxjava.grpc.helpers.{CommandServiceImpl, _} -import com.daml.ledger.testkit.services._ import com.digitalasset.ledger.api.v1.command_completion_service.CompletionStreamResponse import com.digitalasset.ledger.api.v1.command_service.{ SubmitAndWaitForTransactionIdResponse, diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/ContractTransformationTest.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/ContractTransformationTest.scala index c8891df671..13fe9f58bb 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/ContractTransformationTest.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/ContractTransformationTest.scala @@ -3,15 +3,14 @@ package com.daml.ledger.rxjava.components -import com.daml.ledger.javaapi.data.Identifier -import com.daml.ledger.javaapi.data.Party -import com.daml.ledger.javaapi.data.Record -import com.daml.ledger.javaapi.data.Text -import com.daml.ledger.rxjava.components.helpers.CreatedContract -import com.daml.ledger.rxjava.components.helpers.CreatedContractContext -import com.daml.ledger.rxjava.components.helpers.TemplateUtils -import templateutils.{TemplateA, TemplateB, TemplateC} +import com.daml.ledger.javaapi.data.{Identifier, Party, Record, Text} +import com.daml.ledger.rxjava.components.helpers.{ + CreatedContract, + CreatedContractContext, + TemplateUtils +} import org.scalatest.{FlatSpec, Matchers} +import templateutils.{TemplateA, TemplateB, TemplateC} class TestContext extends CreatedContractContext { @Override diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/LedgerViewFlowableSpec.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/LedgerViewFlowableSpec.scala index c74dd48acc..d654d56b0e 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/LedgerViewFlowableSpec.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/LedgerViewFlowableSpec.scala @@ -5,8 +5,8 @@ package com.daml.ledger.rxjava.components import java.util.concurrent.TimeUnit -import com.daml.ledger.rxjava.components.helpers.{CommandsAndPendingSet, CreatedContract} import com.daml.ledger.javaapi.data.{Identifier, LedgerOffset, WorkflowEvent} +import com.daml.ledger.rxjava.components.helpers.{CommandsAndPendingSet, CreatedContract} import io.reactivex.Flowable import org.scalatest.{FlatSpec, Matchers} diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/tests/helpers/DummyLedgerClient.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/tests/helpers/DummyLedgerClient.scala index 1fa167b000..d48d551be1 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/tests/helpers/DummyLedgerClient.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/components/tests/helpers/DummyLedgerClient.scala @@ -6,8 +6,8 @@ package com.daml.ledger.rxjava.components.tests.helpers import java.time.Instant import java.util -import com.daml.ledger.rxjava._ import com.daml.ledger.javaapi.data._ +import com.daml.ledger.rxjava._ import com.google.protobuf.Empty import io.reactivex.{Flowable, Single} import org.slf4j.LoggerFactory diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/TimeClientImplTest.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/TimeClientImplTest.scala index 78aba60c39..cd64088a52 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/TimeClientImplTest.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/TimeClientImplTest.scala @@ -7,13 +7,7 @@ import java.time.Instant import java.util.concurrent.TimeUnit import com.daml.ledger.rxjava.TimeClient -import com.daml.ledger.rxjava.grpc.helpers.{ - AuthMatchers, - DataLayerHelpers, - LedgerServices, - TestConfiguration, - TimeServiceImpl -} +import com.daml.ledger.rxjava.grpc.helpers._ import org.scalatest.{FlatSpec, Matchers, OptionValues} import scala.concurrent.ExecutionContext diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/DataLayerHelpers.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/DataLayerHelpers.scala index dde536b272..69ddca942e 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/DataLayerHelpers.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/DataLayerHelpers.scala @@ -7,8 +7,8 @@ import java.time.Instant import com.daml.ledger.javaapi.data._ import com.digitalasset.ledger.api.v1.active_contracts_service.GetActiveContractsResponse -import com.digitalasset.ledger.api.v1.event.CreatedEvent import com.digitalasset.ledger.api.v1.command_completion_service.CompletionEndResponse +import com.digitalasset.ledger.api.v1.event.CreatedEvent import com.digitalasset.ledger.api.v1.ledger_offset.LedgerOffset import com.digitalasset.ledger.api.v1.ledger_offset.LedgerOffset.Value.Absolute import com.digitalasset.ledger.api.v1.testing.time_service.GetTimeResponse diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerConfigurationServiceImpl.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerConfigurationServiceImpl.scala index d7747629cc..7970eb6ffc 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerConfigurationServiceImpl.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerConfigurationServiceImpl.scala @@ -3,12 +3,12 @@ package com.daml.ledger.rxjava.grpc.helpers +import com.digitalasset.ledger.api.v1.ledger_configuration_service.LedgerConfigurationServiceGrpc.LedgerConfigurationService import com.digitalasset.ledger.api.v1.ledger_configuration_service.{ GetLedgerConfigurationRequest, GetLedgerConfigurationResponse, LedgerConfigurationServiceGrpc } -import com.digitalasset.ledger.api.v1.ledger_configuration_service.LedgerConfigurationServiceGrpc.LedgerConfigurationService import io.grpc.ServerServiceDefinition import io.grpc.stub.StreamObserver diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerIdentityServiceImpl.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerIdentityServiceImpl.scala index c109a0bb25..dd79a4da54 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerIdentityServiceImpl.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/LedgerIdentityServiceImpl.scala @@ -5,12 +5,12 @@ package com.daml.ledger.rxjava.grpc.helpers import com.digitalasset.ledger.api.auth.Authorizer import com.digitalasset.ledger.api.auth.services.LedgerIdentityServiceAuthorization +import com.digitalasset.ledger.api.v1.ledger_identity_service.LedgerIdentityServiceGrpc.LedgerIdentityService import com.digitalasset.ledger.api.v1.ledger_identity_service.{ GetLedgerIdentityRequest, GetLedgerIdentityResponse, LedgerIdentityServiceGrpc } -import com.digitalasset.ledger.api.v1.ledger_identity_service.LedgerIdentityServiceGrpc.LedgerIdentityService import io.grpc.ServerServiceDefinition import scala.concurrent.{ExecutionContext, Future} diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/TimestampComparatorTest.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/TimestampComparatorTest.scala index 95bc63aee4..b11e8d1cdd 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/TimestampComparatorTest.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/helpers/TimestampComparatorTest.scala @@ -5,13 +5,12 @@ package com.daml.ledger.rxjava.grpc.helpers import java.time.Instant +import com.daml.ledger.rxjava.grpc.helpers.Generators._ import com.google.protobuf.Timestamp import org.scalacheck.Gen import org.scalatest.prop.GeneratorDrivenPropertyChecks import org.scalatest.{FlatSpec, Matchers} -import Generators._ - class TimestampComparatorTest extends FlatSpec with Matchers with GeneratorDrivenPropertyChecks { behavior of "TimestampComparator.compare" diff --git a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/package.scala b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/package.scala index ab2199f8ad..7e190d4435 100644 --- a/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/package.scala +++ b/language-support/java/bindings-rxjava/src/test/scala/com/daml/ledger/rxjava/grpc/package.scala @@ -7,16 +7,7 @@ import java.time.Clock import java.util.UUID import com.digitalasset.daml.lf.data.Ref -import com.digitalasset.ledger.api.auth.{ - AuthServiceStatic, - Authorizer, - Claim, - ClaimActAsParty, - ClaimAdmin, - ClaimPublic, - ClaimReadAsParty, - Claims -} +import com.digitalasset.ledger.api.auth._ package object grpc {