diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSource.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSource.java index 223b3ca..0e06ebc 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSource.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSource.java @@ -25,15 +25,15 @@ public class XliffTranslationMessageSource implements MessageSource { private XliffTranslationMessageSource(Builder builder) { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(builder.defaultLocale) - .basenamesPattern(builder.basenames) - .build(); + .builder() + .defaultLocale(builder.defaultLocale) + .basenamesPattern(builder.basenames) + .build(); this.catalogHandler = new CatalogHandler( - CatalogBuilder.builder(resourcesLoader) - .transUnitIdentifier(builder.transUnitIdentifier) - .build(), + CatalogBuilder.builder(resourcesLoader) + .transUnitIdentifier(builder.transUnitIdentifier) + .build(), builder.cache, builder.defaultLocale, builder.defaultDomain ); @@ -99,7 +99,6 @@ public XliffTranslationMessageSource build() { // Basenames Assert.notEmpty(this.basenames, "Basename(s) is not set"); - return new XliffTranslationMessageSource(this); } } @@ -107,8 +106,8 @@ public XliffTranslationMessageSource build() { @Nullable public String getMessage(String code, @Nullable Object[] args, @Nullable String defaultMessage, Locale locale) { return this.format( - this.internalMessageWithDefaultMessage(code, defaultMessage, locale), - args + this.internalMessageWithDefaultMessage(code, defaultMessage, locale), + args ); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/Catalog.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/Catalog.java index bc54bce..7cb86b0 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/Catalog.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/Catalog.java @@ -2,7 +2,6 @@ import io.github.alaugks.spring.messagesource.xliff.catalog.finder.CatalogFileAdapter; import io.github.alaugks.spring.messagesource.xliff.catalog.finder.CatalogFinder; - import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -31,9 +30,9 @@ public Map> getAll() { @Override public String get(Locale locale, String code) { CatalogFinder finder = new CatalogFinder( - new CatalogFileAdapter(this.getAll()), - this.defaultLocale, - this.domain + new CatalogFileAdapter(this.getAll()), + this.defaultLocale, + this.domain ); String message = finder.find(locale, code); @@ -49,12 +48,12 @@ public void put(Locale locale, String domain, String code, String value) { if (!locale.toString().isEmpty()) { String localeKey = CatalogUtilities.localeToLocaleKey(locale); this.catalogMap.putIfAbsent( - localeKey, - new HashMap<>() + localeKey, + new HashMap<>() ); this.catalogMap.get(localeKey).putIfAbsent( - CatalogUtilities.concatCode(domain, code), - value + CatalogUtilities.concatCode(domain, code), + value ); } } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandler.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandler.java index 1aa05a0..95c1034 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandler.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandler.java @@ -5,6 +5,7 @@ import java.util.Map; abstract class CatalogAbstractHandler implements CatalogInterface { + protected CatalogInterface nextHandler; public CatalogInterface setNextHandler(CatalogInterface handler) { diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogBuilder.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogBuilder.java index 9e707d4..7b39b89 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogBuilder.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogBuilder.java @@ -10,16 +10,15 @@ import io.github.alaugks.spring.messagesource.xliff.exception.XliffMessageSourceSAXParseFatalErrorException; import io.github.alaugks.spring.messagesource.xliff.exception.XliffMessageSourceVersionSupportException; import io.github.alaugks.spring.messagesource.xliff.ressources.ResourcesLoader; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; - +import java.io.IOException; +import java.util.List; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import java.io.IOException; -import java.util.List; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.SAXException; public final class CatalogBuilder { @@ -27,8 +26,8 @@ public final class CatalogBuilder { private Catalog catalog; private final List transUnitIdentifier; List supportedVersions = List.of( - new XliffVersion12(), - new XliffVersion2() + new XliffVersion12(), + new XliffVersion2() ); public CatalogBuilder(Builder builder) { @@ -111,7 +110,7 @@ private void readFile(List translationFiles) throws ParserC xliffReader.read(this.catalog, xliffDocument, translationFile.getDomain(), translationFile.getLocale()); } else { throw new XliffMessageSourceVersionSupportException( - String.format("XLIFF version \"%s\" not supported.", xliffVersion) + String.format("XLIFF version \"%s\" not supported.", xliffVersion) ); } } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCache.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCache.java index 16c1d1c..b314bcf 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCache.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCache.java @@ -28,12 +28,12 @@ public Map> getAll() { items.forEach((code, value) -> { String[] split = code.toString().split("\\|"); result.putIfAbsent( - split[0], - new HashMap<>() + split[0], + new HashMap<>() ); result.get(split[0]).putIfAbsent( - split[1], - value.toString() + split[1], + value.toString() ); }); return result; @@ -46,9 +46,9 @@ public Map> getAll() { public String get(Locale locale, String code) { CatalogFinder finder = new CatalogFinder( - new CatalogCacheAdapter(this.cache), - this.defaultLocale, - this.domain + new CatalogCacheAdapter(this.cache), + this.defaultLocale, + this.domain ); String message = finder.find(locale, code); @@ -67,19 +67,19 @@ public void put(Locale locale, String domain, String code, String value) { public void put(Locale locale, String code, String value) { if (!locale.toString().isEmpty()) { this.cache.putIfAbsent( - CatalogUtilities.createCode(locale, code), - value + CatalogUtilities.createCode(locale, code), + value ); } } public void initCache() { super.getAll().forEach((langCode, catalogDomain) -> catalogDomain.forEach((code, value) -> - this.put( - Locale.forLanguageTag(langCode.replace("_", "-")), - code, - value - ) + this.put( + Locale.forLanguageTag(langCode.replace("_", "-")), + code, + value + ) )); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandler.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandler.java index 74beaba..97ca084 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandler.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandler.java @@ -6,17 +6,18 @@ import org.springframework.cache.Cache; public final class CatalogHandler { + private final CatalogCache catalogCache; public CatalogHandler( - CatalogBuilder catalogBuilder, + CatalogBuilder catalogBuilder, Cache cache, - Locale defaultLocale, + Locale defaultLocale, String defaultDomain ) { this.catalogCache = new CatalogCache(defaultLocale, defaultDomain, cache); this.catalogCache.setNextHandler( - catalogBuilder.createCatalog(new Catalog(defaultLocale, defaultDomain)) + catalogBuilder.createCatalog(new Catalog(defaultLocale, defaultDomain)) ); } @@ -43,9 +44,9 @@ public Translation get(Locale locale, String code) { void put(Locale locale, String code, String value) { this.catalogCache.put( - locale, - code, - value + locale, + code, + value ); } @@ -54,6 +55,7 @@ public void initCache() { } public static class Translation { + String code; String value; diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogInterface.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogInterface.java index 373e69a..ce9aef7 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogInterface.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogInterface.java @@ -4,10 +4,12 @@ import java.util.Map; public interface CatalogInterface { + CatalogInterface setNextHandler(CatalogInterface handler); // HashMap<"language+region", HashMap<"code", "value">> Map> getAll(); + String get(Locale locale, String code); void put(Locale locale, String domain, String code, String value); diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogAdapterInterface.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogAdapterInterface.java index 915181c..0d0ea39 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogAdapterInterface.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogAdapterInterface.java @@ -3,5 +3,6 @@ import java.util.Locale; public interface CatalogAdapterInterface { + String find(Locale locale, String code); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapter.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapter.java index 6e96b05..cd63815 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapter.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapter.java @@ -1,12 +1,12 @@ package io.github.alaugks.spring.messagesource.xliff.catalog.finder; import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogUtilities; -import org.springframework.cache.Cache; - import java.util.Locale; import java.util.Objects; +import org.springframework.cache.Cache; public class CatalogCacheAdapter implements CatalogAdapterInterface { + private final Cache cache; public CatalogCacheAdapter(Cache cache) { @@ -16,7 +16,7 @@ public CatalogCacheAdapter(Cache cache) { @Override public String find(Locale locale, String code) { Cache.ValueWrapper valueWrapper = this.cache.get( - CatalogUtilities.createCode(locale, code) + CatalogUtilities.createCode(locale, code) ); if (valueWrapper != null) { diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapter.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapter.java index 028a8e1..774bf1c 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapter.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapter.java @@ -1,7 +1,6 @@ package io.github.alaugks.spring.messagesource.xliff.catalog.finder; import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogUtilities; - import java.util.Locale; import java.util.Map; diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinder.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinder.java index 8090150..f1d8eaf 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinder.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinder.java @@ -1,10 +1,10 @@ package io.github.alaugks.spring.messagesource.xliff.catalog.finder; import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogUtilities; - import java.util.Locale; public final class CatalogFinder { + private final CatalogAdapterInterface adapter; private final Locale defaultLocale; private final String domain; @@ -50,11 +50,7 @@ private String fromCatalog(Locale locale, String code) { // Code+DefaultLanguage / DomainCode+DefaultLanguage value = this.fromCatalogSubStep(defaultLocaleLang, code); - if (value != null) { - return value; - } - - return null; + return value; } private String fromCatalogSubStep(Locale locale, String code) { diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocument.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocument.java index 4fcd0fc..d98a369 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocument.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocument.java @@ -30,13 +30,13 @@ public Set getTransUnits(String transUnitName, List translati } public boolean isXliffDocument() { - // Simple test: Filter if root element not + // Simple test: Filter if root element return root.getNodeName().equals("xliff"); } public String getXliffVersion() { return this.getAttributeValue( - root.getAttributes().getNamedItem("version") + root.getAttributes().getNamedItem("version") ); } @@ -59,10 +59,10 @@ private Set getNodes() { String code = this.getCode(node); if (code != null) { transUnits.add( - new TransUnit( - code, - this.getTargetValue(node) - ) + new TransUnit( + code, + this.getTargetValue(node) + ) ); } } @@ -71,7 +71,7 @@ private Set getNodes() { } private String getCode( - Element translationUnit + Element translationUnit ) { if (this.translationUnitIdentifiers != null) { for (String name : this.translationUnitIdentifiers) { @@ -91,9 +91,9 @@ private String getTargetValue(Element translationNodeElement) { private String getElementValue(Element translationNodeElement) { return this.getCharacterDataFromElement( - this.getFirstChild( - translationNodeElement.getElementsByTagName("target") - ) + this.getFirstChild( + translationNodeElement.getElementsByTagName("target") + ) ); } @@ -113,11 +113,12 @@ private Node getFirstChild(NodeList nodeList) { private String getAttributeValue(Node translationNode, String attributeName) { return this.getAttributeValue( - translationNode.getAttributes().getNamedItem(attributeName) + translationNode.getAttributes().getNamedItem(attributeName) ); } public static class TransUnit { + private final String code; private final String value; diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion12.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion12.java index c0a1166..84841b8 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion12.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion12.java @@ -25,7 +25,7 @@ public void setTransUnitIdentifier(List unitIdentifier @Override public void read(CatalogInterface catalog, XliffDocument document, String domain, Locale locale) { document.getTransUnits("trans-unit", this.transUnitIdentifier.getList()).forEach( - transUnit -> catalog.put(locale, domain, transUnit.getCode(), transUnit.getTargetValue()) + transUnit -> catalog.put(locale, domain, transUnit.getCode(), transUnit.getTargetValue()) ); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion2.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion2.java index de3c999..d34f5be 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion2.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion2.java @@ -25,7 +25,7 @@ public void setTransUnitIdentifier(List unitIdentifier @Override public void read(CatalogInterface catalog, XliffDocument document, String domain, Locale locale) { document.getTransUnits("segment", this.transUnitIdentifier.getList()).forEach( - transUnit -> catalog.put(locale, domain, transUnit.getCode(), transUnit.getTargetValue()) + transUnit -> catalog.put(locale, domain, transUnit.getCode(), transUnit.getTargetValue()) ); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersionInterface.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersionInterface.java index 5b4ba76..dcc1ed2 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersionInterface.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersionInterface.java @@ -1,11 +1,11 @@ package io.github.alaugks.spring.messagesource.xliff.catalog.xliff; import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogInterface; - import java.util.List; import java.util.Locale; public interface XliffVersionInterface { + boolean support(String version); void setTransUnitIdentifier(List unitIdentifiers); diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/SaxErrorHandler.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/SaxErrorHandler.java index 074d2d8..6a96072 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/SaxErrorHandler.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/SaxErrorHandler.java @@ -4,6 +4,7 @@ import org.xml.sax.SAXParseException; public class SaxErrorHandler implements ErrorHandler { + @Override public void warning(SAXParseException exception) { throw new XliffMessageSourceSAXParseWarningException(exception); diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceCacheNotExistsException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceCacheNotExistsException.java index ea205bb..0e6898f 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceCacheNotExistsException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceCacheNotExistsException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceCacheNotExistsException extends RuntimeException { + public XliffMessageSourceCacheNotExistsException(String message) { super(message); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceRuntimeException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceRuntimeException.java index 3f4ea5b..1bfaa1e 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceRuntimeException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceRuntimeException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceRuntimeException extends RuntimeException { + public XliffMessageSourceRuntimeException(Throwable cause) { super(cause); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseErrorException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseErrorException.java index 527103a..6633356 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseErrorException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseErrorException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceSAXParseErrorException extends XliffMessageSourceSAXParseException { + public XliffMessageSourceSAXParseErrorException(Throwable cause) { super(cause); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseException.java index aa532ee..87cdf80 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceSAXParseException extends RuntimeException { + public XliffMessageSourceSAXParseException(Throwable cause) { super(cause); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseFatalErrorException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseFatalErrorException.java index 38e9ae4..7e0aead 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseFatalErrorException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseFatalErrorException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceSAXParseFatalErrorException extends XliffMessageSourceSAXParseException { + public XliffMessageSourceSAXParseFatalErrorException(Throwable cause) { super(cause); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseWarningException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseWarningException.java index 7a81f78..07a8c12 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseWarningException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceSAXParseWarningException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceSAXParseWarningException extends XliffMessageSourceSAXParseException { + public XliffMessageSourceSAXParseWarningException(Throwable cause) { super(cause); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceVersionSupportException.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceVersionSupportException.java index d9d01b8..1b36d20 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceVersionSupportException.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/exception/XliffMessageSourceVersionSupportException.java @@ -1,6 +1,7 @@ package io.github.alaugks.spring.messagesource.xliff.exception; public class XliffMessageSourceVersionSupportException extends RuntimeException { + public XliffMessageSourceVersionSupportException(String message) { super(message); } diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParser.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParser.java index d2ec67a..7861005 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParser.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParser.java @@ -1,13 +1,13 @@ package io.github.alaugks.spring.messagesource.xliff.ressources; import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogUtilities; - import java.util.IllformedLocaleException; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; final class ResourcesFileNameParser { + private final String filename; public ResourcesFileNameParser(String filename) { @@ -24,15 +24,16 @@ public Dto parse() { String language = this.getGroup(matcher, "language"); String region = this.getGroup(matcher, "region"); return new Dto( - domain, - language, - region + domain, + language, + region ); } return null; } public static class Dto { + private final String domain; private final String language; private final String region; diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoader.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoader.java index 76f4da2..bdcab9f 100644 --- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoader.java +++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoader.java @@ -54,7 +54,7 @@ public List getTranslationFiles() throws IOException { for (Resource resource : resources) { if (this.isFileExtensionSupported(resource)) { Dto dto = this.parseFileName(resource); - if(dto != null) { + if (dto != null) { translationFiles.add(dto); } } @@ -68,11 +68,11 @@ private Dto parseFileName(Resource resource) throws IOException { ResourcesFileNameParser.Dto dto = new ResourcesFileNameParser(resource.getFilename()).parse(); if (dto != null) { return new Dto( - dto.getDomain(), - dto.hasLocale() - ? dto.getLocale() - : this.defaultLocale, - resource.getInputStream() + dto.getDomain(), + dto.hasLocale() + ? dto.getLocale() + : this.defaultLocale, + resource.getInputStream() ); } return null; @@ -84,6 +84,7 @@ private boolean isFileExtensionSupported(Resource resource) { } public static class Dto { + private final String domain; private final Locale locale; private final InputStream inputStream; @@ -109,8 +110,9 @@ public InputStream getInputStream() { private String getFileExtension(String filename) { return Optional.ofNullable(filename) - .filter(f -> f.contains(".")) - .map(f -> f.substring(filename.lastIndexOf(".") + 1)).orElse(null); + .filter(f -> f.contains(".")) + .map(f -> f.substring(filename.lastIndexOf(".") + 1)) + .orElse(null); } private Set getBasenameSet() { diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/TestUtilities.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/TestUtilities.java index 56fb33f..ac0f900 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/TestUtilities.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/TestUtilities.java @@ -28,11 +28,11 @@ public class TestUtilities { public static Catalog getTestCatalog() { return CatalogBuilder - .builder(getResourcesLoader()) - .build() - .createCatalog( - new Catalog(Locale.forLanguageTag("en"), "messages") - ); + .builder(getResourcesLoader()) + .build() + .createCatalog( + new Catalog(Locale.forLanguageTag("en"), "messages") + ); } public static Cache getCache() { @@ -47,13 +47,14 @@ public static CacheManager getMockedCacheManager(String cacheName) { public static ResourcesLoader getResourcesLoader() { return ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(listToSet("translations/*")) - .build(); + .build(); } - public static Document getDocument(InputStream inputStream) throws ParserConfigurationException, SAXException, IOException { + public static Document getDocument(InputStream inputStream) + throws ParserConfigurationException, SAXException, IOException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); return builder.parse(inputStream); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceCasesTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceCasesTest.java index 903305b..6d1e08d 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceCasesTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceCasesTest.java @@ -12,10 +12,10 @@ class XliffTranslationMessageSourceCasesTest { void test_setDefaultDomain() { var messageSource = XliffTranslationMessageSource .builder(TestUtilities.getCache()) - .basenamePattern("translations/*") - .defaultLocale(Locale.forLanguageTag("en")) - .defaultDomain("otherdomain") - .build(); + .basenamePattern("translations/*") + .defaultLocale(Locale.forLanguageTag("en")) + .defaultDomain("otherdomain") + .build(); assertEquals("Hello World (otherdomain / en)", messageSource.getMessage( "hello_world", @@ -28,14 +28,14 @@ void test_setDefaultDomain() { void test_setBasenamesPattern() { var messageSource = XliffTranslationMessageSource .builder(TestUtilities.getCache()) - .basenamesPattern( - List.of( - "translations_en/*", - "translations_de/*" - ) + .basenamesPattern( + List.of( + "translations_en/*", + "translations_de/*" ) - .defaultLocale(Locale.forLanguageTag("en")) - .build(); + ) + .defaultLocale(Locale.forLanguageTag("en")) + .build(); assertEquals( "Hello World (messages / en)", diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceTest.java index fa717bf..d37fbd5 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffTranslationMessageSourceTest.java @@ -32,9 +32,9 @@ class XliffTranslationMessageSourceTest { static void beforeAll() { messageSource = XliffTranslationMessageSource .builder(TestUtilities.getCache()) - .basenamePattern("translations/*") - .defaultLocale(Locale.forLanguageTag("en")) - .build(); + .basenamePattern("translations/*") + .defaultLocale(Locale.forLanguageTag("en")) + .build(); messageSource.initCache(); } @@ -254,24 +254,24 @@ void test_getMessage_Resolvable_NoSuchMessageException() { private static Stream dataProvider_fallback() { return Stream.of( - Arguments.of( - "hello_world", - null, - Locale.forLanguageTag("jp"), - "Hello World (messages / en)" - ), - Arguments.of( - "hello_world", - null, - Locale.forLanguageTag("en-GB"), - "Hello World (messages / en)" - ), - Arguments.of( - "hello_world", - null, - Locale.forLanguageTag("en-US"), - "Hello World (messages / en_US)" - ) + Arguments.of( + "hello_world", + null, + Locale.forLanguageTag("jp"), + "Hello World (messages / en)" + ), + Arguments.of( + "hello_world", + null, + Locale.forLanguageTag("en-GB"), + "Hello World (messages / en)" + ), + Arguments.of( + "hello_world", + null, + Locale.forLanguageTag("en-US"), + "Hello World (messages / en_US)" + ) ); } diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandlerTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandlerTest.java index 4b74875..3ecf5b1 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandlerTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogAbstractHandlerTest.java @@ -78,8 +78,8 @@ void test_initCache() { // Key must exist assertEquals( - "value", - cacheAsArray.get(key) + "value", + cacheAsArray.get(key) ); } } diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCacheTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCacheTest.java index 392735d..b876713 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCacheTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogCacheTest.java @@ -11,14 +11,15 @@ @SuppressWarnings("java:S5778") class CatalogCacheTest { + private CatalogCache catalogCache; private Locale locale; @BeforeEach void beforeEach() { this.catalogCache = new CatalogCache( - Locale.forLanguageTag("en"), - "messages", + Locale.forLanguageTag("en"), + "messages", TestUtilities.getCache() ); this.locale = Locale.forLanguageTag("en"); @@ -41,12 +42,12 @@ void test_getAll() { var transDe = all.get(de.toString()); assertAll( - () -> assertEquals("value_m_en_1", transEn.get("messages.m_en_1")), - () -> assertEquals("value_m_en_2", transEn.get("messages.m_en_2")), - () -> assertEquals("value_d_en_1", transEn.get("domain.d_en_1")), - () -> assertEquals("value_m_de_1", transDe.get("messages.m_de_1")), - () -> assertEquals("value_m_de_2", transDe.get("messages.m_de_2")), - () -> assertEquals("value_d_de_1", transDe.get("domain.d_de_1")) + () -> assertEquals("value_m_en_1", transEn.get("messages.m_en_1")), + () -> assertEquals("value_m_en_2", transEn.get("messages.m_en_2")), + () -> assertEquals("value_d_en_1", transEn.get("domain.d_en_1")), + () -> assertEquals("value_m_de_1", transDe.get("messages.m_de_1")), + () -> assertEquals("value_m_de_2", transDe.get("messages.m_de_2")), + () -> assertEquals("value_d_de_1", transDe.get("domain.d_de_1")) ); } diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandlerTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandlerTest.java index 4cd346b..174c085 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandlerTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogHandlerTest.java @@ -16,9 +16,9 @@ class CatalogHandlerTest { void beforeEach() { this.locale = Locale.forLanguageTag("en"); this.catalogHandler = new CatalogHandler( - CatalogBuilder - .builder(TestUtilities.getResourcesLoader()) - .build(), + CatalogBuilder + .builder(TestUtilities.getResourcesLoader()) + .build(), TestUtilities.getCache(), Locale.forLanguageTag("en"), "messages" ); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogTest.java index 53dab6c..02f0836 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogTest.java @@ -1,13 +1,12 @@ package io.github.alaugks.spring.messagesource.xliff.catalog; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.Locale; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import java.util.Locale; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + class CatalogTest { static Catalog catalog = new Catalog(Locale.forLanguageTag("en"), "foo"); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogUtilitiesTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogUtilitiesTest.java index 9a17c81..55b461c 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogUtilitiesTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogUtilitiesTest.java @@ -1,10 +1,9 @@ package io.github.alaugks.spring.messagesource.xliff.catalog; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Locale; - -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; class CatalogUtilitiesTest { diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapterTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapterTest.java index 9e19f02..98c5023 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapterTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogCacheAdapterTest.java @@ -11,6 +11,7 @@ class CatalogCacheAdapterTest { + @Test void test_find() { Cache cache = TestUtilities.getCache(); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapterTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapterTest.java index edc49b0..225a68e 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapterTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFileAdapterTest.java @@ -1,15 +1,15 @@ package io.github.alaugks.spring.messagesource.xliff.catalog.finder; -import io.github.alaugks.spring.messagesource.xliff.catalog.Catalog; -import org.junit.jupiter.api.Test; - -import java.util.Locale; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import io.github.alaugks.spring.messagesource.xliff.catalog.Catalog; +import java.util.Locale; +import org.junit.jupiter.api.Test; + class CatalogFileAdapterTest { + @Test void test_find() { Catalog catalog = new Catalog(Locale.forLanguageTag("en"), "messages"); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinderTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinderTest.java index 04fb77b..03a16a1 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinderTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/finder/CatalogFinderTest.java @@ -21,8 +21,8 @@ void test_emptyLocale() { var finder = new CatalogFinder( new CatalogCacheAdapter(cache), - Locale.forLanguageTag("en"), - "domain" + Locale.forLanguageTag("en"), + "domain" ); assertNull(finder.find(Locale.forLanguageTag(""), "domain.m_key_1")); @@ -47,8 +47,8 @@ void test_find_defaultLanguage() { var finder = new CatalogFinder( new CatalogCacheAdapter(cache), - Locale.forLanguageTag("en"), - "messages" + Locale.forLanguageTag("en"), + "messages" ); // messages @@ -80,7 +80,6 @@ void test_find_defaultLanguage() { assertEquals("m_value_en_1", finder.find(Locale.forLanguageTag("it-CH"), "messages.m_key_1")); assertEquals("m_value_en_1", finder.find(Locale.forLanguageTag("it-CH"), "m_key_1")); - // domain assertEquals("d_value_en_1", finder.find(Locale.forLanguageTag("en"), "domain.d_key_1")); @@ -124,8 +123,8 @@ void test_find_defaultLanguageRegion() { var finder = new CatalogFinder( new CatalogCacheAdapter(cache), - Locale.forLanguageTag("en-GB"), - "messages" + Locale.forLanguageTag("en-GB"), + "messages" ); // messages @@ -160,7 +159,6 @@ void test_find_defaultLanguageRegion() { assertEquals("m_value_en_1", finder.find(Locale.forLanguageTag("it-CH"), "messages.m_key_1")); assertEquals("m_value_en_1", finder.find(Locale.forLanguageTag("it-CH"), "m_key_1")); - // domain assertEquals("d_value_en_1", finder.find(Locale.forLanguageTag("en"), "domain.d_key_1")); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/CatalogBuilderTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/CatalogBuilderTest.java index 3f1213d..d2f3dac 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/CatalogBuilderTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/CatalogBuilderTest.java @@ -21,14 +21,14 @@ class CatalogBuilderTest { @Test void test_createCatalog() { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations/*")) - .build(); + .build(); CatalogBuilder catalogBuilder = CatalogBuilder - .builder(resourcesLoader) - .build(); + .builder(resourcesLoader) + .build(); CatalogInterface catalog = catalogBuilder.createCatalog(new Catalog(Locale.forLanguageTag("en"), "messages")); assertEquals("Hello World (messages / en)", catalog.get(Locale.forLanguageTag("en"), "messages.hello_world")); @@ -38,19 +38,19 @@ void test_createCatalog() { void test_createCatalog_versionNotSupported() { Catalog catalog = new Catalog(Locale.forLanguageTag("en"), "messages"); ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en-GB")) + .builder() + .defaultLocale(Locale.forLanguageTag("en-GB")) .basenamesPattern(TestUtilities.listToSet("fixtures/*")) - .build(); + .build(); CatalogBuilder catalogBuilder = CatalogBuilder - .builder(resourcesLoader) - .build(); + .builder(resourcesLoader) + .build(); XliffMessageSourceVersionSupportException exception = assertThrows( - XliffMessageSourceVersionSupportException.class, () -> { - catalogBuilder.createCatalog(catalog); - } + XliffMessageSourceVersionSupportException.class, () -> { + catalogBuilder.createCatalog(catalog); + } ); assertEquals("XLIFF version \"1.0\" not supported.", exception.getMessage()); } @@ -60,32 +60,32 @@ void test_createCatalog_parseError() { var catalog = new Catalog(Locale.forLanguageTag("en"), "messages"); ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations_broken/*")) - .build(); + .build(); CatalogBuilder catalogBuilder = CatalogBuilder - .builder(resourcesLoader) - .build(); + .builder(resourcesLoader) + .build(); assertThrows( - XliffMessageSourceSAXParseException.class, () -> catalogBuilder.createCatalog(catalog) + XliffMessageSourceSAXParseException.class, () -> catalogBuilder.createCatalog(catalog) ); assertThrows( - XliffMessageSourceSAXParseFatalErrorException.class, () -> catalogBuilder.createCatalog(catalog) + XliffMessageSourceSAXParseFatalErrorException.class, () -> catalogBuilder.createCatalog(catalog) ); } @Test void test_supportedVersions() { var xliffCatalog = CatalogBuilder - .builder( - ResourcesLoader - .builder() - .build() - ).build(); + .builder( + ResourcesLoader + .builder() + .build() + ).build(); assertInstanceOf(XliffVersion12.class, xliffCatalog.getReader("1.2")); assertInstanceOf(XliffVersion2.class, xliffCatalog.getReader("2.0")); @@ -95,12 +95,12 @@ void test_supportedVersions() { @Test void test_versionNotSupported() { var xliffCatalog = CatalogBuilder - .builder( - ResourcesLoader - .builder() - .build() - ) - .build(); + .builder( + ResourcesLoader + .builder() + .build() + ) + .build(); assertNull(xliffCatalog.getReader("1.0")); } } diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12XliffIdentifierTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12XliffIdentifierTest.java index 16fea0d..62e4201 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12XliffIdentifierTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12XliffIdentifierTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; class Xliff12XliffIdentifierTest { + @Test void test_default() { var identifier = new Xliff12XliffIdentifier(); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2XliffIdentifierTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2XliffIdentifierTest.java index feeee33..a4c3a0b 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2XliffIdentifierTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2XliffIdentifierTest.java @@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test; class Xliff2XliffIdentifierTest { + @Test void test_default() { var identifier = new Xliff2XliffIdentifier(); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocumentTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocumentTest.java index 6b6bbd7..3da7b7d 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocumentTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffDocumentTest.java @@ -40,12 +40,13 @@ void test_fail() throws ParserConfigurationException, IOException, SAXException } @Test - void test_getElementValue_getCharacterDataFromElement_TextNode() throws ParserConfigurationException, IOException, SAXException { + void test_getElementValue_getCharacterDataFromElement_TextNode() + throws ParserConfigurationException, IOException, SAXException { Map transUnits = new HashMap<>(); var xliffDocument = new XliffDocument(TestUtilities.getDocument("fixtures/xliff-value-test.xliff")); xliffDocument.getTransUnits("segment", List.of("id")).forEach( - transUnit -> transUnits.put(transUnit.getCode(), transUnit.getTargetValue()) + transUnit -> transUnits.put(transUnit.getCode(), transUnit.getTargetValue()) ); assertEquals("value", transUnits.get("element")); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion20Test.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion20Test.java index b2a8865..6f1eeab 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion20Test.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion20Test.java @@ -12,6 +12,7 @@ import org.xml.sax.SAXException; class XliffVersion20Test { + @Test void test_readXliffFile() throws ParserConfigurationException, IOException, SAXException { var document = new XliffDocument(TestUtilities.getDocument("fixtures/xliff20.xliff")); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion21Test.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion21Test.java index ee2982b..f0adc43 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion21Test.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffVersion21Test.java @@ -12,6 +12,7 @@ import org.xml.sax.SAXException; class XliffVersion21Test { + @Test void test_readXliffFile() throws ParserConfigurationException, IOException, SAXException { var document = new XliffDocument(TestUtilities.getDocument("fixtures/xliff21.xliff")); diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParserTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParserTest.java index b15743c..dd9194b 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParserTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesFileNameParserTest.java @@ -1,8 +1,11 @@ package io.github.alaugks.spring.messagesource.xliff.ressources; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; class ResourcesFileNameParserTest { diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoaderTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoaderTest.java index 2fbad73..6bc3295 100644 --- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoaderTest.java +++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/ressources/ResourcesLoaderTest.java @@ -14,10 +14,10 @@ class ResourcesLoaderTest { @Test void test_setBasenamePattern() throws IOException { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations/*")) - .build(); + .build(); assertEquals(5, resourcesLoader.getTranslationFiles().size()); } @@ -25,10 +25,10 @@ void test_setBasenamePattern() throws IOException { @Test void test_setBasenamePattern_domainMessages() throws IOException { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations/messages*")) - .build(); + .build(); assertEquals(3, resourcesLoader.getTranslationFiles().size()); } @@ -37,10 +37,10 @@ void test_setBasenamePattern_domainMessages() throws IOException { @Test void test_setBasenamePattern_languageDe() throws IOException { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations/*_de*")) - .build(); + .build(); assertEquals(2, resourcesLoader.getTranslationFiles().size()); } @@ -48,10 +48,10 @@ void test_setBasenamePattern_languageDe() throws IOException { @Test void test_setBasenamesPattern() throws IOException { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations_en/*", "translations_de/*")) - .build(); + .build(); assertEquals(4, resourcesLoader.getTranslationFiles().size()); } @@ -59,10 +59,10 @@ void test_setBasenamesPattern() throws IOException { @Test void test_Dto() throws IOException { ResourcesLoader resourcesLoader = ResourcesLoader - .builder() - .defaultLocale(Locale.forLanguageTag("en")) + .builder() + .defaultLocale(Locale.forLanguageTag("en")) .basenamesPattern(TestUtilities.listToSet("translations_en_US/*")) - .build(); + .build(); ResourcesLoader.Dto dto = resourcesLoader.getTranslationFiles().get(0);