diff --git a/build.gradle b/build.gradle index 7b10c14..001bb2d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,10 @@ plugins { id 'ca.architecture' + // Without it every gRPC leaf's jar is versioned 0.0.1-SNAPSHOT, because JavaConventionsPlugin + // falls back to that when the root has no ReleaseProvenanceExtension — so one commit produced + // two artifact sets under two different version schemes, and only one of them could be traced + // back to a revision. + id 'ca.release-provenance' } ext.sourceRevision = providers.gradleProperty('gitRevision') @@ -32,3 +37,17 @@ tasks.register('ci') { dependsOn tasks.named('qualityCheck') dependsOn tasks.named('verifyCleanArchitectureDependencies') } + +// A strict integration lane that no workflow invokes is not coverage; it is a file that looks like +// coverage. `grpc-operation-ledger-jpa` declares a Testcontainers PostgreSQL lane that certifies the +// atomic `INSERT ... ON CONFLICT DO NOTHING` claim the whole durable-idempotency contract rests on, +// and until this aggregate existed `ci` reached `checkAll`, `qualityCheck` and the dependency +// verifier only — none of which runs a lane whose category is INTEGRATION. +// +// Kept out of `ci`: every lane here starts a container, and `ci` is the per-PR gate for this build. +// The caller is integration-main.yml, the stage that owns container-backed lanes. +tasks.register('integrationCheck') { + group = 'verification' + description = 'Runs every optional-platform leaf integration test lane. Needs a container runtime.' + dependsOn subprojects.findAll { it.childProjects.isEmpty() }.collect { "${it.path}:integrationTestLaneCheck" } +} diff --git a/grpc-advanced/grpc-advanced-compat/src/main/java/dev/caskeleton/grpc/advanced/reactor/ReactiveGrpcServerAdapter.java b/grpc-advanced/grpc-advanced-compat/src/main/java/dev/caskeleton/grpc/advanced/reactor/ReactiveGrpcServerAdapter.java index 189832b..3c656bc 100644 --- a/grpc-advanced/grpc-advanced-compat/src/main/java/dev/caskeleton/grpc/advanced/reactor/ReactiveGrpcServerAdapter.java +++ b/grpc-advanced/grpc-advanced-compat/src/main/java/dev/caskeleton/grpc/advanced/reactor/ReactiveGrpcServerAdapter.java @@ -1,7 +1,7 @@ package dev.caskeleton.grpc.advanced.reactor; -import dev.caskeleton.grpc.context.GrpcContextSnapshot; import dev.caskeleton.grpc.api.context.GrpcRequestContext; +import dev.caskeleton.grpc.context.GrpcContextSnapshot; import java.util.function.BiFunction; import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; diff --git a/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcIntegrationBridgePolicyTest.java b/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcIntegrationBridgePolicyTest.java index 2e1041c..5474b67 100644 --- a/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcIntegrationBridgePolicyTest.java +++ b/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcIntegrationBridgePolicyTest.java @@ -10,11 +10,11 @@ import dev.caskeleton.grpc.api.context.GrpcClientIdentity; import dev.caskeleton.grpc.api.context.GrpcMetadataBudget; import dev.caskeleton.grpc.api.context.GrpcMetadataKey; import dev.caskeleton.grpc.api.context.GrpcRequestContext; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; import java.util.Map; import java.util.Set; diff --git a/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcKotlinCompatibilityGateTest.java b/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcKotlinCompatibilityGateTest.java index 47a5dfe..281aa54 100644 --- a/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcKotlinCompatibilityGateTest.java +++ b/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcKotlinCompatibilityGateTest.java @@ -6,9 +6,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import dev.caskeleton.grpc.advanced.kotlin.GrpcCoroutineContextBridge; import dev.caskeleton.grpc.advanced.kotlin.GrpcKotlinCompatibilityGate; import dev.caskeleton.grpc.advanced.kotlin.GrpcKotlinProfile; +import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.deadline.GrpcCancellationCoordinator; import dev.caskeleton.grpc.deadline.GrpcCancellationReason; -import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import java.time.Instant; import java.util.concurrent.atomic.AtomicBoolean; import org.junit.jupiter.api.DisplayName; diff --git a/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcReactorContextBridgeTest.java b/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcReactorContextBridgeTest.java index 835811e..fcc3059 100644 --- a/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcReactorContextBridgeTest.java +++ b/grpc-advanced/grpc-advanced-compat/src/test/java/dev/caskeleton/grpc/advanced/compat/GrpcReactorContextBridgeTest.java @@ -6,16 +6,16 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import dev.caskeleton.grpc.advanced.reactor.GrpcReactorCancellationBridge; import dev.caskeleton.grpc.advanced.reactor.GrpcReactorContextBridge; import dev.caskeleton.grpc.api.context.GrpcClientIdentity; -import dev.caskeleton.grpc.context.GrpcContextSnapshot; import dev.caskeleton.grpc.api.context.GrpcMetadataBudget; import dev.caskeleton.grpc.api.context.GrpcRequestContext; +import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; +import dev.caskeleton.grpc.context.GrpcContextSnapshot; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.deadline.GrpcCancellationCoordinator; import dev.caskeleton.grpc.deadline.GrpcCancellationReason; -import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import java.time.Duration; import java.time.Instant; import java.util.Map; diff --git a/grpc-advanced/grpc-advanced-diagnostics/src/main/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactor.java b/grpc-advanced/grpc-advanced-diagnostics/src/main/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactor.java index 7493576..86a142e 100644 --- a/grpc-advanced/grpc-advanced-diagnostics/src/main/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactor.java +++ b/grpc-advanced/grpc-advanced-diagnostics/src/main/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactor.java @@ -30,6 +30,18 @@ public final class GrpcDiagnosticsRedactor { private static final Pattern IPV4_WITH_PORT = Pattern.compile("\\b(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})(:\\d{1,5})?\\b"); + /** + * The forms {@link #maskAddress} produces, so masking one of them again returns it unchanged. + * + *

{@code GrpcChannelDiagnosticsSnapshot} decides whether an address is masked by masking it + * and comparing — the only test available to it, since a masked address carries no marker. That + * works only if masking is idempotent, and it was not: {@code 10.4.x.x} has no four numeric + * octets, so it fell through to the hash branch and came back as {@code masked:}. A + * snapshot built from correctly masked addresses was therefore rejected as unmasked. + */ + private static final Pattern ALREADY_MASKED = + Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.x\\.x|masked:[0-9a-f]{16}|unknown"); + private GrpcDiagnosticsRedactor() {} /** Whether a field name may appear in a snapshot at all. */ @@ -42,11 +54,17 @@ public final class GrpcDiagnosticsRedactor { * *

The last two octets go; the first two stay, because "which subnet" is a real diagnostic * question and "which host" is not one the diagnostics endpoint should answer. + * + *

Idempotent: masking an already-masked address returns it. Callers rely on that to ask "is + * this masked?" without a marker byte. */ public static String maskAddress(String address) { if (address == null || address.isBlank()) { return "unknown"; } + if (ALREADY_MASKED.matcher(address).matches()) { + return address; + } var matcher = IPV4_WITH_PORT.matcher(address); if (matcher.find()) { return matcher.replaceAll( diff --git a/grpc-advanced/grpc-advanced-diagnostics/src/test/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactorIdempotenceTest.java b/grpc-advanced/grpc-advanced-diagnostics/src/test/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactorIdempotenceTest.java new file mode 100644 index 0000000..b6e0deb --- /dev/null +++ b/grpc-advanced/grpc-advanced-diagnostics/src/test/java/dev/caskeleton/grpc/advanced/diagnostics/GrpcDiagnosticsRedactorIdempotenceTest.java @@ -0,0 +1,52 @@ +package dev.caskeleton.grpc.advanced.diagnostics; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** + * Masking an address twice gives the same answer as masking it once. + * + *

Not a style preference. {@code GrpcChannelDiagnosticsSnapshot} decides whether an address is + * masked by masking it and comparing, because a masked address carries no marker to look for — so + * the only way that question has an answer is if masking is idempotent. It was not: {@code + * 10.4.x.x} has no four numeric octets, fell through to the hash branch, and came back as {@code + * masked:}, which made a snapshot assembled from correctly masked addresses fail its own + * admission check. The property is asserted here, next to the function that has to hold it. + */ +class GrpcDiagnosticsRedactorIdempotenceTest { + + @Test + @DisplayName("masking a masked IPv4 address returns it unchanged") + void maskingAMaskedIpv4AddressIsANoOp() { + String masked = GrpcDiagnosticsRedactor.maskAddress("10.4.7.19:8443"); + + assertThat(masked).isEqualTo("10.4.x.x"); + assertThat(GrpcDiagnosticsRedactor.maskAddress(masked)).isEqualTo(masked); + } + + @Test + @DisplayName("masking a masked non-IPv4 address returns it unchanged") + void maskingAMaskedOpaqueAddressIsANoOp() { + String masked = GrpcDiagnosticsRedactor.maskAddress("unix:///var/run/grpc.sock"); + + assertThat(masked).startsWith("masked:"); + assertThat(GrpcDiagnosticsRedactor.maskAddress(masked)).isEqualTo(masked); + } + + @Test + @DisplayName("the placeholder for an absent address is its own mask") + void theUnknownPlaceholderIsStable() { + assertThat(GrpcDiagnosticsRedactor.maskAddress("")).isEqualTo("unknown"); + assertThat(GrpcDiagnosticsRedactor.maskAddress("unknown")).isEqualTo("unknown"); + } + + @Test + @DisplayName("an address that only looks masked is still masked") + void anAddressThatMerelyResemblesTheMaskIsStillMasked() { + // `x.x` is the mask's own suffix, so a value ending in it must not be waved through unless the + // whole value is a mask — otherwise "10.4.7.19 x.x" would be accepted as already redacted. + assertThat(GrpcDiagnosticsRedactor.maskAddress("10.4.7.19 x.x")).isNotEqualTo("10.4.7.19 x.x"); + } +} diff --git a/grpc-advanced/grpc-advanced-resilience/src/main/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibility.java b/grpc-advanced/grpc-advanced-resilience/src/main/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibility.java index 9131adc..f9ecc17 100644 --- a/grpc-advanced/grpc-advanced-resilience/src/main/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibility.java +++ b/grpc-advanced/grpc-advanced-resilience/src/main/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibility.java @@ -1,8 +1,8 @@ package dev.caskeleton.grpc.advanced.resilience; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; +import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.resilience.GrpcRetryOwner; import java.util.Optional; diff --git a/grpc-advanced/grpc-advanced-resilience/src/test/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibilityTest.java b/grpc-advanced/grpc-advanced-resilience/src/test/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibilityTest.java index f26115b..c0350c4 100644 --- a/grpc-advanced/grpc-advanced-resilience/src/test/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibilityTest.java +++ b/grpc-advanced/grpc-advanced-resilience/src/test/java/dev/caskeleton/grpc/advanced/resilience/GrpcHedgingEligibilityTest.java @@ -3,12 +3,12 @@ package dev.caskeleton.grpc.advanced.resilience; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.resilience.GrpcRetryOwner; import java.time.Duration; import org.junit.jupiter.api.DisplayName; diff --git a/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcClientCallContext.java b/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcClientCallContext.java index 0c21026..78e37d8 100644 --- a/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcClientCallContext.java +++ b/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcClientCallContext.java @@ -1,8 +1,8 @@ package dev.caskeleton.grpc.client; import dev.caskeleton.grpc.api.context.GrpcMetadataKey; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.time.Instant; import java.util.Map; import java.util.Optional; diff --git a/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcStubPolicyApplier.java b/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcStubPolicyApplier.java index 4625d3d..467d8fa 100644 --- a/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcStubPolicyApplier.java +++ b/grpc/grpc-client/src/main/java/dev/caskeleton/grpc/client/GrpcStubPolicyApplier.java @@ -1,10 +1,10 @@ package dev.caskeleton.grpc.client; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; -import dev.caskeleton.grpc.deadline.GrpcDeadlineCalculator; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.deadline.GrpcDeadlineCalculator; import dev.caskeleton.grpc.resilience.GrpcWaitForReadyDecision; import dev.caskeleton.grpc.resilience.GrpcWaitForReadyProfile; import dev.caskeleton.grpc.resilience.GrpcWaitForReadyValidator; diff --git a/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcClientMetadataPolicyTest.java b/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcClientMetadataPolicyTest.java index 1cb2cf1..1d663b9 100644 --- a/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcClientMetadataPolicyTest.java +++ b/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcClientMetadataPolicyTest.java @@ -5,10 +5,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import dev.caskeleton.grpc.api.context.GrpcMetadataBudget; import dev.caskeleton.grpc.api.context.GrpcMetadataKey; -import dev.caskeleton.grpc.core.GrpcChannelProfileName; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; +import dev.caskeleton.grpc.core.GrpcChannelProfileName; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.time.Duration; import java.time.Instant; import java.util.LinkedHashMap; diff --git a/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcTypedStubFactoryTest.java b/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcTypedStubFactoryTest.java index 1ab4a99..8203a61 100644 --- a/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcTypedStubFactoryTest.java +++ b/grpc/grpc-client/src/test/java/dev/caskeleton/grpc/client/GrpcTypedStubFactoryTest.java @@ -3,11 +3,11 @@ package dev.caskeleton.grpc.client; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcChannelProfileName; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.core.GrpcChannelProfileName; +import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.resilience.GrpcWaitForReadyProfile; import java.time.Duration; import java.time.Instant; diff --git a/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/context/GrpcRequestContext.java b/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/context/GrpcRequestContext.java index d42a3a5..4be7906 100644 --- a/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/context/GrpcRequestContext.java +++ b/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/context/GrpcRequestContext.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.api.context; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; diff --git a/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicy.java b/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicy.java index 3002e05..019a69d 100644 --- a/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicy.java +++ b/grpc/grpc-core-api/src/main/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicy.java @@ -1,8 +1,8 @@ package dev.caskeleton.grpc.api.policy; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; /** * Everything the platform decides per method, in one immutable value. diff --git a/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/context/GrpcMetadataBudgetTest.java b/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/context/GrpcMetadataBudgetTest.java index dba71e3..4a4851d 100644 --- a/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/context/GrpcMetadataBudgetTest.java +++ b/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/context/GrpcMetadataBudgetTest.java @@ -3,11 +3,11 @@ package dev.caskeleton.grpc.api.context; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; import java.util.LinkedHashMap; import java.util.Map; diff --git a/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicyCatalogTest.java b/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicyCatalogTest.java index 213048f..fc52643 100644 --- a/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicyCatalogTest.java +++ b/grpc/grpc-core-api/src/test/java/dev/caskeleton/grpc/api/policy/GrpcMethodPolicyCatalogTest.java @@ -3,9 +3,9 @@ package dev.caskeleton.grpc.api.policy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.DisplayName; diff --git a/grpc/grpc-observability/src/main/java/dev/caskeleton/grpc/observability/GrpcRpcObservation.java b/grpc/grpc-observability/src/main/java/dev/caskeleton/grpc/observability/GrpcRpcObservation.java index 0aad833..d305c2e 100644 --- a/grpc/grpc-observability/src/main/java/dev/caskeleton/grpc/observability/GrpcRpcObservation.java +++ b/grpc/grpc-observability/src/main/java/dev/caskeleton/grpc/observability/GrpcRpcObservation.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.observability; +import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import java.time.Duration; import java.util.LinkedHashMap; import java.util.Map; diff --git a/grpc/grpc-observability/src/test/java/dev/caskeleton/grpc/observability/GrpcMetricCardinalityPolicyTest.java b/grpc/grpc-observability/src/test/java/dev/caskeleton/grpc/observability/GrpcMetricCardinalityPolicyTest.java index 9b58357..f8231bd 100644 --- a/grpc/grpc-observability/src/test/java/dev/caskeleton/grpc/observability/GrpcMetricCardinalityPolicyTest.java +++ b/grpc/grpc-observability/src/test/java/dev/caskeleton/grpc/observability/GrpcMetricCardinalityPolicyTest.java @@ -3,10 +3,10 @@ package dev.caskeleton.grpc.observability; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.time.Duration; import java.util.LinkedHashMap; diff --git a/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerEntity.java b/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerEntity.java index 0b50ca5..54e26ab 100644 --- a/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerEntity.java +++ b/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerEntity.java @@ -3,7 +3,6 @@ package dev.caskeleton.grpc.ledger; import dev.caskeleton.grpc.api.ledger.GrpcOperationIdentity; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerRecord; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerState; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/JpaGrpcOperationLedger.java b/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/JpaGrpcOperationLedger.java index aada953..7c03805 100644 --- a/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/JpaGrpcOperationLedger.java +++ b/grpc/grpc-operation-ledger-jpa/src/main/java/dev/caskeleton/grpc/ledger/JpaGrpcOperationLedger.java @@ -3,7 +3,6 @@ package dev.caskeleton.grpc.ledger; import dev.caskeleton.grpc.api.ledger.GrpcOperationIdentity; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedger; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerRecord; - import java.time.Instant; import java.util.Optional; diff --git a/grpc/grpc-operation-ledger-jpa/src/test/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerRepositoryTest.java b/grpc/grpc-operation-ledger-jpa/src/test/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerRepositoryTest.java index ae22807..fba811e 100644 --- a/grpc/grpc-operation-ledger-jpa/src/test/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerRepositoryTest.java +++ b/grpc/grpc-operation-ledger-jpa/src/test/java/dev/caskeleton/grpc/ledger/GrpcOperationLedgerRepositoryTest.java @@ -1,13 +1,12 @@ package dev.caskeleton.grpc.ledger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import dev.caskeleton.grpc.api.ledger.GrpcOperationIdentity; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedger; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerRecord; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerState; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import dev.caskeleton.grpc.core.GrpcMethodName; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/context/GrpcContextSnapshot.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/context/GrpcContextSnapshot.java index 3aa0132..4999676 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/context/GrpcContextSnapshot.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/context/GrpcContextSnapshot.java @@ -2,10 +2,9 @@ package dev.caskeleton.grpc.context; import dev.caskeleton.grpc.api.context.GrpcClientIdentity; import dev.caskeleton.grpc.api.context.GrpcRequestContext; - -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.time.Instant; import java.util.Optional; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinator.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinator.java index 26fe041..2a676ae 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinator.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinator.java @@ -1,7 +1,6 @@ package dev.caskeleton.grpc.deadline; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; - import java.time.Instant; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculator.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculator.java index 6790c71..1fcbad6 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculator.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculator.java @@ -2,9 +2,8 @@ package dev.caskeleton.grpc.deadline; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; - -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; /** diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlinePolicyValidator.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlinePolicyValidator.java index 46ef8ef..8937076 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlinePolicyValidator.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/deadline/GrpcDeadlinePolicyValidator.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.deadline; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcErrorMapper.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcErrorMapper.java index cad9126..8d1dac5 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcErrorMapper.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcErrorMapper.java @@ -3,7 +3,6 @@ package dev.caskeleton.grpc.error; import dev.caskeleton.grpc.api.error.GrpcFailureCategory; import dev.caskeleton.grpc.api.error.GrpcFailureContext; import dev.caskeleton.grpc.api.error.GrpcPlatformException; - import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.validation.GrpcValidationViolation; import io.grpc.Metadata; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcStatusMapping.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcStatusMapping.java index afa001e..cc8b3c3 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcStatusMapping.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/error/GrpcStatusMapping.java @@ -1,7 +1,6 @@ package dev.caskeleton.grpc.error; import dev.caskeleton.grpc.api.error.GrpcFailureCategory; - import dev.caskeleton.grpc.core.GrpcStatusCode; import io.grpc.Status; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptor.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptor.java index 8f1fd51..7307ed4 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptor.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptor.java @@ -1,12 +1,12 @@ package dev.caskeleton.grpc.idempotency; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.ledger.GrpcOperationIdentity; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedger; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerRecord; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerState; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.time.Duration; import java.time.Instant; import java.util.Optional; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcOperationStatusQuery.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcOperationStatusQuery.java index 290c14f..6c65426 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcOperationStatusQuery.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/idempotency/GrpcOperationStatusQuery.java @@ -1,10 +1,10 @@ package dev.caskeleton.grpc.idempotency; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.ledger.GrpcOperationIdentity; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedger; import dev.caskeleton.grpc.api.ledger.GrpcOperationLedgerRecord; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.time.Duration; import java.util.Optional; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryCoordinator.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryCoordinator.java index 43578a9..b967e90 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryCoordinator.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryCoordinator.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.resilience; -import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; -import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; +import dev.caskeleton.grpc.core.GrpcStatusCode; +import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import java.time.Duration; import java.util.random.RandomGenerator; diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibility.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibility.java index 2f9a0c0..b41cc9e 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibility.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibility.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.resilience; -import dev.caskeleton.grpc.core.GrpcStatusCode; -import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; +import dev.caskeleton.grpc.core.GrpcStatusCode; +import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; /** * Whether an attempt may be repeated at all, judged from the method, the evidence and the status diff --git a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidator.java b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidator.java index b19faea..863c49d 100644 --- a/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidator.java +++ b/grpc/grpc-policy/src/main/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidator.java @@ -1,8 +1,8 @@ package dev.caskeleton.grpc.resilience; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/context/GrpcContextBinderTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/context/GrpcContextBinderTest.java index 2a6db44..a97f73c 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/context/GrpcContextBinderTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/context/GrpcContextBinderTest.java @@ -1,17 +1,16 @@ package dev.caskeleton.grpc.context; -import dev.caskeleton.grpc.api.context.GrpcClientIdentity; -import dev.caskeleton.grpc.api.context.GrpcMetadataBudget; -import dev.caskeleton.grpc.api.context.GrpcRequestContext; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; +import dev.caskeleton.grpc.api.context.GrpcClientIdentity; +import dev.caskeleton.grpc.api.context.GrpcMetadataBudget; +import dev.caskeleton.grpc.api.context.GrpcRequestContext; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; import java.time.Instant; import java.util.Map; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinatorTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinatorTest.java index 602e848..c3c27cf 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinatorTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcCancellationCoordinatorTest.java @@ -1,10 +1,9 @@ package dev.caskeleton.grpc.deadline; -import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import java.time.Instant; import java.util.ArrayList; import java.util.List; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculatorTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculatorTest.java index 5260666..b158c98 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculatorTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/deadline/GrpcDeadlineCalculatorTest.java @@ -1,14 +1,13 @@ package dev.caskeleton.grpc.deadline; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.core.GrpcMethodName; import java.time.Duration; import java.util.Map; import java.util.Set; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/error/GrpcErrorMapperTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/error/GrpcErrorMapperTest.java index 134032d..9fc3603 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/error/GrpcErrorMapperTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/error/GrpcErrorMapperTest.java @@ -1,12 +1,11 @@ package dev.caskeleton.grpc.error; +import static org.assertj.core.api.Assertions.assertThat; + import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.api.error.GrpcFailureCategory; import dev.caskeleton.grpc.api.error.GrpcFailureContext; import dev.caskeleton.grpc.api.error.GrpcPlatformException; - -import static org.assertj.core.api.Assertions.assertThat; - import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.core.RpcType; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptorTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptorTest.java index 6bc95db..51b8dea 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptorTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/idempotency/GrpcIdempotencyInterceptorTest.java @@ -3,13 +3,13 @@ package dev.caskeleton.grpc.idempotency; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.DisplayName; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibilityTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibilityTest.java index 419f734..b3c1b95 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibilityTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryEligibilityTest.java @@ -2,18 +2,18 @@ package dev.caskeleton.grpc.resilience; import static org.assertj.core.api.Assertions.assertThat; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; +import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; +import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; +import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; +import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; -import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.evidence.GrpcBusinessEvidence; import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import dev.caskeleton.grpc.evidence.GrpcStreamEvidence; import dev.caskeleton.grpc.evidence.GrpcTransportEvidence; -import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; -import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; -import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; import java.time.Duration; import java.util.random.RandomGenerator; import org.junit.jupiter.api.DisplayName; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidatorTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidatorTest.java index 9c05de4..4eb597d 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidatorTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcRetryOwnershipValidatorTest.java @@ -3,14 +3,14 @@ package dev.caskeleton.grpc.resilience; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.GrpcStatusCode; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.GrpcStatusCode; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; import java.util.Map; import java.util.Set; diff --git a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcWaitForReadyValidatorTest.java b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcWaitForReadyValidatorTest.java index e76baf5..a5bec3b 100644 --- a/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcWaitForReadyValidatorTest.java +++ b/grpc/grpc-policy/src/test/java/dev/caskeleton/grpc/resilience/GrpcWaitForReadyValidatorTest.java @@ -3,13 +3,13 @@ package dev.caskeleton.grpc.resilience; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import java.time.Duration; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/grpc/grpc-server/src/main/java/dev/caskeleton/grpc/server/GrpcServiceAdapter.java b/grpc/grpc-server/src/main/java/dev/caskeleton/grpc/server/GrpcServiceAdapter.java index a851af3..036a62d 100644 --- a/grpc/grpc-server/src/main/java/dev/caskeleton/grpc/server/GrpcServiceAdapter.java +++ b/grpc/grpc-server/src/main/java/dev/caskeleton/grpc/server/GrpcServiceAdapter.java @@ -1,8 +1,8 @@ package dev.caskeleton.grpc.server; import dev.caskeleton.grpc.api.context.GrpcRequestContext; -import dev.caskeleton.grpc.error.GrpcErrorMapper; import dev.caskeleton.grpc.api.error.GrpcPlatformException; +import dev.caskeleton.grpc.error.GrpcErrorMapper; import java.util.function.Function; /** diff --git a/grpc/grpc-server/src/test/java/dev/caskeleton/grpc/server/GrpcServiceAdapterTest.java b/grpc/grpc-server/src/test/java/dev/caskeleton/grpc/server/GrpcServiceAdapterTest.java index c162d6f..997b4a2 100644 --- a/grpc/grpc-server/src/test/java/dev/caskeleton/grpc/server/GrpcServiceAdapterTest.java +++ b/grpc/grpc-server/src/test/java/dev/caskeleton/grpc/server/GrpcServiceAdapterTest.java @@ -6,17 +6,17 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import dev.caskeleton.grpc.api.context.GrpcClientIdentity; import dev.caskeleton.grpc.api.context.GrpcMetadataBudget; import dev.caskeleton.grpc.api.context.GrpcRequestContext; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.GrpcStatusCode; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcCancellationToken; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineBudget; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; -import dev.caskeleton.grpc.error.GrpcErrorMapper; import dev.caskeleton.grpc.api.error.GrpcFailureCategory; import dev.caskeleton.grpc.api.error.GrpcFailureContext; import dev.caskeleton.grpc.api.error.GrpcPlatformException; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.GrpcStatusCode; +import dev.caskeleton.grpc.core.RpcType; +import dev.caskeleton.grpc.error.GrpcErrorMapper; import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import io.grpc.Status; import java.time.Duration; diff --git a/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformAutoConfiguration.java b/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformAutoConfiguration.java index f550d4c..2901f6c 100644 --- a/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformAutoConfiguration.java +++ b/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformAutoConfiguration.java @@ -5,11 +5,11 @@ import dev.caskeleton.grpc.admin.GrpcDrainPolicy; import dev.caskeleton.grpc.admin.GrpcHealthPolicy; import dev.caskeleton.grpc.admin.GrpcReflectionPolicy; import dev.caskeleton.grpc.admin.GrpcServiceHealthRegistry; +import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.client.GrpcNamedChannelProfile; import dev.caskeleton.grpc.context.GrpcContextBinder; import dev.caskeleton.grpc.context.GrpcContextPropagationPolicy; import dev.caskeleton.grpc.error.GrpcErrorMapper; -import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.server.GrpcAdmissionController; import dev.caskeleton.grpc.server.GrpcExecutorProfile; import dev.caskeleton.grpc.server.GrpcServerProfile; diff --git a/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidator.java b/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidator.java index fd3a62e..c72c09a 100644 --- a/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidator.java +++ b/grpc/grpc-spring-boot-starter/src/main/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidator.java @@ -1,14 +1,14 @@ package dev.caskeleton.grpc.boot; import dev.caskeleton.grpc.admin.GrpcReflectionMode; +import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; +import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; +import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.client.GrpcNamedChannelProfile; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStableBuildInvariant; import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.discovery.GrpcDiscoveryPolicyValidator; -import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; -import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; -import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.resilience.GrpcRetryOwner; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/grpc/grpc-spring-boot-starter/src/test/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidatorTest.java b/grpc/grpc-spring-boot-starter/src/test/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidatorTest.java index 5d9ea89..dac26da 100644 --- a/grpc/grpc-spring-boot-starter/src/test/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidatorTest.java +++ b/grpc/grpc-spring-boot-starter/src/test/java/dev/caskeleton/grpc/boot/GrpcPlatformStartupValidatorTest.java @@ -4,14 +4,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import dev.caskeleton.grpc.admin.GrpcReflectionMode; -import dev.caskeleton.grpc.client.GrpcNamedChannelProfile; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.api.policy.WaitForReadyPolicy; +import dev.caskeleton.grpc.client.GrpcNamedChannelProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.RpcType; import dev.caskeleton.grpc.resilience.GrpcRetryOwner; import dev.caskeleton.grpc.security.GrpcTlsProfile; import dev.caskeleton.grpc.server.GrpcServerTransport; diff --git a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContract.java b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContract.java index e039a2b..16ad07f 100644 --- a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContract.java +++ b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContract.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.testkit; +import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.deadline.GrpcDeadlinePolicyValidator; import dev.caskeleton.grpc.deadline.GrpcDependencyBudget; -import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryScenario.java b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryScenario.java index ecb95f0..271cf95 100644 --- a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryScenario.java +++ b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/GrpcUnaryScenario.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.testkit; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.GrpcStatusCode; /** * One unary reliability case: a method shape, a failure, and what must happen next. diff --git a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcFaultScenario.java b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcFaultScenario.java index 42c2138..7d9ea51 100644 --- a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcFaultScenario.java +++ b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcFaultScenario.java @@ -1,8 +1,8 @@ package dev.caskeleton.grpc.testkit.fault; -import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; /** * One fault to inject, and what the client is expected to conclude from it. diff --git a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcTransportEvidenceClassifier.java b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcTransportEvidenceClassifier.java index 9886898..5a5ed20 100644 --- a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcTransportEvidenceClassifier.java +++ b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/fault/GrpcTransportEvidenceClassifier.java @@ -1,9 +1,9 @@ package dev.caskeleton.grpc.testkit.fault; +import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.evidence.GrpcBusinessEvidence; import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import dev.caskeleton.grpc.evidence.GrpcStreamEvidence; diff --git a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/netty/GrpcTlsTestMaterial.java b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/netty/GrpcTlsTestMaterial.java index 355b668..41d368c 100644 --- a/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/netty/GrpcTlsTestMaterial.java +++ b/grpc/grpc-testkit/src/main/java/dev/caskeleton/grpc/testkit/netty/GrpcTlsTestMaterial.java @@ -89,8 +89,7 @@ public final class GrpcTlsTestMaterial implements AutoCloseable { } try { Files.setPosixFilePermissions( - passwordPath, - java.nio.file.attribute.PosixFilePermissions.fromString("rw-------")); + passwordPath, java.nio.file.attribute.PosixFilePermissions.fromString("rw-------")); } catch (UnsupportedOperationException ignored) { // Non-POSIX test hosts still avoid argv disclosure; the whole temp directory is private. } diff --git a/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcPackageOwnershipTest.java b/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcPackageOwnershipTest.java index 4347d1d..22a4835 100644 --- a/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcPackageOwnershipTest.java +++ b/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcPackageOwnershipTest.java @@ -17,8 +17,7 @@ class GrpcPackageOwnershipTest { @Test void corePolicyAndLedgerJpaDoNotSplitAJavaPackageAcrossLeaves() throws Exception { Path repo = repositoryRoot(); - List leaves = - List.of("grpc-core-api", "grpc-policy", "grpc-operation-ledger-jpa"); + List leaves = List.of("grpc-core-api", "grpc-policy", "grpc-operation-ledger-jpa"); Map> owners = new LinkedHashMap<>(); for (String leaf : leaves) { Path source = repo.resolve("src/grpc").resolve(leaf).resolve("src/main/java"); diff --git a/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcTransportEvidenceClassifierTest.java b/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcTransportEvidenceClassifierTest.java index 921bb2a..3b7c224 100644 --- a/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcTransportEvidenceClassifierTest.java +++ b/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcTransportEvidenceClassifierTest.java @@ -3,16 +3,16 @@ package dev.caskeleton.grpc.testkit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; +import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.core.GrpcMethodName; import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.core.RpcType; -import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.error.GrpcStatusMapping; import dev.caskeleton.grpc.evidence.GrpcBusinessEvidence; import dev.caskeleton.grpc.evidence.GrpcExecutionEvidence; import dev.caskeleton.grpc.evidence.GrpcStreamEvidence; import dev.caskeleton.grpc.evidence.GrpcTransportEvidence; -import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; import dev.caskeleton.grpc.testkit.fault.GrpcFaultPoint; import dev.caskeleton.grpc.testkit.fault.GrpcFaultResult; import dev.caskeleton.grpc.testkit.fault.GrpcFaultScenario; diff --git a/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContractTest.java b/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContractTest.java index 3312f98..164ff6f 100644 --- a/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContractTest.java +++ b/grpc/grpc-testkit/src/test/java/dev/caskeleton/grpc/testkit/GrpcUnaryReliabilityContractTest.java @@ -3,14 +3,14 @@ package dev.caskeleton.grpc.testkit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import dev.caskeleton.grpc.core.GrpcMethodName; -import dev.caskeleton.grpc.core.GrpcStatusCode; import dev.caskeleton.grpc.api.deadline.GrpcDeadlineProfile; -import dev.caskeleton.grpc.deadline.GrpcDependencyBudget; import dev.caskeleton.grpc.api.error.GrpcCompletionOutcome; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicy; import dev.caskeleton.grpc.api.policy.GrpcMethodPolicyCatalog; import dev.caskeleton.grpc.api.policy.RpcIdempotencyProfile; +import dev.caskeleton.grpc.core.GrpcMethodName; +import dev.caskeleton.grpc.core.GrpcStatusCode; +import dev.caskeleton.grpc.deadline.GrpcDependencyBudget; import java.time.Duration; import java.util.List; import java.util.Map;