Version 0.2.0

README.md

@@ -90,7 +90,7 @@ public class MessageConfig {
     @Bean
     public MessageSource messageSource() {
         return CatalogMessageSourceBuilder
-            .builder(new TransUnitsCatalog(this.transUnits), Locale.forLanguageTag("en"))
+            .builder(this.transUnits, Locale.forLanguageTag("en"))
             .build();
 	}
 }
@@ -103,25 +103,26 @@ public class MessageConfig {
 ```java
 import java.util.List;
 
-import io.github.alaugks.spring.messagesource.catalog.catalog.CatalogAbstract;
+import io.github.alaugks.spring.messagesource.catalog.catalog.AbstractCatalog;
+import io.github.alaugks.spring.messagesource.catalog.catalog.Abstractcatalog;
 import io.github.alaugks.spring.messagesource.catalog.records.TransUnit;
 
-public class MyCustomCatalog extends CatalogAbstract {
+public class MyCustomCatalog extends AbstractCatalog {
 
-    List<TransUnit> transUnits;
-	
-    @Override
-    public List<TransUnit> getTransUnits() {
-        return this.transUnits;
-    }
-    
-    @Override
-    public void build() {
-        // Build a list with TransUnit from any kind of source.
-        this.transUnits = new ArrayList<>() {{
-            // ...
-        }};
-    }
+	List<TransUnit> transUnits;
+
+	@Override
+	public List<TransUnit> getTransUnits() {
+		return this.transUnits;
+	}
+
+	@Override
+	public void build() {
+		// Build a list with TransUnit from any kind of source.
+		this.transUnits = new ArrayList<>() {{
+			// ...
+		}};
+	}
 }
 ```
 

src/main/java/io/github/alaugks/spring/messagesource/catalog/CatalogMessageSourceBuilder.java

@@ -1,11 +1,13 @@
 package io.github.alaugks.spring.messagesource.catalog;
 
 import java.text.MessageFormat;
+import java.util.List;
 import java.util.Locale;
 
 import io.github.alaugks.spring.messagesource.catalog.catalog.Catalog;
 import io.github.alaugks.spring.messagesource.catalog.catalog.CatalogCache;
 import io.github.alaugks.spring.messagesource.catalog.catalog.CatalogInterface;
+import io.github.alaugks.spring.messagesource.catalog.records.TransUnit;
 
 import org.springframework.context.support.AbstractMessageSource;
 import org.springframework.util.Assert;
@@ -18,7 +20,15 @@ private CatalogMessageSourceBuilder(CatalogInterface catalog) {
 		this.catalog = catalog;
 	}
 
+	public static Builder builder(List<TransUnit> transUnits, Locale defaultLocale) {
+		Assert.notNull(transUnits, "Argument transUnits must not be null");
+
+		return builder(new TransUnitsCatalog(transUnits), defaultLocale);
+	}
+
 	public static Builder builder(CatalogInterface catalogSource, Locale defaultLocale) {
+		Assert.notNull(catalogSource, "Argument catalogSource must not be null");
+
 		return new Builder(catalogSource, defaultLocale);
 	}
 
@@ -31,7 +41,6 @@ public static final class Builder {
 		private String defaultDomain = Catalog.DEFAULT_DOMAIN;
 
 		public Builder(CatalogInterface catalogSource, Locale defaultLocale) {
-			Assert.notNull(catalogSource, "Argument catalogSource must not be null");
 			Assert.notNull(defaultLocale, "Argument defaultLocale must not be null");
 
 			this.catalogSource = catalogSource;

src/main/java/io/github/alaugks/spring/messagesource/catalog/TransUnitsCatalog.java

@@ -2,10 +2,10 @@
 
 import java.util.List;
 
-import io.github.alaugks.spring.messagesource.catalog.catalog.CatalogAbstract;
+import io.github.alaugks.spring.messagesource.catalog.catalog.AbstractCatalog;
 import io.github.alaugks.spring.messagesource.catalog.records.TransUnit;
 
-public class TransUnitsCatalog extends CatalogAbstract {
+public class TransUnitsCatalog extends AbstractCatalog {
 
 	List<TransUnit> transUnits;
 

src/main/java/io/github/alaugks/spring/messagesource/catalog/catalog/CatalogAbstract.java → src/main/java/io/github/alaugks/spring/messagesource/catalog/catalog/AbstractCatalog.java

@@ -7,7 +7,7 @@
 
 import io.github.alaugks.spring.messagesource.catalog.records.TransUnit;
 
-public abstract class CatalogAbstract implements CatalogInterface {
+public abstract class AbstractCatalog implements CatalogInterface {
 
 	protected CatalogInterface nextHandler;
 

src/main/java/io/github/alaugks/spring/messagesource/catalog/catalog/Catalog.java

@@ -8,7 +8,7 @@
 
 import org.springframework.util.Assert;
 
-public final class Catalog extends CatalogAbstract {
+public final class Catalog extends AbstractCatalog {
 
 	public static final String DEFAULT_DOMAIN = "messages";
 

src/main/java/io/github/alaugks/spring/messagesource/catalog/catalog/CatalogCache.java

@@ -6,7 +6,7 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
-public final class CatalogCache extends CatalogAbstract {
+public final class CatalogCache extends AbstractCatalog {
 
 	private final Map<Locale, Map<String, String>> cacheMap = new ConcurrentHashMap<>();
 

src/test/java/io/github/alaugks/spring/messagesource/catalog/CatalogMessageSourceBuilderTest.java

@@ -1,6 +1,5 @@
 package io.github.alaugks.spring.messagesource.catalog;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -18,21 +17,37 @@ class CatalogMessageSourceBuilderTest {
 	public final Locale locale = Locale.forLanguageTag("en");
 
 	@Test
-	void test_withoutSetDefaultDomain() {
-		List<TransUnit> transUnits = Arrays.asList(
-				new TransUnit(this.locale, "key", "messages_value"),
-				new TransUnit(this.locale, "key", "foo_value", "foo")
+	void test_builder_withList() {
+		List<TransUnit> transUnits = List.of(
+				new TransUnit(this.locale, "key", "messages_value")
 		);
 
 		assertEquals(
 				"messages_value",
-				CatalogMessageSourceBuilder.builder(new TransUnitsCatalog(transUnits), this.locale).build().getMessage("key", null, this.locale)
+				CatalogMessageSourceBuilder
+						.builder(transUnits, this.locale)
+						.build().getMessage("key", null, this.locale)
+		);
+	}
+
+	@Test
+	void test_builder_withCatalogInterface() {
+		List<TransUnit> transUnits = List.of(
+				new TransUnit(this.locale, "key", "messages_value")
+		);
+
+		assertEquals(
+				"messages_value",
+				CatalogMessageSourceBuilder
+						.builder(new TransUnitsCatalog(transUnits), this.locale)
+						.build()
+						.getMessage("key", null, this.locale)
 		);
 	}
 
 	@Test
 	void test_withSetDefaultDomain() {
-		List<TransUnit> transUnits = Arrays.asList(
+		List<TransUnit> transUnits = List.of(
 				new TransUnit(this.locale, "key", "messages_value"),
 				new TransUnit(this.locale, "key", "foo_value", "foo")
 		);