Use spring-messagesource-json

Author: alaugks

README.md

@@ -1,8 +1,7 @@
 # Example: Custom JSON Spring MessageSource
 
 
-This example shows how to use the [spring-messagesource-catalogue](https://github.com/alaugks/spring-messagesource-catalog) to implement a MessageSource from translations in JSON files.
-
+This example shows how to use [spring-messagesource-json](https://github.com/alaugks/spring-messagesource-json).
 
 ## Build and Run Docker Image
 

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.4.2</version>
         <relativePath/>
     </parent>
 
@@ -45,8 +45,8 @@
 
         <dependency>
             <groupId>io.github.alaugks</groupId>
-            <artifactId>spring-messagesource-catalog</artifactId>
-            <version>0.4.0</version>
+            <artifactId>spring-messagesource-json</artifactId>
+            <version>0.1.0</version>
         </dependency>
 
         <dependency>

src/main/java/dev/alaugks/spring/messagesource/json/catalog/JsonCatalog.java

@@ -1,10 +1,8 @@
 package dev.alaugks.spring.messagesource.json.config;
 
+import io.github.alaugks.spring.messagesource.catalog.resources.LocationPattern;
+import io.github.alaugks.spring.messagesource.json.JsonResourceMessageSource;
 import java.util.Locale;
-
-import dev.alaugks.spring.messagesource.json.catalog.JsonCatalog;
-import io.github.alaugks.spring.messagesource.catalog.CatalogMessageSourceBuilder;
-
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,9 +12,10 @@ public class MessageSourceConfig {
 
 	@Bean
 	public MessageSource messageSource() {
-		return CatalogMessageSourceBuilder
-				.builder(new JsonCatalog(), Locale.forLanguageTag("en"))
-				.build();
+		return JsonResourceMessageSource.builder(
+			Locale.forLanguageTag("en"),
+			new LocationPattern("messages/*")
+		).build();
 	}
 
 }

src/main/java/dev/alaugks/spring/messagesource/json/config/MessageSourceConfig.java

@@ -1,11 +1,11 @@
 package dev.alaugks.spring.messagesource.json;
 
-import dev.alaugks.spring.messagesource.json.catalog.JsonCatalog;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import dev.alaugks.spring.messagesource.json.config.MessageSourceConfig;
 import dev.alaugks.spring.messagesource.json.config.WebMvcConfigurerConfig;
 import dev.alaugks.spring.messagesource.json.controller.IndexController;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.context.annotation.Import;
@@ -15,11 +15,9 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 
 @WebMvcTest({IndexController.class})
-@Import({IndexController.class, JsonCatalog.class})
+@Import({IndexController.class})
 @ContextConfiguration(classes = {
 		MessageSourceConfig.class,
 		WebMvcConfigurerConfig.class