Fix(inspect-code): Inverted method

Apicurio · Nov 22, 2024 · f980c87 · f980c87
1 parent 32c4b2f
commit f980c87
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/src/main/java/io/apicurio/registry/systemtests/client/ApicurioRegistryApiClient.java b/src/main/java/io/apicurio/registry/systemtests/client/ApicurioRegistryApiClient.java
@@ -105,7 +105,7 @@ public boolean waitServiceAvailable() {
 
         LOGGER.info("Waiting for API to be ready...");
 
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (isServiceAvailable()) {
                 break;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/framework/ApicurioRegistryUtils.java b/src/main/java/io/apicurio/registry/systemtests/framework/ApicurioRegistryUtils.java
@@ -161,7 +161,7 @@ public static boolean waitApicurioRegistryHostnameReady(ApicurioRegistry apicuri
 
         LOGGER.info("Waiting for hostname of ApicurioRegistry {} to be ready...", info);
 
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (isApicurioRegistryHostnameReady(apicurioRegistry)) {
                 return true;
             }
@@ -220,7 +220,7 @@ public static boolean waitApicurioRegistryReady(ApicurioRegistry apicurioRegistr
         ApicurioRegistryResourceType registryResourceType = new ApicurioRegistryResourceType();
         TimeoutBudget timeoutBudget = TimeoutBudget.ofDuration(registryResourceType.getTimeout());
 
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (registryResourceType.isReady(apicurioRegistry)) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/framework/DeploymentUtils.java b/src/main/java/io/apicurio/registry/systemtests/framework/DeploymentUtils.java
@@ -68,7 +68,7 @@ public static boolean waitDeploymentReady(String namespace, String name) {
     }
 
     public static boolean waitDeploymentReady(String namespace, String name, TimeoutBudget timeoutBudget) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (!Kubernetes.deploymentHasUnavailableReplicas(namespace, name)) {
                 return true;
             }
@@ -100,7 +100,7 @@ public static boolean waitDeploymentHasUnavailableReplicas(
             String name,
             TimeoutBudget timeoutBudget
     ) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (Kubernetes.deploymentHasUnavailableReplicas(namespace, name)) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/framework/KafkaUtils.java b/src/main/java/io/apicurio/registry/systemtests/framework/KafkaUtils.java
@@ -19,7 +19,7 @@ private static boolean waitSecretReady(String namespace, String name) {
     }
 
     private static boolean waitSecretReady(String namespace, String name, TimeoutBudget timeoutBudget) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (Kubernetes.getSecret(namespace, name) != null) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/framework/OperatorUtils.java b/src/main/java/io/apicurio/registry/systemtests/framework/OperatorUtils.java
@@ -57,7 +57,7 @@ public static void downloadFile(String source, Path destination) throws Exceptio
     }
 
     public static boolean waitPodsExist(String namespace, String labelKey, String labelValue, TimeoutBudget timeout) {
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (!Kubernetes.getPods(namespace, labelKey, labelValue).getItems().isEmpty()) {
                 return true;
             }
@@ -112,7 +112,7 @@ private static boolean collectPodsReadiness(PodList podList) {
     }
 
     public static boolean waitPodsReady(String namespace, String labelKey, String labelValue, TimeoutBudget timeout) {
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (collectPodsReadiness(Kubernetes.getPods(namespace, labelKey, labelValue))) {
                 return true;
             }
@@ -143,7 +143,7 @@ public static boolean waitPodsReady(String namespace, String labelKey, String la
     }
 
     public static boolean waitCatalogSourceExists(String namespace, String name, TimeoutBudget timeout) {
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (Kubernetes.getCatalogSource(namespace, name) != null) {
                 return true;
             }
@@ -171,7 +171,7 @@ public static boolean waitCatalogSourceExists(String namespace, String name) {
     }
 
     public static boolean waitCatalogSourceReady(String namespace, String name, TimeoutBudget timeout) {
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (Kubernetes.isCatalogSourceReady(namespace, name)) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/framework/ResourceUtils.java b/src/main/java/io/apicurio/registry/systemtests/framework/ResourceUtils.java
@@ -19,7 +19,7 @@ public static boolean waitStatefulSetReady(String namespace, String name) {
     }
 
     public static boolean waitStatefulSetReady(String namespace, String name, TimeoutBudget timeoutBudget) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (Kubernetes.isStatefulSetReady(namespace, name)) {
                 return true;
             }
@@ -47,7 +47,7 @@ public static boolean waitPackageManifestExists(String catalog, String name) {
     }
 
     public static boolean waitPackageManifestExists(String catalog, String name, TimeoutBudget timeoutBudget) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (Kubernetes.getPackageManifest(catalog, name) != null) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/operator/OperatorManager.java b/src/main/java/io/apicurio/registry/systemtests/operator/OperatorManager.java
@@ -147,7 +147,7 @@ public boolean waitOperatorReady(OperatorType operatorType) {
     }
 
     public boolean waitOperatorReady(OperatorType operatorType, TimeoutBudget timeoutBudget) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (operatorType.isReady()) {
                 return true;
             }
@@ -178,7 +178,7 @@ public boolean waitOperatorRemoved(OperatorType operatorType) {
     }
 
     public boolean waitOperatorRemoved(OperatorType operatorType, TimeoutBudget timeoutBudget) {
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (operatorType.doesNotExist()) {
                 return true;
             }

diff --git a/...java/io/apicurio/registry/systemtests/operator/types/ApicurioRegistryOLMOperatorType.java b/...java/io/apicurio/registry/systemtests/operator/types/ApicurioRegistryOLMOperatorType.java
@@ -182,7 +182,7 @@ public void uninstall() {
     public boolean waitReady() {
         TimeoutBudget timeoutBudget = TimeoutBudget.ofDuration(Duration.ofMinutes(7));
 
-        while (!timeoutBudget.timeoutExpired()) {
+        while (timeoutBudget.timeoutNotExpired()) {
             if (isReady()) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/operator/types/OLMOperator.java b/src/main/java/io/apicurio/registry/systemtests/operator/types/OLMOperator.java
@@ -36,7 +36,7 @@ public boolean waitSubscriptionCurrentCSV(String catalog, TimeoutBudget timeout)
         String subscriptionName = subscription.getMetadata().getName();
         Subscription operatorSubscription = Kubernetes.getSubscription(subscriptionNamespace, subscriptionName);
 
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (operatorSubscription.getStatus().getCurrentCSV().equals(expectedCSV)) {
                 return true;
             }
@@ -60,7 +60,7 @@ public boolean waitSubscriptionCurrentCSV(String catalog) {
     }
 
     public boolean waitClusterServiceVersionReady(TimeoutBudget timeout) {
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             if (Kubernetes.isClusterServiceVersionReady(getNamespace(), getClusterServiceVersion())) {
                 return true;
             }

diff --git a/src/main/java/io/apicurio/registry/systemtests/registryinfra/ResourceManager.java b/src/main/java/io/apicurio/registry/systemtests/registryinfra/ResourceManager.java
@@ -183,7 +183,7 @@ public final <T extends HasMetadata> boolean waitResourceCondition(
 
         T res;
 
-        while (!timeout.timeoutExpired()) {
+        while (timeout.timeoutNotExpired()) {
             res = type.get(resource.getMetadata().getNamespace(), resource.getMetadata().getName());
 
             if (condition.test(res)) {

diff --git a/src/main/java/io/apicurio/registry/systemtests/time/TimeoutBudget.java b/src/main/java/io/apicurio/registry/systemtests/time/TimeoutBudget.java
@@ -45,8 +45,8 @@ public Duration remaining() {
         return Duration.ofMillis(timeLeft());
     }
 
-    public boolean timeoutExpired() {
-        return timeLeft() < 0;
+    public boolean timeoutNotExpired() {
+        return timeLeft() >= 0;
     }
 
     public long timeSpent() {