fixing post-rebase checkstyle problems

maedhroz · dcapwell · commit de9925f81a70 · 2025-04-02T14:37:34.000-07:00
diff --git a/src/java/org/apache/cassandra/journal/Flusher.java b/src/java/org/apache/cassandra/journal/Flusher.java
@@ -45,6 +45,7 @@
 import static org.apache.cassandra.concurrent.Interruptible.State.NORMAL;
 import static org.apache.cassandra.concurrent.Interruptible.State.SHUTTING_DOWN;
 import static org.apache.cassandra.journal.Params.FlushMode.PERIODIC;
+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
 import static org.apache.cassandra.utils.MonotonicClock.Global.preciseTime;
 import static org.apache.cassandra.utils.Simulate.With.GLOBAL_CLOCK;
 import static org.apache.cassandra.utils.Simulate.With.LOCK_SUPPORT;
@@ -94,7 +95,7 @@ final class Flusher<K, V>
 
     void start()
     {
-        String flushExecutorName = journal.name + "-disk-flusher-" + params.flushMode().toString().toLowerCase();
+        String flushExecutorName = journal.name + "-disk-flusher-" + toLowerCaseLocalized(params.flushMode().toString());
         flushStartedAt = clock.now();
         flushExecutor = executorFactory().infiniteLoop(flushExecutorName, new FlushRunnable(), SAFE, NON_DAEMON, SYNCHRONIZED);
     }
diff --git a/src/java/org/apache/cassandra/schema/DistributedSchema.java b/src/java/org/apache/cassandra/schema/DistributedSchema.java
@@ -142,7 +142,7 @@ public TableMetadata getTableMetadata(TableId id)
 
     public TableMetadata getTableMetadata(String keyspace, String cf)
     {
-        var ks = keyspaces.getNullable(keyspace);
+        KeyspaceMetadata ks = keyspaces.getNullable(keyspace);
         return ks == null ? null : ks.tables.getNullable(cf);
     }
 
diff --git a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java
@@ -53,6 +53,7 @@
 import static com.google.common.collect.Iterables.any;
 import static java.lang.String.format;
 import static org.apache.cassandra.db.TypeSizes.sizeof;
