Fix lenient format strings in common.

RELNOTES=N/A PiperOrigin-RevId: 469179783
google · Aug 22, 2022 · 4312d94 · 4312d94
1 parent e9755b4
commit 4312d94
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/android/guava-tests/test/com/google/common/base/PreconditionsTest.java b/android/guava-tests/test/com/google/common/base/PreconditionsTest.java
@@ -38,6 +38,7 @@
  * @author Kevin Bourrillion
  * @author Jared Levy
  */
+@SuppressWarnings("LenientFormatStringValidation") // Intentional for testing
 @GwtCompatible(emulated = true)
 public class PreconditionsTest extends TestCase {
   public void testCheckArgument_simple_success() {

diff --git a/android/guava-tests/test/com/google/common/base/StringsTest.java b/android/guava-tests/test/com/google/common/base/StringsTest.java
@@ -213,6 +213,7 @@ public void testValidSurrogatePairAt() {
     assertFalse(Strings.validSurrogatePairAt("\uD8ABx", 0));
   }
 
+  @SuppressWarnings("LenientFormatStringValidation") // Intentional for testing.
   public void testLenientFormat() {
     assertEquals("%s", Strings.lenientFormat("%s"));
     assertEquals("5", Strings.lenientFormat("%s", 5));

diff --git a/android/guava/src/com/google/common/cache/CacheBuilder.java b/android/guava/src/com/google/common/cache/CacheBuilder.java
@@ -572,7 +572,7 @@ public <K1 extends K, V1 extends V> CacheBuilder<K1, V1> weigher(
     if (strictParsing) {
       checkState(
           this.maximumSize == UNSET_INT,
-          "weigher can not be combined with maximum size",
+          "weigher can not be combined with maximum size (%s provided)",
           this.maximumSize);
     }
 

diff --git a/android/guava/src/com/google/common/cache/CacheBuilderSpec.java b/android/guava/src/com/google/common/cache/CacheBuilderSpec.java
@@ -328,7 +328,7 @@ static class InitialCapacityParser extends IntegerParser {
     protected void parseInteger(CacheBuilderSpec spec, int value) {
       checkArgument(
           spec.initialCapacity == null,
-          "initial capacity was already set to ",
+          "initial capacity was already set to %s",
           spec.initialCapacity);
       spec.initialCapacity = value;
     }
@@ -338,9 +338,10 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {
   static class MaximumSizeParser extends LongParser {
     @Override
     protected void parseLong(CacheBuilderSpec spec, long value) {
-      checkArgument(spec.maximumSize == null, "maximum size was already set to ", spec.maximumSize);
       checkArgument(
-          spec.maximumWeight == null, "maximum weight was already set to ", spec.maximumWeight);
+          spec.maximumSize == null, "maximum size was already set to %s", spec.maximumSize);
+      checkArgument(
+          spec.maximumWeight == null, "maximum weight was already set to %s", spec.maximumWeight);
       spec.maximumSize = value;
     }
   }
@@ -350,8 +351,9 @@ static class MaximumWeightParser extends LongParser {
     @Override
     protected void parseLong(CacheBuilderSpec spec, long value) {
       checkArgument(
-          spec.maximumWeight == null, "maximum weight was already set to ", spec.maximumWeight);
-      checkArgument(spec.maximumSize == null, "maximum size was already set to ", spec.maximumSize);
+          spec.maximumWeight == null, "maximum weight was already set to %s", spec.maximumWeight);
+      checkArgument(
+          spec.maximumSize == null, "maximum size was already set to %s", spec.maximumSize);
       spec.maximumWeight = value;
     }
   }
@@ -362,7 +364,7 @@ static class ConcurrencyLevelParser extends IntegerParser {
     protected void parseInteger(CacheBuilderSpec spec, int value) {
       checkArgument(
           spec.concurrencyLevel == null,
-          "concurrency level was already set to ",
+          "concurrency level was already set to %s",
           spec.concurrencyLevel);
       spec.concurrencyLevel = value;
     }

diff --git a/guava-tests/test/com/google/common/base/PreconditionsTest.java b/guava-tests/test/com/google/common/base/PreconditionsTest.java
@@ -38,6 +38,7 @@
  * @author Kevin Bourrillion
  * @author Jared Levy
  */
+@SuppressWarnings("LenientFormatStringValidation") // Intentional for testing
 @GwtCompatible(emulated = true)
 public class PreconditionsTest extends TestCase {
   public void testCheckArgument_simple_success() {

diff --git a/guava-tests/test/com/google/common/base/StringsTest.java b/guava-tests/test/com/google/common/base/StringsTest.java
@@ -213,6 +213,7 @@ public void testValidSurrogatePairAt() {
     assertFalse(Strings.validSurrogatePairAt("\uD8ABx", 0));
   }
 
+  @SuppressWarnings("LenientFormatStringValidation") // Intentional for testing.
   public void testLenientFormat() {
     assertEquals("%s", Strings.lenientFormat("%s"));
     assertEquals("5", Strings.lenientFormat("%s", 5));

diff --git a/guava/src/com/google/common/cache/CacheBuilder.java b/guava/src/com/google/common/cache/CacheBuilder.java
@@ -571,7 +571,7 @@ public <K1 extends K, V1 extends V> CacheBuilder<K1, V1> weigher(
     if (strictParsing) {
       checkState(
           this.maximumSize == UNSET_INT,
-          "weigher can not be combined with maximum size",
+          "weigher can not be combined with maximum size (%s provided)",
           this.maximumSize);
     }
 

diff --git a/guava/src/com/google/common/cache/CacheBuilderSpec.java b/guava/src/com/google/common/cache/CacheBuilderSpec.java
@@ -328,7 +328,7 @@ static class InitialCapacityParser extends IntegerParser {
     protected void parseInteger(CacheBuilderSpec spec, int value) {
       checkArgument(
           spec.initialCapacity == null,
-          "initial capacity was already set to ",
+          "initial capacity was already set to %s",
           spec.initialCapacity);
       spec.initialCapacity = value;
     }
@@ -338,9 +338,10 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {
   static class MaximumSizeParser extends LongParser {
     @Override
     protected void parseLong(CacheBuilderSpec spec, long value) {
-      checkArgument(spec.maximumSize == null, "maximum size was already set to ", spec.maximumSize);
       checkArgument(
-          spec.maximumWeight == null, "maximum weight was already set to ", spec.maximumWeight);
+          spec.maximumSize == null, "maximum size was already set to %s", spec.maximumSize);
+      checkArgument(
+          spec.maximumWeight == null, "maximum weight was already set to %s", spec.maximumWeight);
       spec.maximumSize = value;
     }
   }
@@ -350,8 +351,9 @@ static class MaximumWeightParser extends LongParser {
     @Override
     protected void parseLong(CacheBuilderSpec spec, long value) {
       checkArgument(
-          spec.maximumWeight == null, "maximum weight was already set to ", spec.maximumWeight);
-      checkArgument(spec.maximumSize == null, "maximum size was already set to ", spec.maximumSize);
+          spec.maximumWeight == null, "maximum weight was already set to %s", spec.maximumWeight);
+      checkArgument(
+          spec.maximumSize == null, "maximum size was already set to %s", spec.maximumSize);
       spec.maximumWeight = value;
     }
   }
@@ -362,7 +364,7 @@ static class ConcurrencyLevelParser extends IntegerParser {
     protected void parseInteger(CacheBuilderSpec spec, int value) {
       checkArgument(
           spec.concurrencyLevel == null,
-          "concurrency level was already set to ",
+          "concurrency level was already set to %s",
           spec.concurrencyLevel);
       spec.concurrencyLevel = value;
     }