From 42e8a65bc9c59d3935b05527f154b6fc42e5d110 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Tue, 25 Jul 2023 13:51:19 +1000 Subject: [PATCH] Remove Old Dev UI: Fault tolerance Signed-off-by: Phillip Kruger --- .../FaultToleranceDevConsoleProcessor.java | 15 -- .../resources/dev-templates/embedded.html | 3 - .../dev-templates/ft-operations.html | 157 ------------------ ...ToleranceOperationsDevConsoleSupplier.java | 23 --- 4 files changed, 198 deletions(-) delete mode 100644 extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devconsole/FaultToleranceDevConsoleProcessor.java delete mode 100644 extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/embedded.html delete mode 100644 extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/ft-operations.html delete mode 100644 extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/FaultToleranceOperationsDevConsoleSupplier.java diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devconsole/FaultToleranceDevConsoleProcessor.java b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devconsole/FaultToleranceDevConsoleProcessor.java deleted file mode 100644 index e7dd5e100d5b4..0000000000000 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devconsole/FaultToleranceDevConsoleProcessor.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.quarkus.smallrye.faulttolerance.deployment.devconsole; - -import io.quarkus.deployment.IsDevelopment; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; -import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem; -import io.quarkus.smallrye.faulttolerance.runtime.FaultToleranceOperationsDevConsoleSupplier; - -public class FaultToleranceDevConsoleProcessor { - @BuildStep(onlyIf = IsDevelopment.class) - DevConsoleRuntimeTemplateInfoBuildItem collectInfo(CurateOutcomeBuildItem curateOutcome) { - return new DevConsoleRuntimeTemplateInfoBuildItem("ftOperations", new FaultToleranceOperationsDevConsoleSupplier(), - this.getClass(), curateOutcome); - } -} diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/embedded.html b/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/embedded.html deleted file mode 100644 index 40e9ef05001ba..0000000000000 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/embedded.html +++ /dev/null @@ -1,3 +0,0 @@ - - - Guarded Methods {info:ftOperations.size} diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/ft-operations.html b/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/ft-operations.html deleted file mode 100644 index b5dad1e58494d..0000000000000 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-templates/ft-operations.html +++ /dev/null @@ -1,157 +0,0 @@ -{#include main fluid=true} - {#style} - .annotation { - color: gray; - font-style: italic; - } - span.larger-badge { - font-size: 0.9em; - } - span.app-class { - cursor:pointer; - color:blue; - text-decoration:underline; - } - {/style} - - {#script} - $(document).ready(function(){ - if (!ideKnown()) { - return; - } - $(".class-candidate").each(function() { - var className = $(this).text(); - if (appClassLocation(className)) { - $(this).addClass("app-class"); - } - }); - - $(".app-class").on("click", function() { - openInIDE($(this).text()); - }); - }); - {/script} - - {#title}Guarded Methods{/title} - - {#body} - - - - - - - - - - - {#for ftOperation in info:ftOperations} - - - - - - - {/for} - -
#Bean ClassMethodFault Tolerance Strategies
{ftOperation_count} - {#if ftOperation.beanClass.name.length > 70}{ftOperation.beanClass.name.substring(0,70)}...{#else}{ftOperation.beanClass.name}{/if} - - {ftOperation.methodDescriptor.name}() - -
    - {#if ftOperation.applyFaultTolerance} -
  • - @ApplyFaultTolerance("{ftOperation.applyFaultTolerance.value}") -
    • - {/if} - - {#if ftOperation.asynchronous} -
  • @Asynchronous
    • - {/if} - - {#if ftOperation.asynchronousNonBlocking} -
  • @AsynchronousNonBlocking
    • - {/if} - - {#if ftOperation.blocking} -
  • @Blocking
    • - {/if} - - {#if ftOperation.nonBlocking} -
  • @NonBlocking
    • - {/if} - - {#if ftOperation.bulkhead} -
  • @Bulkhead(value = {ftOperation.bulkhead.value}, - waitingTaskQueue = {ftOperation.bulkhead.waitingTaskQueue})
    • - {/if} - - {#if ftOperation.circuitBreaker} -
  • - @CircuitBreaker(delay = {ftOperation.circuitBreaker.delay} {ftOperation.circuitBreaker.delayUnit.name}, - requestVolumeThreshold = {ftOperation.circuitBreaker.requestVolumeThreshold}, - failureRatio = {ftOperation.circuitBreaker.failureRatio}, - successThreshold = {ftOperation.circuitBreaker.successThreshold}, - failOn = [{#each ftOperation.circuitBreaker.failOn}{it.name}{#if it_hasNext}, {/if}{/each}], - skipOn = [{#each ftOperation.circuitBreaker.skipOn}{it.name}{#if it_hasNext}, {/if}{/each}]) - {#if ftOperation.circuitBreakerName} -
      -
    • @CircuitBreakerName("{ftOperation.circuitBreakerName.value}")
      • -
    - {/if} -
    • - {/if} - - {#if ftOperation.fallback} -
  • - @Fallback(value = {ftOperation.fallback.value.name}, - fallbackMethod = "{ftOperation.fallback.fallbackMethod}", - applyOn = [{#each ftOperation.fallback.applyOn}{it.name}{#if it_hasNext}, {/if}{/each}], - skipOn = [{#each ftOperation.fallback.skipOn}{it.name}{#if it_hasNext}, {/if}{/each}]) -
    • - {/if} - - {#if ftOperation.rateLimit} -
  • - @RateLimit(value = {ftOperation.rateLimit.value}, - window = {ftOperation.rateLimit.window} {ftOperation.rateLimit.windowUnit.name}, - minSpacing = {ftOperation.rateLimit.minSpacing} {ftOperation.rateLimit.minSpacingUnit.name}, - type = {ftOperation.rateLimit.type.name}) -
    • - {/if} - - {#if ftOperation.retry} -
  • - @Retry(maxRetries = {ftOperation.retry.maxRetries}, - delay = {ftOperation.retry.delay} {ftOperation.retry.delayUnit.name}, - maxDuration = {ftOperation.retry.maxDuration} {ftOperation.retry.durationUnit.name}, - jitter = {ftOperation.retry.jitter} {ftOperation.retry.jitterDelayUnit.name}, - retryOn = [{#each ftOperation.retry.retryOn}{it.name}{#if it_hasNext}, {/if}{/each}], - abortOn = [{#each ftOperation.retry.abortOn}{it.name}{#if it_hasNext}, {/if}{/each}]) - {#if ftOperation.exponentialBackoff || ftOperation.fibonacciBackoff || ftOperation.customBackoff} -
      - {#if ftOperation.exponentialBackoff} -
    • @ExponentialBackoff(factor = {ftOperation.exponentialBackoff.factor}, - maxDelay = {ftOperation.exponentialBackoff.maxDelay} {ftOperation.exponentialBackoff.maxDelayUnit.name})
      • - {/if} - {#if ftOperation.fibonacciBackoff} -
    • @FibonacciBackoff(maxDelay = {ftOperation.fibonacciBackoff.maxDelay} {ftOperation.fibonacciBackoff.maxDelayUnit.name})
      • - {/if} - {#if ftOperation.customBackoff} -
    • @CustomBackoff({ftOperation.customBackoff.value.name})
      • - {/if} -
    - {/if} -
    • - {/if} - - {#if ftOperation.timeout} -
  • - @Timeout({ftOperation.timeout.value} {ftOperation.timeout.unit.name}) -
    • - {/if} -
-
- {/body} -{/include} diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/FaultToleranceOperationsDevConsoleSupplier.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/FaultToleranceOperationsDevConsoleSupplier.java deleted file mode 100644 index 71d4898fd8e46..0000000000000 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/FaultToleranceOperationsDevConsoleSupplier.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.quarkus.smallrye.faulttolerance.runtime; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.function.Supplier; - -import io.quarkus.arc.Arc; -import io.smallrye.faulttolerance.config.FaultToleranceOperation; - -public class FaultToleranceOperationsDevConsoleSupplier implements Supplier> { - @Override - public List get() { - QuarkusFaultToleranceOperationProvider provider = Arc.container() - .select(QuarkusFaultToleranceOperationProvider.class).get(); - List operations = new ArrayList<>(provider.getOperationCache().values()); - operations.sort(Comparator.comparing(FaultToleranceOperation::getName)); - for (FaultToleranceOperation operation : operations) { - operation.materialize(); - } - return operations; - } -}