Skip to content

Commit 5ae49ff

Browse files
caoccaocaoccao
committed
refactor: Rename all related classes to I18n
1 parent 5436d09 commit 5ae49ff

File tree

7 files changed

+71
-69
lines changed

7 files changed

+71
-69
lines changed

‎hivemq-edge/src/main/java/com/hivemq/api/errors/HttpErrorFactory.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.hivemq.api.errors;
1818

19-
import com.hivemq.common.i18n.OpenAPIHttpError;
19+
import com.hivemq.common.i18n.I18nHttpError;
2020
import com.hivemq.edge.api.model.*;
2121
import com.hivemq.edge.api.model.InsufficientStorageError;
2222
import com.hivemq.edge.api.model.InternalServerError;
@@ -41,10 +41,10 @@ private HttpErrorFactory() {
4141
public static @NotNull InsufficientStorageError insufficientStorageError(final @Nullable String reason) {
4242
return InsufficientStorageError.builder()
4343
.type(type(InsufficientStorageError.class))
44-
.title(OpenAPIHttpError.HTTP_ERROR_507_TITLE.get())
44+
.title(I18nHttpError.HTTP_ERROR_507_TITLE.get())
4545
.detail(reason == null ?
46-
OpenAPIHttpError.HTTP_ERROR_507_DETAIL_DEFAULT.get() :
47-
OpenAPIHttpError.HTTP_ERROR_507_DETAIL_WITH_REASON.get(Map.of("reason", reason)))
46+
I18nHttpError.HTTP_ERROR_507_DETAIL_DEFAULT.get() :
47+
I18nHttpError.HTTP_ERROR_507_DETAIL_WITH_REASON.get(Map.of("reason", reason)))
4848
.status(HttpStatus.INSUFFICIENT_STORAGE_507)
4949
.build();
5050
}
@@ -56,10 +56,10 @@ private HttpErrorFactory() {
5656
public static @NotNull InternalServerError internalServerError(final @Nullable String reason) {
5757
return InternalServerError.builder()
5858
.type(type(InternalServerError.class))
59-
.title(OpenAPIHttpError.HTTP_ERROR_500_TITLE.get())
59+
.title(I18nHttpError.HTTP_ERROR_500_TITLE.get())
6060
.detail(reason == null ?
61-
OpenAPIHttpError.HTTP_ERROR_500_DETAIL_DEFAULT.get() :
62-
OpenAPIHttpError.HTTP_ERROR_500_DETAIL_WITH_REASON.get(Map.of("reason", reason)))
61+
I18nHttpError.HTTP_ERROR_500_DETAIL_DEFAULT.get() :
62+
I18nHttpError.HTTP_ERROR_500_DETAIL_WITH_REASON.get(Map.of("reason", reason)))
6363
.status(HttpStatus.INTERNAL_SERVER_ERROR_500)
6464
.build();
6565
}
@@ -69,8 +69,8 @@ private HttpErrorFactory() {
6969
final @NotNull String reason) {
7070
return InvalidQueryParameterError.builder()
7171
.type(type(InvalidQueryParameterError.class))
72-
.title(OpenAPIHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_TITLE.get())
73-
.detail(OpenAPIHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_DETAIL.get(Map.of(
72+
.title(I18nHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_TITLE.get())
73+
.detail(I18nHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_DETAIL.get(Map.of(
7474
"parameter", parameter,
7575
"reason", reason)))
7676
.parameter(parameter)
@@ -82,26 +82,26 @@ private HttpErrorFactory() {
8282
final @NotNull String reason) {
8383
return PreconditionFailedError.builder()
8484
.type(type(PreconditionFailedError.class))
85-
.title(OpenAPIHttpError.HTTP_ERROR_412_TITLE.get())
86-
.detail(OpenAPIHttpError.HTTP_ERROR_412_DETAIL.get(Map.of("reason", reason)))
85+
.title(I18nHttpError.HTTP_ERROR_412_TITLE.get())
86+
.detail(I18nHttpError.HTTP_ERROR_412_DETAIL.get(Map.of("reason", reason)))
8787
.status(HttpStatus.PRECONDITION_FAILED_412)
8888
.build();
8989
}
9090

9191
public static @NotNull RequestBodyMissingError requestBodyMissingError() {
9292
return RequestBodyMissingError.builder()
9393
.type(type(RequestBodyMissingError.class))
94-
.title(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_TITLE.get())
95-
.detail(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_DETAIL.get())
94+
.title(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_TITLE.get())
95+
.detail(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_DETAIL.get())
9696
.status(HttpStatus.BAD_REQUEST_400)
9797
.build();
9898
}
9999

100100
public static @NotNull RequestBodyParameterMissingError requestBodyParameterMissingError(final @NotNull String parameter) {
101101
return RequestBodyParameterMissingError.builder()
102102
.type(type(RequestBodyParameterMissingError.class))
103-
.title(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_TITLE.get())
104-
.detail(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_DETAIL.get(Map.of("parameter", parameter)))
103+
.title(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_TITLE.get())
104+
.detail(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_DETAIL.get(Map.of("parameter", parameter)))
105105
.parameter(parameter)
106106
.status(HttpStatus.BAD_REQUEST_400)
107107
.build();
@@ -110,17 +110,17 @@ private HttpErrorFactory() {
110110
public static @NotNull TemporaryNotAvailableError temporaryNotAvailableError() {
111111
return TemporaryNotAvailableError.builder()
112112
.type(type(TemporaryNotAvailableError.class))
113-
.title(OpenAPIHttpError.HTTP_ERROR_503_TITLE.get())
114-
.detail(OpenAPIHttpError.HTTP_ERROR_503_DETAIL.get())
113+
.title(I18nHttpError.HTTP_ERROR_503_TITLE.get())
114+
.detail(I18nHttpError.HTTP_ERROR_503_DETAIL.get())
115115
.status(HttpStatus.SERVICE_UNAVAILABLE_503)
116116
.build();
117117
}
118118

119119
public static @NotNull UrlParameterMissingError urlParameterMissingError(final @NotNull String parameter) {
120120
return UrlParameterMissingError.builder()
121121
.type(type(UrlParameterMissingError.class))
122-
.title(OpenAPIHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_TITLE.get())
123-
.detail(OpenAPIHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_DETAIL.get(Map.of("parameter", parameter)))
122+
.title(I18nHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_TITLE.get())
123+
.detail(I18nHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_DETAIL.get(Map.of("parameter", parameter)))
124124
.parameter(parameter)
125125
.status(HttpStatus.BAD_REQUEST_400)
126126
.build();

‎hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nTemplate.java‎ renamed to ‎hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nError.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.jetbrains.annotations.NotNull;
2020

21-
public interface I18nTemplate {
21+
public interface I18nError {
2222
@NotNull String getKey();
2323

2424
@NotNull String getName();

‎hivemq-edge/src/main/java/com/hivemq/common/i18n/OpenAPIErrorTemplate.java‎ renamed to ‎hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nErrorTemplate.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@
3535
import java.util.concurrent.ConcurrentHashMap;
3636

3737
/**
38-
* Singleton class to manage OpenAPI error templates using FreeMarker.
38+
* Singleton class to manage OpenAPI i18n error templates using FreeMarker.
3939
* It provides methods to retrieve error messages based on the current locale and template keys.
4040
* <p>
4141
* This class is thread-safe and uses a cache to store configurations for different locales.
4242
*/
43-
public final class OpenAPIErrorTemplate {
43+
public final class I18nErrorTemplate {
4444

45-
private static final OpenAPIErrorTemplate INSTANCE = new OpenAPIErrorTemplate();
45+
private static final I18nErrorTemplate INSTANCE = new I18nErrorTemplate();
4646

4747
private final @NotNull Map<String, Configuration> configurationMap;
4848
private final @NotNull Logger logger;
4949

50-
private OpenAPIErrorTemplate() {
50+
private I18nErrorTemplate() {
5151
configurationMap = new ConcurrentHashMap<>();
5252
logger = LoggerFactory.getLogger(getClass());
5353
}
5454

55-
public static @NotNull OpenAPIErrorTemplate getInstance() {
55+
public static @NotNull I18nErrorTemplate getInstance() {
5656
return INSTANCE;
5757
}
5858

@@ -65,22 +65,22 @@ private Configuration createConfiguration(final @NotNull Locale locale) {
6565
return configuration;
6666
}
6767

68-
public @NotNull String get(final @NotNull I18nTemplate i18nTemplate) {
69-
return get(i18nTemplate, Map.of());
68+
public @NotNull String get(final @NotNull I18nError i18NError) {
69+
return get(i18NError, Map.of());
7070
}
7171

72-
public @NotNull String get(final @NotNull I18nTemplate i18nTemplate, final @NotNull Map<String, Object> map) {
73-
final Locale locale = LocaleContext.getLocale();
72+
public @NotNull String get(final @NotNull I18nError i18NError, final @NotNull Map<String, Object> map) {
73+
final Locale locale = I18nLocaleContext.getLocale();
7474
Configuration configuration = configurationMap.get(locale.toString());
7575
if (configuration == null) {
7676
configuration = createConfiguration(locale);
7777
configurationMap.put(locale.toString(), configuration);
7878
}
7979
try {
8080
final StringTemplateLoader stringTemplateLoader = (StringTemplateLoader) configuration.getTemplateLoader();
81-
if (stringTemplateLoader.findTemplateSource(i18nTemplate.getKey()) == null) {
81+
if (stringTemplateLoader.findTemplateSource(i18NError.getKey()) == null) {
8282
final Properties properties = new Properties();
83-
try (final StringReader stringReader = new StringReader(IOUtils.resourceToString(i18nTemplate.getResourceName(),
83+
try (final StringReader stringReader = new StringReader(IOUtils.resourceToString(i18NError.getResourceName(),
8484
StandardCharsets.UTF_8))) {
8585
properties.load(stringReader);
8686
}
@@ -91,19 +91,19 @@ private Configuration createConfiguration(final @NotNull Locale locale) {
9191
}
9292
}
9393
}
94-
final Template template = configuration.getTemplate(i18nTemplate.getKey());
94+
final Template template = configuration.getTemplate(i18NError.getKey());
9595
try (final StringWriter stringWriter = new StringWriter()) {
9696
template.process(map, stringWriter);
9797
return stringWriter.toString();
9898
}
9999
} catch (final TemplateException e) {
100100
final String errorMessage =
101-
"Error: Template " + i18nTemplate.getKey() + " for " + locale + " could not be processed.";
101+
"Error: Template " + i18NError.getKey() + " for " + locale + " could not be processed.";
102102
logger.error(errorMessage);
103103
return errorMessage;
104104
} catch (final IOException e) {
105105
final String errorMessage =
106-
"Error: Template " + i18nTemplate.getKey() + " for " + locale + " could not be loaded.";
106+
"Error: Template " + i18NError.getKey() + " for " + locale + " could not be loaded.";
107107
logger.error(errorMessage);
108108
return errorMessage;
109109
}

‎hivemq-edge/src/main/java/com/hivemq/common/i18n/OpenAPIHttpError.java‎ renamed to ‎hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nHttpError.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Map;
2222

23-
public enum OpenAPIHttpError implements I18nTemplate {
23+
public enum I18nHttpError implements I18nError {
2424
HTTP_ERROR_400_INVALID_QUERY_PARAMETER_DETAIL,
2525
HTTP_ERROR_400_INVALID_QUERY_PARAMETER_TITLE,
2626
HTTP_ERROR_400_REQUEST_BODY_MISSING_DETAIL,
@@ -44,15 +44,15 @@ public enum OpenAPIHttpError implements I18nTemplate {
4444
private static final @NotNull String RESOURCE_NAME_PREFIX = "/templates/openapi-errors-";
4545
private static final @NotNull String RESOURCE_NAME_SUFFIX = ".properties";
4646

47-
OpenAPIHttpError() {
47+
I18nHttpError() {
4848
}
4949

5050
public @NotNull String get() {
5151
return get(Map.of());
5252
}
5353

5454
public @NotNull String get(final @NotNull Map<String, Object> map) {
55-
return OpenAPIErrorTemplate.getInstance().get(this, map);
55+
return I18nErrorTemplate.getInstance().get(this, map);
5656
}
5757

5858
@Override
@@ -67,6 +67,6 @@ public enum OpenAPIHttpError implements I18nTemplate {
6767

6868
@Override
6969
public @NotNull String getResourceName() {
70-
return RESOURCE_NAME_PREFIX + LocaleContext.getLocale() + RESOURCE_NAME_SUFFIX;
70+
return RESOURCE_NAME_PREFIX + I18nLocaleContext.getLocale() + RESOURCE_NAME_SUFFIX;
7171
}
7272
}

‎hivemq-edge/src/main/java/com/hivemq/common/i18n/LocaleContext.java‎ renamed to ‎hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nLocaleContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.util.Locale;
2323

24-
public final class LocaleContext {
24+
public final class I18nLocaleContext {
2525
public static @NotNull Locale DEFAULT_LOCALE = Locale.US;
2626

2727
private static final ThreadLocal<Locale> THREAD_LOCAL_LOCALE = ThreadLocal.withInitial(() -> DEFAULT_LOCALE);

‎hivemq-edge/src/test/java/com/hivemq/common/i18n/OpenAPIErrorTemplateTest.java‎ renamed to ‎hivemq-edge/src/test/java/com/hivemq/common/i18n/I18nErrorTemplateTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
import static org.assertj.core.api.Assertions.assertThat;
2323

24-
public class OpenAPIErrorTemplateTest {
24+
public class I18nErrorTemplateTest {
2525
@Test
2626
public void whenLocaleIsNull_thenUseDefaultLocale() {
27-
LocaleContext.setLocale(null);
28-
assertThat(LocaleContext.getLocale()).isEqualTo(LocaleContext.DEFAULT_LOCALE);
27+
I18nLocaleContext.setLocale(null);
28+
assertThat(I18nLocaleContext.getLocale()).isEqualTo(I18nLocaleContext.DEFAULT_LOCALE);
2929
}
3030
}

‎hivemq-edge/src/test/java/com/hivemq/common/i18n/OpenAPIHttpErrorTest.java‎ renamed to ‎hivemq-edge/src/test/java/com/hivemq/common/i18n/I18nHttpErrorTest.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,26 @@
3030
import java.util.Map;
3131
import java.util.Properties;
3232
import java.util.Set;
33+
import java.util.stream.Collectors;
3334

3435
import static org.assertj.core.api.Assertions.assertThat;
3536

36-
public class OpenAPIHttpErrorTest {
37+
public class I18nHttpErrorTest {
3738
@BeforeEach
3839
public void setUp() {
39-
LocaleContext.setLocale(Locale.US);
40+
I18nLocaleContext.setLocale(Locale.US);
4041
}
4142

4243
@AfterEach
4344
public void tearDown() {
44-
LocaleContext.setLocale(LocaleContext.DEFAULT_LOCALE);
45+
I18nLocaleContext.setLocale(I18nLocaleContext.DEFAULT_LOCALE);
4546
}
4647

4748
@Test
4849
public void whenLocaleIsEnUS_thenErrorCountShouldMatch() throws IOException {
49-
final List<OpenAPIHttpError> errors = Arrays.asList(OpenAPIHttpError.values());
50+
final List<I18nHttpError> errors = Arrays.asList(I18nHttpError.values());
5051
assertThat(errors.size()).isGreaterThan(0);
52+
assertThat(errors.stream().map(I18nHttpError::getResourceName).collect(Collectors.toSet())).hasSize(1);
5153
final Properties properties = new Properties();
5254
try (final StringReader stringReader = new StringReader(IOUtils.resourceToString(errors.get(0)
5355
.getResourceName(), StandardCharsets.UTF_8))) {
@@ -65,65 +67,65 @@ public void whenLocaleIsEnUS_thenErrorCountShouldMatch() throws IOException {
6567

6668
@Test
6769
public void whenLocaleIsEnUS_thenHttpError400ShouldWork() {
68-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_TITLE.get()).isEqualTo(
70+
assertThat(I18nHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_TITLE.get()).isEqualTo(
6971
"Query Parameter is Invalid");
70-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_DETAIL.get(Map.of("parameter",
72+
assertThat(I18nHttpError.HTTP_ERROR_400_INVALID_QUERY_PARAMETER_DETAIL.get(Map.of("parameter",
7173
"p1",
7274
"reason",
7375
"test."))).isEqualTo("Query parameter 'p1' is invalid: test.");
74-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_TITLE.get()).isEqualTo(
76+
assertThat(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_TITLE.get()).isEqualTo(
7577
"Required Request Body Missing");
76-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_DETAIL.get()).isEqualTo(
78+
assertThat(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_MISSING_DETAIL.get()).isEqualTo(
7779
"Required request body is missing.");
78-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_TITLE.get()).isEqualTo(
80+
assertThat(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_TITLE.get()).isEqualTo(
7981
"Required Request Body Parameter Missing");
80-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_DETAIL.get(Map.of("parameter",
82+
assertThat(I18nHttpError.HTTP_ERROR_400_REQUEST_BODY_PARAMETER_MISSING_DETAIL.get(Map.of("parameter",
8183
"p1"))).isEqualTo("Required request body parameter 'p1' is missing.");
82-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_TITLE.get()).isEqualTo(
84+
assertThat(I18nHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_TITLE.get()).isEqualTo(
8385
"Required URL Parameter Missing");
84-
assertThat(OpenAPIHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_DETAIL.get(Map.of("parameter",
85-
"p1"))).isEqualTo("Required URL parameter 'p1' is missing.");
86+
assertThat(I18nHttpError.HTTP_ERROR_400_URL_PARAMETER_MISSING_DETAIL.get(Map.of("parameter", "p1"))).isEqualTo(
87+
"Required URL parameter 'p1' is missing.");
8688
}
8789

8890
@Test
8991
public void whenLocaleIsEnUS_thenHttpError412ShouldWork() {
90-
assertThat(OpenAPIHttpError.HTTP_ERROR_412_TITLE.get()).isEqualTo("Precondition Failed");
91-
assertThat(OpenAPIHttpError.HTTP_ERROR_412_DETAIL.get(Map.of("reason", "test."))).isEqualTo(
92+
assertThat(I18nHttpError.HTTP_ERROR_412_TITLE.get()).isEqualTo("Precondition Failed");
93+
assertThat(I18nHttpError.HTTP_ERROR_412_DETAIL.get(Map.of("reason", "test."))).isEqualTo(
9294
"A precondition required for fulfilling the request was not fulfilled: test.");
9395
}
9496

9597
@Test
9698
public void whenLocaleIsEnUS_thenHttpError500ShouldWork() {
97-
assertThat(OpenAPIHttpError.HTTP_ERROR_500_TITLE.get()).isEqualTo("Internal Server Error");
98-
assertThat(OpenAPIHttpError.HTTP_ERROR_500_DETAIL_DEFAULT.get()).isEqualTo(
99+
assertThat(I18nHttpError.HTTP_ERROR_500_TITLE.get()).isEqualTo("Internal Server Error");
100+
assertThat(I18nHttpError.HTTP_ERROR_500_DETAIL_DEFAULT.get()).isEqualTo(
99101
"An unexpected error occurred, check the logs.");
100-
assertThat(OpenAPIHttpError.HTTP_ERROR_500_DETAIL_WITH_REASON.get(Map.of("reason", "test."))).isEqualTo(
102+
assertThat(I18nHttpError.HTTP_ERROR_500_DETAIL_WITH_REASON.get(Map.of("reason", "test."))).isEqualTo(
101103
"An unexpected error occurred: test.");
102104
}
103105

104106
@Test
105107
public void whenLocaleIsEnUS_thenHttpError503ShouldWork() {
106-
assertThat(OpenAPIHttpError.HTTP_ERROR_503_TITLE.get()).isEqualTo("Endpoint Temporarily not Available");
107-
assertThat(OpenAPIHttpError.HTTP_ERROR_503_DETAIL.get()).isEqualTo(
108+
assertThat(I18nHttpError.HTTP_ERROR_503_TITLE.get()).isEqualTo("Endpoint Temporarily not Available");
109+
assertThat(I18nHttpError.HTTP_ERROR_503_DETAIL.get()).isEqualTo(
108110
"The endpoint is temporarily not available, please try again later.");
109111
}
110112

111113
@Test
112114
public void whenLocaleIsEnUS_thenHttpError507ShouldWork() {
113-
assertThat(OpenAPIHttpError.HTTP_ERROR_507_TITLE.get()).isEqualTo("Insufficient Storage");
114-
assertThat(OpenAPIHttpError.HTTP_ERROR_507_DETAIL_DEFAULT.get()).isEqualTo("Insufficient Storage.");
115-
assertThat(OpenAPIHttpError.HTTP_ERROR_507_DETAIL_WITH_REASON.get(Map.of("reason", "test."))).isEqualTo(
115+
assertThat(I18nHttpError.HTTP_ERROR_507_TITLE.get()).isEqualTo("Insufficient Storage");
116+
assertThat(I18nHttpError.HTTP_ERROR_507_DETAIL_DEFAULT.get()).isEqualTo("Insufficient Storage.");
117+
assertThat(I18nHttpError.HTTP_ERROR_507_DETAIL_WITH_REASON.get(Map.of("reason", "test."))).isEqualTo(
116118
"Insufficient Storage: test.");
117119
}
118120

119121
@Test
120122
public void whenLocaleIsEnGB_thenHttpError500ShouldFail() {
121-
LocaleContext.setLocale(Locale.UK);
122-
assertThat(OpenAPIHttpError.HTTP_ERROR_500_TITLE.get()).isEqualTo(
123+
I18nLocaleContext.setLocale(Locale.UK);
124+
assertThat(I18nHttpError.HTTP_ERROR_500_TITLE.get()).isEqualTo(
123125
"Error: Template http.error.500.title for en_GB could not be loaded.");
124-
assertThat(OpenAPIHttpError.HTTP_ERROR_500_DETAIL_DEFAULT.get()).isEqualTo(
126+
assertThat(I18nHttpError.HTTP_ERROR_500_DETAIL_DEFAULT.get()).isEqualTo(
125127
"Error: Template http.error.500.detail.default for en_GB could not be loaded.");
126-
assertThat(OpenAPIHttpError.HTTP_ERROR_500_DETAIL_WITH_REASON.get(Map.of("reason", "test."))).isEqualTo(
128+
assertThat(I18nHttpError.HTTP_ERROR_500_DETAIL_WITH_REASON.get(Map.of("reason", "test."))).isEqualTo(
127129
"Error: Template http.error.500.detail.with.reason for en_GB could not be loaded.");
128130
}
129131
}

0 commit comments

Comments
 (0)