+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
 
 /**
  * An immutable representation of keyspace metadata (name, params, tables, types, and functions).
@@ -369,7 +370,7 @@ public String toCqlString(boolean withWarnings, boolean withInternals, boolean i
             if (params.fastPath != null)
             {
                 builder.append("  AND fast_path = '")
-                       .append(params.fastPath.toString().toLowerCase())
+                       .append(toLowerCaseLocalized(params.fastPath.toString()))
                        .append("'");
             }
 
diff --git a/src/java/org/apache/cassandra/service/accord/fastpath/FastPathStrategy.java b/src/java/org/apache/cassandra/service/accord/fastpath/FastPathStrategy.java
@@ -36,6 +36,9 @@
 import org.apache.cassandra.tcm.serialization.MetadataSerializer;
 import org.apache.cassandra.tcm.serialization.Version;
 
+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
+import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;
+
 public interface FastPathStrategy
 {
     enum Kind
@@ -66,7 +69,7 @@ public static Kind fromByte(byte i)
         @Nullable
         public static Kind fromString(String s)
         {
-            return LOOKUP.get(s.toUpperCase());
+            return LOOKUP.get(toUpperCaseLocalized(s));
         }
 
         @Nullable
@@ -118,7 +121,7 @@ static FastPathStrategy fromMap(Map<String, String> map)
 
     static FastPathStrategy tableStrategyFromString(String s)
     {
-        s = s.toLowerCase().trim();
+        s = toLowerCaseLocalized(s).trim();
         if (s.equals("keyspace"))
             return InheritKeyspaceFastPathStrategy.instance;
         if (s.equals("simple"))
@@ -129,7 +132,7 @@ static FastPathStrategy tableStrategyFromString(String s)
 
     static FastPathStrategy keyspaceStrategyFromString(String s)
     {
-        s = s.toLowerCase().trim();
+        s = toLowerCaseLocalized(s).trim();
         if (s.equals("simple"))
             return SimpleFastPathStrategy.instance;
 
diff --git a/src/java/org/apache/cassandra/service/consensus/TransactionalMode.java b/src/java/org/apache/cassandra/service/consensus/TransactionalMode.java
@@ -29,6 +29,7 @@
 import org.apache.cassandra.tcm.ClusterMetadata;
 
 import static com.google.common.base.Preconditions.checkState;
+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
 
 /*
  * Configure the transactional behavior of a table. Enables accord on a table and defines how it mixes with non-serial writes
@@ -126,7 +127,7 @@ public enum TransactionalMode
         this.nonSerialWritesThroughAccord = nonSerialWritesThroughAccord;
         this.nonSerialReadsThroughAccord = nonSerialReadsThroughAccord;
         this.blockingReadRepairThroughAccord = blockingReadRepairThroughAccord;
-        this.cqlParam = String.format("transactional_mode = '%s'", this.name().toLowerCase());
+        this.cqlParam = String.format("transactional_mode = '%s'", toLowerCaseLocalized(this.name()));
         checkState(this.name().startsWith("test_") || (nonSerialReadsThroughAccord && nonSerialWritesThroughAccord) || !nonSerialReadsThroughAccord, "Doesn't make sense to do non-SERIAL reads through Accord without also doing non-SERIAL writes through Accord");
     }
 
@@ -229,7 +230,7 @@ public static TransactionalMode fromOrdinal(int ordinal)
 
     public static TransactionalMode fromString(String name)
     {
-        return valueOf(name.toLowerCase());
+        return valueOf(toLowerCaseLocalized(name));
     }
 
     public boolean isTestMode()
diff --git a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationTarget.java b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusMigrationTarget.java
@@ -22,6 +22,8 @@
 
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
+
 public enum ConsensusMigrationTarget
 {
     paxos(0),
@@ -41,7 +43,7 @@ public boolean isMigratedBy(ConsensusMigrationRepairType repairType)
 
     public static ConsensusMigrationTarget fromString(String targetProtocol)
     {
-        return ConsensusMigrationTarget.valueOf(targetProtocol.toLowerCase());
+        return ConsensusMigrationTarget.valueOf(toLowerCaseLocalized(targetProtocol));
     }
 
     public static ConsensusMigrationTarget fromValue(byte value)
diff --git a/src/java/org/apache/cassandra/service/consensus/migration/TransactionalMigrationFromMode.java b/src/java/org/apache/cassandra/service/consensus/migration/TransactionalMigrationFromMode.java
@@ -20,6 +20,8 @@
 
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;
+
 /**
  * This tracks the state of a migration either from Paxos -> Accord, Accord [interop mode a] -> Accord [interop mode b] or Accord -> Paxos.
  * The `TransactionalMode` associated with each transition from a system is how interoperability should be achieved during the migration with various performance/safety tradeoffs.
@@ -65,7 +67,7 @@ public static TransactionalMigrationFromMode fromOrdinal(int ordinal)
 
     public static TransactionalMigrationFromMode fromString(String name)
     {
-        return valueOf(name.toLowerCase());
+        return valueOf(toLowerCaseLocalized(name));
     }
 
     public boolean migratingFromAccord()
@@ -95,6 +97,6 @@ public boolean isMigrating()
 
     public String asCqlParam()
     {
-        return String.format("transactional_migration_from = '%s'", this.name().toLowerCase());
+        return String.format("transactional_migration_from = '%s'", toLowerCaseLocalized(this.name()));
     }
 }
diff --git a/src/java/org/apache/cassandra/tcm/Processor.java b/src/java/org/apache/cassandra/tcm/Processor.java
@@ -26,7 +26,6 @@
 import com.codahale.metrics.Meter;
 
 import accord.utils.Invariants;
-import com.codahale.metrics.Meter;
 import org.apache.cassandra.metrics.TCMMetrics;
 import org.apache.cassandra.service.WaitStrategy;
 import org.apache.cassandra.tcm.log.Entry;
diff --git a/src/java/org/apache/cassandra/utils/PojoToString.java b/src/java/org/apache/cassandra/utils/PojoToString.java
@@ -33,6 +33,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.cassandra.utils.JsonUtils.JSON_OBJECT_MAPPER;
+import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;
 
 /**
  * Helper to format POJOs that are easy to convert (primitives, nonnull, and built in collections)
@@ -70,7 +71,7 @@ public boolean isYaml()
 
         public static Format fromString(String formatString)
         {
-            formatString = formatString.toUpperCase();
+            formatString = toUpperCaseLocalized(formatString);
             switch (formatString)
             {
                 case "YAML":
diff --git a/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java b/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java
@@ -48,7 +48,6 @@
 import org.apache.cassandra.journal.TestParams;
 import org.apache.cassandra.schema.SchemaConstants;
 import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.service.accord.api.AccordAgent;
 import org.apache.cassandra.utils.AccordGenerators;
 
 import static accord.api.Journal.FieldUpdates;
diff --git a/test/unit/org/apache/cassandra/locator/AssureSufficientLiveNodesTest.java b/test/unit/org/apache/cassandra/locator/AssureSufficientLiveNodesTest.java
@@ -41,7 +41,6 @@
 import org.apache.cassandra.CassandraTestBase.PrepareServerNoRegister;
 import org.apache.cassandra.CassandraTestBase.UseMurmur3Partitioner;
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.dht.Murmur3Partitioner;
 import org.apache.cassandra.dht.Token;
diff --git a/test/unit/org/apache/cassandra/service/accord/AccordConfigurationServiceTest.java b/test/unit/org/apache/cassandra/service/accord/AccordConfigurationServiceTest.java
@@ -62,7 +62,6 @@
 import org.apache.cassandra.schema.TableId;
 import org.apache.cassandra.schema.TableMetadata;
 import org.apache.cassandra.schema.Tables;
-import org.apache.cassandra.service.accord.api.AccordAgent;
 import org.apache.cassandra.service.accord.journal.AccordTopologyUpdate;
 import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.tcm.ValidatingClusterMetadataService;

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public TableMetadata getTableMetadata(TableId id)`
`142`	`142`
`143`	`143`	`public TableMetadata getTableMetadata(String keyspace, String cf)`
`144`	`144`	`{`
`145`		`- var ks = keyspaces.getNullable(keyspace);`
	`145`	`+ KeyspaceMetadata ks = keyspaces.getNullable(keyspace);`
`146`	`146`	`return ks == null ? null : ks.tables.getNullable(cf);`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`import static com.google.common.collect.Iterables.any;`
`54`	`54`	`import static java.lang.String.format;`
`55`	`55`	`import static org.apache.cassandra.db.TypeSizes.sizeof;`
	`56`	`+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;`
`56`	`57`
`57`	`58`	`/**`
`58`	`59`	`* An immutable representation of keyspace metadata (name, params, tables, types, and functions).`
`@@ -369,7 +370,7 @@ public String toCqlString(boolean withWarnings, boolean withInternals, boolean i`
`369`	`370`	`if (params.fastPath != null)`
`370`	`371`	`{`
`371`	`372`	`builder.append(" AND fast_path = '")`
`372`		`- .append(params.fastPath.toString().toLowerCase())`
	`373`	`+ .append(toLowerCaseLocalized(params.fastPath.toString()))`
`373`	`374`	`.append("'");`
`374`	`375`	`}`
`375`	`376`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,9 @@`
`36`	`36`	`import org.apache.cassandra.tcm.serialization.MetadataSerializer;`
`37`	`37`	`import org.apache.cassandra.tcm.serialization.Version;`
`38`	`38`
	`39`	`+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;`
	`40`	`+import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;`
	`41`	`+`
`39`	`42`	`public interface FastPathStrategy`
`40`	`43`	`{`
`41`	`44`	`enum Kind`
`@@ -66,7 +69,7 @@ public static Kind fromByte(byte i)`
`66`	`69`	`@Nullable`
`67`	`70`	`public static Kind fromString(String s)`
`68`	`71`	`{`
`69`		`- return LOOKUP.get(s.toUpperCase());`
	`72`	`+ return LOOKUP.get(toUpperCaseLocalized(s));`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`@Nullable`
`@@ -118,7 +121,7 @@ static FastPathStrategy fromMap(Map<String, String> map)`
`118`	`121`
`119`	`122`	`static FastPathStrategy tableStrategyFromString(String s)`
`120`	`123`	`{`
`121`		`- s = s.toLowerCase().trim();`
	`124`	`+ s = toLowerCaseLocalized(s).trim();`
`122`	`125`	`if (s.equals("keyspace"))`
`123`	`126`	`return InheritKeyspaceFastPathStrategy.instance;`
`124`	`127`	`if (s.equals("simple"))`
`@@ -129,7 +132,7 @@ static FastPathStrategy tableStrategyFromString(String s)`
`129`	`132`
`130`	`133`	`static FastPathStrategy keyspaceStrategyFromString(String s)`
`131`	`134`	`{`
`132`		`- s = s.toLowerCase().trim();`
	`135`	`+ s = toLowerCaseLocalized(s).trim();`
`133`	`136`	`if (s.equals("simple"))`
`134`	`137`	`return SimpleFastPathStrategy.instance;`
`135`	`138`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import org.apache.cassandra.tcm.ClusterMetadata;`
`30`	`30`
`31`	`31`	`import static com.google.common.base.Preconditions.checkState;`
	`32`	`+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;`
`32`	`33`
`33`	`34`	`/*`
`34`	`35`	`* Configure the transactional behavior of a table. Enables accord on a table and defines how it mixes with non-serial writes`
`@@ -126,7 +127,7 @@ public enum TransactionalMode`
`126`	`127`	`this.nonSerialWritesThroughAccord = nonSerialWritesThroughAccord;`
`127`	`128`	`this.nonSerialReadsThroughAccord = nonSerialReadsThroughAccord;`
`128`	`129`	`this.blockingReadRepairThroughAccord = blockingReadRepairThroughAccord;`
`129`		`- this.cqlParam = String.format("transactional_mode = '%s'", this.name().toLowerCase());`
	`130`	`+ this.cqlParam = String.format("transactional_mode = '%s'", toLowerCaseLocalized(this.name()));`
`130`	`131`	`checkState(this.name().startsWith("test_") \|\| (nonSerialReadsThroughAccord && nonSerialWritesThroughAccord) \|\| !nonSerialReadsThroughAccord, "Doesn't make sense to do non-SERIAL reads through Accord without also doing non-SERIAL writes through Accord");`
`131`	`132`	`}`
`132`	`133`
`@@ -229,7 +230,7 @@ public static TransactionalMode fromOrdinal(int ordinal)`
`229`	`230`
`230`	`231`	`public static TransactionalMode fromString(String name)`
`231`	`232`	`{`
`232`		`- return valueOf(name.toLowerCase());`
	`233`	`+ return valueOf(toLowerCaseLocalized(name));`
`233`	`234`	`}`
`234`	`235`
`235`	`236`	`public boolean isTestMode()`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`
`23`	`23`	`import org.apache.cassandra.service.consensus.TransactionalMode;`
`24`	`24`
	`25`	`+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;`
	`26`	`+`
`25`	`27`	`public enum ConsensusMigrationTarget`
`26`	`28`	`{`
`27`	`29`	`paxos(0),`
`@@ -41,7 +43,7 @@ public boolean isMigratedBy(ConsensusMigrationRepairType repairType)`
`41`	`43`
`42`	`44`	`public static ConsensusMigrationTarget fromString(String targetProtocol)`
`43`	`45`	`{`
`44`		`- return ConsensusMigrationTarget.valueOf(targetProtocol.toLowerCase());`
	`46`	`+ return ConsensusMigrationTarget.valueOf(toLowerCaseLocalized(targetProtocol));`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`public static ConsensusMigrationTarget fromValue(byte value)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`
`21`	`21`	`import org.apache.cassandra.service.consensus.TransactionalMode;`
`22`	`22`
	`23`	`+import static org.apache.cassandra.utils.LocalizeString.toLowerCaseLocalized;`
	`24`	`+`
`23`	`25`	`/**`
`24`	`26`	`* This tracks the state of a migration either from Paxos -> Accord, Accord [interop mode a] -> Accord [interop mode b] or Accord -> Paxos.`
`25`	`27`	* The `TransactionalMode` associated with each transition from a system is how interoperability should be achieved during the migration with various performance/safety tradeoffs.
`@@ -65,7 +67,7 @@ public static TransactionalMigrationFromMode fromOrdinal(int ordinal)`
`65`	`67`
`66`	`68`	`public static TransactionalMigrationFromMode fromString(String name)`
`67`	`69`	`{`
`68`		`- return valueOf(name.toLowerCase());`
	`70`	`+ return valueOf(toLowerCaseLocalized(name));`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`public boolean migratingFromAccord()`
`@@ -95,6 +97,6 @@ public boolean isMigrating()`
`95`	`97`
`96`	`98`	`public String asCqlParam()`
`97`	`99`	`{`
`98`		`- return String.format("transactional_migration_from = '%s'", this.name().toLowerCase());`
	`100`	`+ return String.format("transactional_migration_from = '%s'", toLowerCaseLocalized(this.name()));`
`99`	`101`	`}`
`100`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`
`34`	`34`	`import static com.google.common.base.Preconditions.checkArgument;`
`35`	`35`	`import static org.apache.cassandra.utils.JsonUtils.JSON_OBJECT_MAPPER;`
	`36`	`+import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;`
`36`	`37`
`37`	`38`	`/**`
`38`	`39`	`* Helper to format POJOs that are easy to convert (primitives, nonnull, and built in collections)`
`@@ -70,7 +71,7 @@ public boolean isYaml()`
`70`	`71`
`71`	`72`	`public static Format fromString(String formatString)`
`72`	`73`	`{`
`73`		`- formatString = formatString.toUpperCase();`
	`74`	`+ formatString = toUpperCaseLocalized(formatString);`
`74`	`75`	`switch (formatString)`
`75`	`76`	`{`
`76`	`77`	`case "YAML":`