Skip to content

Commit 869533f

Browse files
authored
fix: locale-specific formatting due to MessageFormat.format() (#1390)
1 parent 90d728b commit 869533f

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

runtime/catalog-apicurio/src/main/java/io/aklivity/zilla/runtime/catalog/apicurio/internal/ApicurioCatalogHandler.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.net.http.HttpRequest;
2828
import java.net.http.HttpResponse;
2929
import java.nio.ByteOrder;
30-
import java.text.MessageFormat;
3130
import java.util.concurrent.CompletableFuture;
3231
import java.util.concurrent.ConcurrentMap;
3332
import java.util.concurrent.atomic.AtomicInteger;
@@ -52,10 +51,10 @@
5251

5352
public class ApicurioCatalogHandler implements CatalogHandler
5453
{
55-
private static final String ARTIFACT_VERSION_PATH = "/apis/registry/v2/groups/{0}/artifacts/{1}/versions/{2}/meta";
56-
private static final String ARTIFACT_BY_GLOBAL_ID_PATH = "/apis/registry/v2/ids/globalIds/{0}";
57-
private static final String ARTIFACT_BY_CONTENT_ID_PATH = "/apis/registry/v2/ids/contentIds/{0}";
58-
private static final String ARTIFACT_META_PATH = "/apis/registry/v2/groups/{0}/artifacts/{1}/meta";
54+
private static final String ARTIFACT_VERSION_PATH = "/apis/registry/v2/groups/%s/artifacts/%s/versions/%s/meta";
55+
private static final String ARTIFACT_BY_GLOBAL_ID_PATH = "/apis/registry/v2/ids/globalIds/%d";
56+
private static final String ARTIFACT_BY_CONTENT_ID_PATH = "/apis/registry/v2/ids/contentIds/%d";
57+
private static final String ARTIFACT_META_PATH = "/apis/registry/v2/groups/%s/artifacts/%s/meta";
5958
private static final String VERSION_LATEST = "latest";
6059
private static final int MAX_PADDING_LENGTH = SIZE_OF_BYTE + SIZE_OF_LONG;
6160
private static final byte MAGIC_BYTE = 0x0;
@@ -156,7 +155,7 @@ public String resolve(
156155
{
157156
try
158157
{
159-
artifact = sendHttpRequest(MessageFormat.format(artifactPath, artifactId));
158+
artifact = sendHttpRequest(artifactPath.formatted(artifactId));
160159
if (artifact == null)
161160
{
162161
if (retryAttempts.getAndIncrement() == 0)
@@ -238,8 +237,8 @@ public int resolve(
238237
{
239238
try
240239
{
241-
String path = VERSION_LATEST.equals(version) ? MessageFormat.format(ARTIFACT_META_PATH, groupId, artifact) :
242-
MessageFormat.format(ARTIFACT_VERSION_PATH, groupId, artifact, version);
240+
String path = VERSION_LATEST.equals(version) ? ARTIFACT_META_PATH.formatted(groupId, artifact) :
241+
ARTIFACT_VERSION_PATH.formatted(groupId, artifact, version);
243242

244243
String response = sendHttpRequest(path);
245244
if (response == null)

runtime/catalog-schema-registry/src/main/java/io/aklivity/zilla/runtime/catalog/schema/registry/internal/handler/SchemaRegistryCatalogHandler.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.nio.ByteOrder;
2525
import java.security.KeyStore;
2626
import java.security.SecureRandom;
27-
import java.text.MessageFormat;
2827
import java.util.List;
2928
import java.util.concurrent.CompletableFuture;
3029
import java.util.concurrent.ConcurrentMap;
@@ -59,10 +58,10 @@
5958

6059
public class SchemaRegistryCatalogHandler implements CatalogHandler
6160
{
62-
private static final String SUBJECT_VERSION_PATH = "/subjects/{0}/versions/{1}";
63-
private static final String REGISTER_SUBJECT_PATH = "/subjects/{0}/versions";
64-
private static final String UNREGISTER_SUBJECT_PATH = "/subjects/{0}";
65-
private static final String SCHEMA_PATH = "/schemas/ids/{0}";
61+
private static final String SUBJECT_VERSION_PATH = "/subjects/%s/versions/%s";
62+
private static final String REGISTER_SUBJECT_PATH = "/subjects/%s/versions";
63+
private static final String UNREGISTER_SUBJECT_PATH = "/subjects/%s";
64+
private static final String SCHEMA_PATH = "/schemas/ids/%d";
6665
private static final String HTTPS = "https://";
6766

6867
private static final int MAX_PADDING_LENGTH = 5;
@@ -154,7 +153,7 @@ public int register(
154153
{
155154
int versionId = NO_VERSION_ID;
156155

157-
String response = sendPostHttpRequest(MessageFormat.format(REGISTER_SUBJECT_PATH, subject), schema);
156+
String response = sendPostHttpRequest(REGISTER_SUBJECT_PATH.formatted(subject), schema);
158157
if (response != null)
159158
{
160159
versionId = registerRequest.resolveResponse(response);
@@ -169,7 +168,7 @@ public int[] unregister(
169168
{
170169
int[] versions = NO_VERSIONS;
171170

172-
String response = sendDeleteHttpRequest(MessageFormat.format(UNREGISTER_SUBJECT_PATH, subject));
171+
String response = sendDeleteHttpRequest(UNREGISTER_SUBJECT_PATH.formatted(subject));
173172
if (response != null)
174173
{
175174
versions = unregisterRequest.resolveResponse(response);
@@ -215,7 +214,7 @@ public String resolve(
215214
{
216215
try
217216
{
218-
String response = sendHttpRequest(MessageFormat.format(SCHEMA_PATH, schemaId));
217+
String response = sendHttpRequest(SCHEMA_PATH.formatted(schemaId));
219218
if (response == null)
220219
{
221220
if (retryAttempts.getAndIncrement() == 0)
@@ -297,7 +296,7 @@ public int resolve(
297296
{
298297
try
299298
{
300-
String response = sendHttpRequest(MessageFormat.format(SUBJECT_VERSION_PATH, subject, version));
299+
String response = sendHttpRequest(SUBJECT_VERSION_PATH.formatted(subject, version));
301300
if (response == null)
302301
{
303302
if (retryAttempts.getAndIncrement() == 0)

0 commit comments

Comments
 (0)