Remove java string templates, bump google java format dep (#1019)

Co-authored-by: Bryan Burkholder <[email protected]>
slackhq · Aug 9, 2024 · 5ee1e99 · 5ee1e99
1 parent f203207
commit 5ee1e99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/astra/pom.xml b/astra/pom.xml
@@ -665,7 +665,7 @@
                     <dependency>
                         <groupId>com.google.googlejavaformat</groupId>
                         <artifactId>google-java-format</artifactId>
-                        <version>1.22.0</version>
+                        <version>1.23.0</version>
                     </dependency>
                 </dependencies>
                 <executions>

diff --git a/astra/src/main/java/com/slack/astra/writer/SpanFormatter.java b/astra/src/main/java/com/slack/astra/writer/SpanFormatter.java
@@ -106,7 +106,7 @@ public static Trace.KeyValue makeTraceKV(String key, Object value, Schema.Schema
       }
       return tagBuilder.build();
     } catch (Exception e) {
-      tagBuilder.setKey(STR."failed_\{key}");
+      tagBuilder.setKey(String.format("failed_%s", key));
       tagBuilder.setFieldType(Schema.SchemaFieldType.KEYWORD);
       tagBuilder.setVStr(value.toString());
       return tagBuilder.build();
@@ -133,7 +133,7 @@ public static List<Trace.KeyValue> convertKVtoProto(
         }
         Trace.KeyValue additionalKV =
             makeTraceKV(
-                STR."\{key}.\{additionalField.getKey()}",
+                String.format("%s.%s", key, additionalField.getKey()),
                 value,
                 additionalField.getValue().getType());
         tags.add(additionalKV);
@@ -155,7 +155,7 @@ public static List<Trace.KeyValue> convertKVtoProtoDefault(
           .forEach(
               (key1, value1) -> {
                 List<Trace.KeyValue> nestedValues =
-                    convertKVtoProtoDefault(STR."\{key}.\{key1}", value1, schema);
+                    convertKVtoProtoDefault(String.format("%s.%s", key, key1), value1, schema);
                 tags.addAll(nestedValues);
               });
     } else if (value instanceof String || value instanceof List) {
@@ -176,7 +176,7 @@ public static List<Trace.KeyValue> convertKVtoProtoDefault(
           }
           Trace.KeyValue additionalKV =
               makeTraceKV(
-                  STR."\{key}.\{additionalField.getKey()}",
+                  String.format("%s.%s", key, additionalField.getKey()),
                   value,
                   additionalField.getValue().getType());
           tags.add(additionalKV);

diff --git a/astra/src/test/java/com/slack/astra/logstore/opensearch/OpenSearchAdapterTest.java b/astra/src/test/java/com/slack/astra/logstore/opensearch/OpenSearchAdapterTest.java
@@ -482,7 +482,7 @@ public void shouldParseIdFieldSearch() throws Exception {
     IndexSearcher indexSearcher = logStoreAndSearcherRule.logStore.getSearcherManager().acquire();
     Query idQuery =
         openSearchAdapter.buildQuery(
-            "foo", STR."\{idField}:\{idValue}", null, null, indexSearcher, null);
+            "foo", String.format("%s:%s", idField, idValue), null, null, indexSearcher, null);
     BytesRef queryStrBytes = new BytesRef(Uid.encodeId("1").bytes);
     // idQuery.toString="#_id:([fe 1f])"
     // queryStrBytes.toString="[fe 1f]"