This is an automated email from the ASF dual-hosted git repository.
pauloricardomg pushed a commit to branch worktree-CASSSIDECAR-424
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/worktree-CASSSIDECAR-424 by
this push:
new 7f8a81a9 CASSSIDECAR-424: Use toPrettyString() in toString() for
overlay classes
7f8a81a9 is described below
commit 7f8a81a9788b9510021abe5f603fb43e1ea7c6f0
Author: Paulo Motta <[email protected]>
AuthorDate: Mon May 18 17:13:16 2026 -0400
CASSSIDECAR-424: Use toPrettyString() in toString() for overlay classes
Improves readability of CassandraConfigurationOverlay and
ConfigurationOverlaySnapshot string representations in logs and
debugging output.
---
.../CassandraConfigurationOverlay.java | 2 +-
.../ConfigurationOverlaySnapshot.java | 2 +-
.../CassandraConfigurationOverlayTest.java | 20 +++++++++++++++-----
.../ConfigurationOverlaySnapshotTest.java | 17 +++++++++++++----
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlay.java
b/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlay.java
index 8be5bbda..b2acbc89 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlay.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlay.java
@@ -178,6 +178,6 @@ public class CassandraConfigurationOverlay
ObjectNode node = MAPPER.createObjectNode();
node.set("cassandraYaml", cassandraYaml);
node.set("extraJvmOpts", MAPPER.valueToTree(extraJvmOpts));
- return node.toString();
+ return node.toPrettyString();
}
}
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshot.java
b/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshot.java
index aef1c31c..81b1e3af 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshot.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshot.java
@@ -133,6 +133,6 @@ public class ConfigurationOverlaySnapshot
node.put("hash", hash());
node.put("lastModified", lastModified.toString());
node.set("configuration", MAPPER.valueToTree(configuration));
- return node.toString();
+ return node.toPrettyString();
}
}
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlayTest.java
b/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlayTest.java
index 7f536fc8..bf210b07 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlayTest.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/CassandraConfigurationOverlayTest.java
@@ -145,9 +145,16 @@ class CassandraConfigurationOverlayTest
yaml.put("commitlog_sync", "periodic");
CassandraConfigurationOverlay overlay = new
CassandraConfigurationOverlay(yaml, Map.of("-Xmx", "4G"));
- assertThat(overlay.toString()).isEqualTo(
-
"{\"cassandraYaml\":{\"concurrent_reads\":32,\"commitlog_sync\":\"periodic\"},"
- + "\"extraJvmOpts\":{\"-Xmx\":\"4G\"}}");
+ assertThat(overlay.toString()).isEqualTo(String.join("\n",
+ "{",
+ " \"cassandraYaml\" : {",
+ " \"concurrent_reads\" : 32,",
+ " \"commitlog_sync\" : \"periodic\"",
+ " },",
+ " \"extraJvmOpts\" : {",
+ " \"-Xmx\" : \"4G\"",
+ " }",
+ "}"));
}
@Test
@@ -155,7 +162,10 @@ class CassandraConfigurationOverlayTest
{
CassandraConfigurationOverlay overlay = new
CassandraConfigurationOverlay(null, null);
- assertThat(overlay.toString()).isEqualTo(
- "{\"cassandraYaml\":{},\"extraJvmOpts\":{}}");
+ assertThat(overlay.toString()).isEqualTo(String.join("\n",
+ "{",
+ " \"cassandraYaml\" : { },",
+ " \"extraJvmOpts\" : { }",
+ "}"));
}
}
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshotTest.java
b/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshotTest.java
index 9e2b8c6f..533325eb 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshotTest.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/configmanagement/ConfigurationOverlaySnapshotTest.java
@@ -113,10 +113,19 @@ class ConfigurationOverlaySnapshotTest
ConfigurationOverlaySnapshot snapshot = new
ConfigurationOverlaySnapshot(timestamp, overlay);
- String expected = "{\"hash\":\"" + snapshot.hash() + "\","
- + "\"lastModified\":\"2026-02-20T14:32:18Z\","
- +
"\"configuration\":{\"cassandraYaml\":{\"concurrent_reads\":32},"
- + "\"extraJvmOpts\":{\"-Xmx\":\"4G\"}}}";
+ String expected = String.join("\n",
+ "{",
+ " \"hash\" : \"" + snapshot.hash() + "\",",
+ " \"lastModified\" : \"2026-02-20T14:32:18Z\",",
+ " \"configuration\" : {",
+ " \"cassandraYaml\" : {",
+ " \"concurrent_reads\" : 32",
+ " },",
+ " \"extraJvmOpts\" : {",
+ " \"-Xmx\" : \"4G\"",
+ " }",
+ " }",
+ "}");
assertThat(snapshot.toString()).isEqualTo(expected);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
