Merge pull request #41731 from dk2k/dk2k_malformed_format

BugFix Fixed mismatched number of args in string formats
quarkusio · Aug 7, 2024 · 7e21779 · 7e21779
2 parents b3e6085 + c2b6b86
commit 7e21779
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java b/docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java
@@ -85,7 +85,7 @@ public CheckCrossReferences(Path srcDir, Path referenceIndexPath)
 
         if (!Files.exists(referenceIndexPath) || !Files.isReadable(referenceIndexPath)) {
             throw new IllegalStateException(
-                    String.format("Reference index does not exist or is not readable", referenceIndexPath.toAbsolutePath()));
+                    String.format("Reference index %s does not exist or is not readable", referenceIndexPath.toAbsolutePath()));
         }
 
         ObjectMapper om = new ObjectMapper(new YAMLFactory().enable(YAMLGenerator.Feature.MINIMIZE_QUOTES));

diff --git a/...nt/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java b/...nt/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java
@@ -41,7 +41,7 @@ public String delete() {
             AuditReader auditReader = AuditReaderFactory.get(em);
             List<Number> revisions = auditReader.getRevisions(MyAuditedEntity.class, entity.getId());
             if (revisions.size() != 2) {
-                throw new IllegalStateException(String.format("found {} revisions", revisions.size()));
+                throw new IllegalStateException(String.format("found %d revisions", revisions.size()));
             }
 
             for (Number revision : revisions) {

diff --git a/...eployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java b/...eployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java
@@ -41,7 +41,7 @@ public String save(String name) {
             AuditReader auditReader = AuditReaderFactory.get(em);
             List<Number> revisions = auditReader.getRevisions(MyAuditedEntity.class, entity.getId());
             if (revisions.size() != 2) {
-                throw new IllegalStateException(String.format("found {} revisions", revisions.size()));
+                throw new IllegalStateException(String.format("found %d revisions", revisions.size()));
             }
 
             MyRevisionEntity revEntity = auditReader.findRevision(MyRevisionEntity.class, revisions.get(0));

diff --git a/...ons/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/...ons/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
@@ -160,8 +160,8 @@ public static void setHttpClientOptions(OidcCommonConfig oidcConfig, HttpClientO
                 }
             } catch (IOException ex) {
                 throw new ConfigurationException(String.format(
-                        "OIDC truststore file does not exist or can not be read",
-                        oidcConfig.tls.trustStoreFile.get().toString()), ex);
+                        "OIDC truststore file %s does not exist or can not be read",
+                        oidcConfig.tls.trustStoreFile.get()), ex);
             }
         }
         if (oidcConfig.tls.keyStoreFile.isPresent()) {
@@ -182,8 +182,8 @@ public static void setHttpClientOptions(OidcCommonConfig oidcConfig, HttpClientO
 
             } catch (IOException ex) {
                 throw new ConfigurationException(String.format(
-                        "OIDC keystore file does not exist or can not be read",
-                        oidcConfig.tls.keyStoreFile.get().toString()), ex);
+                        "OIDC keystore file %s does not exist or can not be read",
+                        oidcConfig.tls.keyStoreFile.get()), ex);
             }
         }
         Optional<ProxyOptions> proxyOpt = toProxyOptions(oidcConfig.getProxy());

diff --git a/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
@@ -864,7 +864,7 @@ boolean isEnumConstantMessageKey(String key, IndexView index, ClassInfo bundleIn
                             return true;
                         }
                         throw new MessageBundleException(
-                                String.format("%s is not an enum constant of %: %s", constant, maybeEnum, key));
+                                String.format("%s is not an enum constant of %s: %s", constant, maybeEnum, key));
                     }
                 }
             }