From a1dc46e86bf47a3a105910d4f80b69a0071714f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Laugks?= <al@pb82.de>
Date: Fri, 14 Jul 2023 19:16:25 +0200
Subject: [PATCH] Add version 1.1.0

- Add handling translation unit identifiers attributes
- Improvement sourcecode
- Improvement and extended README.md
- Extended tests (spy tests for caching vs. create catalog)
---
 .github/workflows/maven-test.yml              |   1 +
 README.md                                     | 285 ++++++++++++++----
 pom.xml                                       |  22 +-
 .../xliff/XliffTranslationMessageSource.java  |   9 +-
 .../xliff/catalog/CatalogWrapper.java         |  15 +-
 .../xliff/catalog/xliff/Xliff12.java          |  16 +-
 .../xliff/catalog/xliff/Xliff2.java           |  29 ++
 .../xliff/catalog/xliff/Xliff20.java          |  22 --
 .../xliff/catalog/xliff/Xliff21.java          |  20 --
 .../xliff/catalog/xliff/XliffAbstract.java    |  27 +-
 .../catalog/xliff/XliffCatalogBuilder.java    |  11 +-
 .../xliff/catalog/xliff/XliffInterface.java   |   3 +
 .../catalog/xliff/XliffParserUtility.java     |  45 ++-
 .../xliff/catalog/xliff/XliffReader.java      |   3 +-
 ...tchingResourcePatternResolverAbstract.java |  22 +-
 ...chingResourcePatternResolverCasesTest.java |  50 ++-
 ...gResourcePatternResolverInitCacheTest.java |  14 +-
 ...ffMatchingResourcePatternResolverTest.java |  12 +-
 .../xliff/catalog/CatalogCacheTest.java       |  12 +-
 .../xliff/catalog/CatalogWrapperTest.java     | 147 ++++++++-
 .../xliff/catalog/xliff/Xliff20Test.java      |   2 +-
 .../xliff/catalog/xliff/Xliff21Test.java      |   2 +-
 .../catalog/xliff/XliffParserUtilityTest.java |  72 ++++-
 .../xliff/catalog/xliff/XliffReaderTest.java  |   4 +-
 .../fixtures/xliff-parser-utility-test.xliff  |   3 +
 .../resources/translations/messages.xliff     |  16 +
 26 files changed, 657 insertions(+), 207 deletions(-)
 create mode 100644 src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2.java
 delete mode 100644 src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20.java
 delete mode 100644 src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21.java

diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml
index 96433bc..d77438d 100644
--- a/.github/workflows/maven-test.yml
+++ b/.github/workflows/maven-test.yml
@@ -6,6 +6,7 @@ on:
       - main
       - stage
       - dev
+      - feature/*
 #    workflow_dispatch:
 jobs:
   tests:
diff --git a/README.md b/README.md
index e1d7bb6..8497189 100644
--- a/README.md
+++ b/README.md
@@ -2,27 +2,29 @@
 
 This package provides a **MessageSource** for using translations from XLIFF files. The package support XLIFF versions 1.2, 2.0 and 2.1.
 
-**Table of content**
+With the implementation and use of the MessageSource interface, the translations are also available in [Thymeleaf](https://www.thymeleaf.org/). 
 
-1. [Version](#1-Versions)
-2. [Dependency](#2-Dependency)
-3. [MessageSource Configuration](#3-MessageSource-Configuration)
-4. [Minimal CacheManager Configuration](#4-Minimal-CacheManager-Configuration)
-5. [CacheManager with Supported Cache Providers](#5-CacheManager-with-Supported-Cache-Providers)
-6. [Cache warming with an ApplicationRunner (recommended)](#6-Cache-warming-with-an-ApplicationRunner-recommended)
-7. [Xliff Translations Files](#7-XLIFF-Translation-Files)
-8. [Example with Translations Files](#8-Example-with-Translations-Files)
-9. [Full Example](#9-Full-Example)
-10. [Support](#10-Support)
+**Table of content**
 
-## 1. Versions
+1. [Version](#Versions)
+2. [Dependency](#Dependency)
+3. [MessageSource Configuration](#MessageSource-Configuration)
+4. [Minimal CacheManager Configuration](#Minimal-CacheManager-configuration)
+5. [CacheManager with supported Cache Providers](#CacheManager-with-supported-Cache-Providers)
+6. [Cache warming with an ApplicationRunner (recommended)](#Cache-warming-with-an-ApplicationRunner-recommended)
+7. [Xliff Translations files](#Xliff-Translations-files)
+8. [Example with Translations files](#Example-with-Translations-files)
+9. [Full Example](#Full-Example)
+10. [Support](#Support)
+## Versions
 
 | Version | Description          |
-|:------- |:-------------------- |
+|:--------|:---------------------|
+| 1.1.0   | Release note         |
 | 1.0.0   | First public version |
 
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=alaugks_spring-xliff-translation&metric=alert_status)](https://sonarcloud.io/summary/overall?id=alaugks_spring-xliff-translation) [![Maven Central](https://img.shields.io/maven-central/v/io.github.alaugks/spring-messagesource-xliff.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/io.github.alaugks/spring-messagesource-xliff/1.1.0)
 
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=alaugks_spring-xliff-translation&metric=alert_status)](https://sonarcloud.io/summary/overall?id=alaugks_spring-xliff-translation) [![Maven Central](https://img.shields.io/maven-central/v/io.github.alaugks/spring-messagesource-xliff.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/io.github.alaugks/spring-messagesource-xliff/1.0.0)
 
 ## 2. Dependency
 
@@ -31,32 +33,39 @@ This package provides a **MessageSource** for using translations from XLIFF file
 <dependency>
     <groupId>io.github.alaugks</groupId>
     <artifactId>spring-messagesource-xliff</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
 </dependency>
 ```
 
 **Gradle**
 ```text
-implementation group: 'io.github.alaugks', name: 'spring-messagesource-xliff', version: '1.0.0'
+implementation group: 'io.github.alaugks', name: 'spring-messagesource-xliff', version: '1.1.0'
 ```
 
+
 ## 3. MessageSource Configuration
 
 The class XliffTranslationMessageSource implements the [MessageSource](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/MessageSource.html) interface. An instance of the [CacheManager](https://docs.spring.io/spring-boot/docs/2.1.6.RELEASE/reference/html/boot-features-caching.html#boot-features-caching-provider) is required for caching the translations.
 
 ### XliffTranslationMessageSource
 
-`setBasenamePattern(String basename)` or `setBasenamesPattern(Iterable<String> basenames)` (*mandatory*)
+`setBasenamePattern(String basename)` or `setBasenamesPattern(Iterable<String> basenames)` (*required*)
 
 * Defines the pattern used to select the XLIFF files.
 * The package uses the [PathMatchingResourcePatternResolver](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/io/support/PathMatchingResourcePatternResolver.html) to select the XLIFF files. So you can use the supported patterns.
 * Files with the extension `xliff` and `xlf` are filtered from the result list.
 
-`setDefaultLocale(Locale locale)` (*mandatory*)
+`setDefaultLocale(Locale locale)` (*required*)
 * Defines the default language.
 
 `setDefaultDomain(String defaultDomain)`
-* Defines the default domain. Default is `messages`. For more information, see [Xliff Translations Files](#7-XLIFF-Translation-Files).
+* Defines the default domain. Default is `messages`. For more information, see [XlIFF Translations Files](#7-XLIFF-Translation-Files).
+
+`setTranslationUnitIdentifiersOrdering(List<String> translationUnitIdentifiers)`
+* The Identifiers can be defined with attributes on a translation unit. The attribute `id` is required for XLIFF 1.2 and 2.*. For XLIFF 1.2, the attribute `resname` can also be defined.
+    * **XLIFF 2.1**: Default definition is `"resname", "id"`. If the attribute `resname` does not exist, the attribute `id` is used to determine the identifier for the catalogue. 
+    * **XLIFF 2.\***: Default definition is `"id"`. The `id` defines the identifier for the catalogue. The attribute `id` is optional by standard in XLIFF 2.*. However, this package requires the `id` on a translation unit.
+* Documentation Identifiers: [XLIFF 1.2](http://docs.oasis-open.org/xliff/v1.2/xliff-profile-html/xliff-profile-html-1.2.html#General_Identifiers), [XLIFF 2.0](https://docs.oasis-open.org/xliff/xliff-core/v2.0/csprd01/xliff-core-v2.0-csprd01.html#segment) and [XLIFF 2.1](https://docs.oasis-open.org/xliff/xliff-core/v2.1/os/xliff-core-v2.1-os.html#segment)
 
 > Please note the [Minimal CacheManager Configuration](#Minimal-CacheManager-configuration).
 
@@ -84,11 +93,12 @@ public class MessageConfig {
 }
 ```
 
+
 ## 4. Minimal CacheManager Configuration
 
 You may already have an existing CacheManager configuration. If not, the following minimum CacheManager configuration is required.
 
-The CacheName must be set with the constant `CatalogCache.CACHE_NAME`. The specific cache identifier is stored in the constant. Currently you cannot set a custom cache name.
+The CacheName must be set with the constant `CatalogCache.CACHE_NAME`. The specific cache identifier is stored in the constant. 
 
 [ConcurrentMapCacheManager](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/cache/concurrent/ConcurrentMapCacheManager.html) is the default cache in Spring Boot and Spring.
 
@@ -107,22 +117,25 @@ import java.util.List;
 @Configuration
 @EnableCaching
 public class CacheConfig {
+    
     @Bean
     public CacheManager cacheManager() {
         ConcurrentMapCacheManager cacheManager = new ConcurrentMapCacheManager();
         cacheManager.setCacheNames(List.of(CatalogCache.CACHE_NAME));
         return cacheManager;
     }
+    
 }    
 ```
 
+
 ## 5. CacheManager with Supported Cache Providers
 
-[Supported Cache Providers](https://docs.spring.io/spring-boot/docs/3.1.1/reference/html/io.html#io.caching.provider) can also be used. The following Example using [Caffeine](https://github.com/ben-manes/caffeine):
+[Supported Cache Providers](https://docs.spring.io/spring-boot/docs/3.1.1/reference/html/io.html#io.caching.provider) can also be used. The following example using [Caffeine](https://github.com/ben-manes/caffeine):
 
 ### CacheConfig with Caffeine
 
-The CacheName must be set with the constant `CatalogCache.CACHE_NAME`. No ExpireDate should be set for the XLIFF Translations cache.
+The CacheName must be set with the constant `CatalogCache.CACHE_NAME`. No ExpireDate should be set for the XLIFF translations cache.
 
 ```java
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -139,6 +152,7 @@ import java.util.List;
 @Configuration
 @EnableCaching
 class CacheConfig {
+    
     @Bean
     public Caffeine<Object, Object> caffeineConfig() {
         return Caffeine.newBuilder();
@@ -152,16 +166,17 @@ class CacheConfig {
         caffeineCacheManager.setCacheNames(cacheNames);
         return caffeineCacheManager;
     }
+    
 }
 ```
 
+
 ## 6. Cache warming with an ApplicationRunner (recommended)
 
 In the following example, the cache of translations is warmed up after the application starts.
 
 ```java
 import io.github.alaugks.spring.messagesource.xliff.XliffMessageSourcePatternResolver;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.MessageSource;
@@ -170,26 +185,30 @@ import org.springframework.stereotype.Component;
 @Component
 public class AppStartupRunner implements ApplicationRunner {
 
-    @Autowired
-    MessageSource messageSource;
+  private final MessageSource messageSource;
 
-    @Override
-    public void run(ApplicationArguments args) {
-        if (this.messageSource instanceof XliffTranslationMessageSource) {
-            ((XliffTranslationMessageSource) this.messageSource).initCache();
-        }
+  public AppStartupRunner(MessageSource messageSource) {
+    this.messageSource = messageSource;
+  }
+
+  @Override
+  public void run(ApplicationArguments args) {
+    if (this.messageSource instanceof XliffTranslationMessageSource) {
+      ((XliffTranslationMessageSource) this.messageSource).initCache();
     }
+  }
+    
 }
 ```
 
+
 ## 7. XLIFF Translation Files
 
 * Translations can be separated into different files (domains). The default domain is `messages`.
 * The default domain can be defined.
 * Translation files must be stored in the resource folder and have the extension `xliff` or `xlf`.
-* In the XLIFF files, the `<target/>` is fetched in a `<trans-unit/>` (XLIFF 1.2) or `<segment/>` (XLIFF 2.*).
-* For performance reasons, there is no validation of XLIFF files with an XMLSchema. If there is any broken XML in an XLIFF file, the SAX parser will throw a [Fatal Error].
-
+* In the XLIFF files, the `<target/>` is retrieved in a `<trans-unit/>` (XLIFF 1.2) or `<segment/>` (XLIFF 2.*).
+* For performance reasons, there is no validation of XLIFF files with an XMLSchema. If there is any corrupt XML in an XLIFF file, the SAX parser will throw a [Fatal Error].
 
 ### Structure of the Translation Filename
 
@@ -204,7 +223,8 @@ public class AppStartupRunner implements ApplicationRunner {
 <domain>[-_]<language>[-_]<region>.xlf
 ```
 
-## 8. Example with Translations Files
+
+### Example with Translations Files
 
 * Default domain is `messages`.
 * Default locale is `en` without region.
@@ -221,11 +241,11 @@ public class AppStartupRunner implements ApplicationRunner {
              |-payment_en-US.xliff     
 ```  
 
-### Translations files
+#### Translations files
 
 Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF 2.1. 
 
-#### messages.xliff
+##### messages.xliff
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2"
@@ -241,12 +261,28 @@ Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF
                 <source>Postcode</source>
                 <target>Postcode</target>
             </trans-unit>
+            <trans-unit id="headline-examples">
+                <source>Examples</source>
+                <target>Examples</target>
+            </trans-unit>
+            <trans-unit id="translation-args-label">
+                <source>Translation with param</source>
+                <target>Translation with param</target>
+            </trans-unit>
+            <trans-unit id="email-notice">
+                <source>Your email {0} has been registered.</source>
+                <target>Your email {0} has been registered.</target>
+            </trans-unit>
+            <trans-unit id="default-message">
+                <source>This is a default message.</source>
+                <target>This is a default message.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
 ```
 
-#### messages_de.xliff
+##### messages_de.xliff
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2"
@@ -262,12 +298,28 @@ Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF
                 <source>Postcode</source>
                 <target>Postleitzahl</target>
             </trans-unit>
+            <trans-unit id="headline-examples">
+                <source>Examples</source>
+                <target>Beispiele</target>
+            </trans-unit>
+            <trans-unit id="translation-args-label">
+                <source>Translation with param</source>
+                <target>Übersetzung mit Parameter</target>
+            </trans-unit>
+            <trans-unit id="email-notice">
+                <source>Your email {0} has been registered.</source>
+                <target>Ihre E-Mail {0} wurde registriert.</target>
+            </trans-unit>
+            <trans-unit id="default-message">
+                <source>This is a default message.</source>
+                <target>Das ist ein Standardtext.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
 ```
 
-#### messages_en-US.xliff
+##### messages_en-US.xliff
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2"
@@ -284,7 +336,7 @@ Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF
 </xliff>
 ```
 
-#### payment.xliff
+##### payment.xliff
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.1" version="2.1"
@@ -304,7 +356,7 @@ Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF
 </xliff>
 ```
 
-#### payment_de.xliff
+##### payment_de.xliff
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.1" version="2.1"
@@ -324,7 +376,7 @@ Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF
 </xliff>
 ```
 
-#### payment_en-US.xliff
+##### payment_en-US.xliff
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.1" version="2.1"
@@ -344,21 +396,144 @@ Mixing XLIFF versions is possible. Here is an example using XLIFF 1.2 and XLIFF
 </xliff>
 ```
 
-#### Target value
-
-| id                  | en          | de           | en-US           |
-| ------------------- | ----------- | ------------ | --------------- |
-| postcode*           | Postcode    | Postleitzahl | Zip code        |
-| messages.postcode   | Postcode    | Postleitzahl | Zip code        |
-| headline*           | Headline    | Überschrift  | Headline**      |
-| messages.headline   | Headline    | Überschrift  | Headline**      |
-| payment.headline    | Payment     | Zahlung      | Payment         |
-| payment.expiry_date | Expiry date | Ablaufdatum  | Expiration date |
+##### Target value
+
+| id                              | en                                  | de                                 | en-US                               |
+|---------------------------------|-------------------------------------|------------------------------------|-------------------------------------|
+| headline*                       | Headline                            | Überschrift                        | Headline**                          |
+| messages.headline               | Headline                            | Überschrift                        | Headline**                          |
+| postcode*                       | Postcode                            | Postleitzahl                       | Zip code                            |
+| messages.postcode               | Postcode                            | Postleitzahl                       | Zip code                            |
+| headline-examples               | Examples                            | Beispiele                          | Examples                            |
+| messages.headline-examples      | Examples                            | Beispiele                          | Examples                            |
+| translation-args-label          | Translation with param              | Übersetzung mit Parameter          | Translation with param              |
+| messages.translation-args-label | Translation with param              | Übersetzung mit Parameter          | Translation with param              |
+| email-notice                    | Your email {0} has been registered. | Ihre E-Mail {0} wurde registriert. | Your email {0} has been registered. |
+| messages.email-notice           | Your email {0} has been registered. | Ihre E-Mail {0} wurde registriert. | Your email {0} has been registered. |
+| default-message                 | This is a default message.          | Das ist ein Standardtext.          | This is a default message.          |
+| messages.default-message        | This is a default message.          | Das ist ein Standardtext.          | This is a default message.          |
+| payment.headline                | Payment                             | Zahlung                            | Payment                             |
+| payment.expiry_date             | Expiry date                         | Ablaufdatum                        | Expiration date                     |
 
 > *Default domain is `messages`.
 >
 > **Example of a fallback. With locale `en-US` it tries to select the translation with id `headline` in messages_en-US. The id `headline` does not exist, so it tries to select the translation with locale `en` in messages.
 
+
+## 8. Using the MessageSource in Thymeleaf or as Service
+
+### Thymeleaf
+
+With the configured MessageSource, the translations are available in Thymeleaf. See the example in the [Full Example](#9-Full-Example).
+
+```html
+<!-- "Headline" -->
+<h1 th:text="#{messages.headline}"/>
+
+<!-- "Headline" -->
+<h1 th:text="#{headline}"/>
+
+<!-- "Postcode" -->
+<label th:text="#{messages.postcode}"/>
+
+<!-- "Postcode" -->
+<label th:text="#{postcode}"/>
+
+<!-- "Payment" -->
+<h2 th:text="#{payment.headline}"/>
+
+<!-- "Expiry date" -->
+<strong th:text="#{payment.expiry_date}"/>
+
+<!-- "Translation with param: Your email john.doe@example.com has been registered." -->
+<strong th:text="#{translation-args-label}"/>: <span th:text="#{email-notice('john.doe@example.com')}"/>
+
+<!-- "This is a default message." -->
+<span th:text="${#messages.msgOrNull('not-exists-id')} ?: #{default-message}"/>
+
+
+```
+
+
+### MessageSource as Dependency Injection
+
+The MessageSource can be set via Autowire to access the translations. See the example in the [Full Example](#9-Full-Example).
+
+```java
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Service;
+
+import java.util.Locale;
+
+@Service
+public class MyService {
+    
+    private MessageSource messageSource;
+
+    public MyService(MessageSource messageSource) {
+        this.messageSource = messageSource;
+    }
+
+    void method() {
+        Locale locale = Locale.forLanguageTag("en");
+        
+        // "Headline"
+        String headline = this.messageSource.getMessage("headline", null, locale);
+        
+        // "Headline"
+        String messagesHeadline = this.messageSource.getMessage("messages.headline", null, locale);
+        
+        // "Postcode"
+        String postcode = this.messageSource.getMessage("postcode", null, locale);
+        
+        // "Postcode"
+        String messagesPostcode = this.messageSource.getMessage("messages.postcode", null, locale);
+        
+        // "Payment"
+        String paymentHeadline = this.messageSource.getMessage("payment.headline", null, locale);
+        
+        // "Expiry date"
+        String paymentExpiryDate = this.messageSource.getMessage("payment.expiry_date", null, locale);
+
+        // With arguments
+        // "Translation with param: Your email john.doe@example.com has been registered."
+        Object[] args = {"john.doe@example.com"};
+        translations.put("email-notice", this.messageSource.getMessage("email-notice", args, locale));
+        translations.put("messages.email-notice", this.messageSource.getMessage("email-notice", args, locale));
+  
+        // Show default message if id not exists
+        // "This is a default message."
+        String defaultMessage = this.messageSource.getMessage("default-message", null, locale);
+        translations.put("not-exists-id", this.messageSource.getMessage("not-exists-id", null, defaultMessage, locale));
+    }
+}
+```
+
+
+## 9. Full Example
+
+A Full Example using Spring Boot, mixing XLIFF 1.2 and XLIFF 2.1 translation files: https://github.com/alaugks/spring-messagesource-xliff-example-spring-boot
+
+
+## 10. Support
+
+If you have questions, comments or feature requests please use the [Discussions](https://github.com/alaugks/spring-xliff-translation/discussions) section.
+
+
+## #11. More Information
+
+### MessageSource, Internationalization and Thymeleaf
+* [Guide to Internationalization in Spring Boot](https://www.baeldung.com/spring-boot-internationalization)
+* [How to Internationalize a Spring Boot Application](https://reflectoring.io/spring-boot-internationalization/)
+* [Spring Boot internationalization i18n: Step-by-step with examples](https://lokalise.com/blog/spring-boot-internationalization/)
+
+### Caching
+* [A Guide To Caching in Spring](https://www.baeldung.com/spring-cache-tutorial) 
+* [Implementing a Cache with Spring Boot](https://reflectoring.io/spring-boot-cache/)
+
+
+
 <!-- 
 ## Use @Cachable proxy
 
@@ -415,10 +590,10 @@ class CacheableXliffTranslationMessageSource extends XliffTranslationMessageSour
 ```
 -->
 
-## 9. Full Example
+## Full Example
 
-A complete example using Spring Boot, mixing XLIFF 1.2 and XLIFF 2.1 translation files: https://github.com/alaugks/spring-messagesource-xliff-example-spring-boot
+A complete example using Spring Boot, including the use of XLIFF 1.2 and XLIFF 2.1 translation files: https://github.com/alaugks/spring-xliff-translation-example-spring-boot
 
-## 10. Support
+## Support
 
-If you have questions, comments or feature requests please use the [Discussions](https://github.com/alaugks/spring-xliff-translation/discussions) section.
+If you have any questions, comments or feature requests, please use the [Discussions](https://github.com/alaugks/spring-xliff-translation/discussions) section to contact me.
diff --git a/pom.xml b/pom.xml
index 1b1017c..dfae3f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
 
     <groupId>io.github.alaugks</groupId>
     <artifactId>spring-messagesource-xliff</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Provides a MessageSource for translations from XLIFF files for Spring and Spring Boot.</description>
-    <url>https://github.com/alaugks/spring-xliff-translation</url>
+    <url>https://github.com/alaugks/spring-messagesource-xliff</url>
 
     <licenses>
         <license>
@@ -27,9 +27,9 @@
     </developers>
 
     <scm>
-        <connection>scm:git:https://github.com/alaugks/spring-xliff-translation</connection>
-        <developerConnection>scm:git:https://github.com/alaugks/spring-xliff-translation</developerConnection>
-        <url>https://github.com/alaugks/spring-xliff-translation</url>
+        <connection>scm:git:https://github.com/alaugks/spring-messagesource-xliff</connection>
+        <developerConnection>scm:git:https://github.com/alaugks/spring-messagesource-xliff</developerConnection>
+        <url>https://github.com/alaugks/spring-messagesource-xliff</url>
     </scm>
 
     <parent>
@@ -79,6 +79,18 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-subclass</artifactId>
+            <version>5.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>5.2.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
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 fa99129..bb65c26 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
@@ -13,18 +13,20 @@
 import org.springframework.lang.Nullable;
 
 import java.text.MessageFormat;
+import java.util.List;
 import java.util.Locale;
 
 public class XliffTranslationMessageSource implements MessageSource {
 
     private final CatalogWrapper catalogWrapper;
     private final ResourcesLoaderInterface resourcesLoader = new ResourcesLoader();
+    private final XliffCatalogBuilder xliffCatalogBuilder = new XliffCatalogBuilder();
 
     public XliffTranslationMessageSource(CacheManager cacheManager) {
         this.catalogWrapper = new CatalogWrapper(
                 cacheManager,
                 this.resourcesLoader,
-                new XliffCatalogBuilder(),
+                this.xliffCatalogBuilder,
                 new Catalog()
         );
     }
@@ -49,6 +51,11 @@ public XliffTranslationMessageSource setDefaultDomain(String defaultDomain) {
         return this;
     }
 
+    public XliffTranslationMessageSource setTranslationUnitIdentifiersOrdering(List<String> translationUnitIdentifiers) {
+        this.xliffCatalogBuilder.setTranslationUnitIdentifiersOrdering(translationUnitIdentifiers);
+        return this;
+    }
+
     @Nullable
     public String getMessage(String code, @Nullable Object[] args, @Nullable String defaultMessage, Locale locale) {
         return this.format(
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapper.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapper.java
index c0b92c0..8b53396 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapper.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapper.java
@@ -5,11 +5,11 @@
 import org.apache.logging.log4j.Logger;
 import org.springframework.cache.CacheManager;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Objects;
 
-public final class CatalogWrapper {
+public class CatalogWrapper {
     private static final Logger logger = LogManager.getLogger();
     private final CatalogCache catalogCache;
     private final CatalogInterface catalog;
@@ -23,8 +23,8 @@ public CatalogWrapper(CacheManager cacheManager,
                           CatalogInterface catalog
     ) {
         this.catalog = catalog;
-        this.catalogBuilder = catalogBuilder;
         this.resourcesLoader = resourcesLoader;
+        this.catalogBuilder = catalogBuilder;
         this.catalogCache = new CatalogCache(cacheManager);
     }
 
@@ -62,7 +62,7 @@ public Translation get(Locale locale, String code) {
         // If exists then init cache, because it was not in the cache. Cache empty?
         if (targetValue != null) {
             logger.info("Re-init xliff catalog cache");
-            this.catalogCache.initCache(loadedCatalog);
+            this.initCache(loadedCatalog);
         }
 
         // If not exists then is the targetValue is the code.
@@ -90,6 +90,11 @@ public void setDefaultDomain(String defaultDomain) {
         this.defaultDomain = defaultDomain;
     }
 
+    public void initCache(CatalogInterface catalog) {
+        // Without cache do not get load catalog
+        this.catalogCache.initCache(catalog);
+    }
+
     public void initCache() {
         // Without cache do not get load catalog
         this.catalogCache.initCache(this.loadCatalog());
@@ -101,7 +106,7 @@ private CatalogInterface loadCatalog() {
 
     private String chainLink(CatalogInterface catalog, Locale locale, String code) {
         String targetValue;
-        HashMap<Integer, Locale> locales = new HashMap<>();
+        LinkedHashMap<Integer, Locale> locales = new LinkedHashMap<>();
         // Follow the order
         locales.put(0, locale); // First
         locales.put(1, this.resourcesLoader.getDefaultLocale()); // Second
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12.java
index 0205e18..b27bb1b 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff12.java
@@ -4,19 +4,27 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 final class Xliff12 extends XliffAbstract implements XliffInterface {
-    static final String VERSION = "1.2";
+    private List<String> translationUnitIdentifiers = new ArrayList<>(Arrays.asList("resname", "id"));
 
     @Override
     public boolean support(String version) {
-        return version.equals(VERSION);
+        return version.equals("1.2");
+    }
+
+    @Override
+    public void setTranslationUnitIdentifiersOrdering(List<String> translationUnitIdentifiers) {
+        this.translationUnitIdentifiers = translationUnitIdentifiers;
     }
 
     @Override
     public void read(CatalogInterface catalog, Document document, String domain, Locale locale) {
-        NodeList translationNodes = XliffParserUtility.getTranslationNodes(document, "trans-unit");
-        this.readItems(VERSION, catalog, domain, locale, translationNodes);
+        NodeList translationUnits = XliffParserUtility.getTranslationUnits(document, "trans-unit");
+        this.readItems(catalog, domain, locale, translationUnits, this.translationUnitIdentifiers);
     }
 }
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2.java
new file mode 100644
index 0000000..e5e912d
--- /dev/null
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff2.java
@@ -0,0 +1,29 @@
+package io.github.alaugks.spring.messagesource.xliff.catalog.xliff;
+
+import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogInterface;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+final class Xliff2 extends XliffAbstract implements XliffInterface {
+    private List<String> translationUnitIdentifiers = new ArrayList<>(List.of("id"));
+
+    @Override
+    public boolean support(String version) {
+        return List.of("2.0", "2.1").contains(version);
+    }
+
+    @Override
+    public void setTranslationUnitIdentifiersOrdering(List<String> translationUnitIdentifiers) {
+        this.translationUnitIdentifiers = translationUnitIdentifiers;
+    }
+
+    @Override
+    public void read(CatalogInterface catalog, Document document, String domain, Locale locale) {
+        NodeList translationUnits = XliffParserUtility.getTranslationUnits(document, "segment");
+        this.readItems(catalog, domain, locale, translationUnits, this.translationUnitIdentifiers);
+    }
+}
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20.java
deleted file mode 100644
index 4eb32c8..0000000
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.alaugks.spring.messagesource.xliff.catalog.xliff;
-
-import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogInterface;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import java.util.Locale;
-
-final class Xliff20 extends XliffAbstract implements XliffInterface {
-    static final String VERSION = "2.0";
-
-    @Override
-    public boolean support(String version) {
-        return version.equals(VERSION);
-    }
-
-    @Override
-    public void read(CatalogInterface catalog, Document document, String domain, Locale locale) {
-        NodeList translationNodes = XliffParserUtility.getTranslationNodes(document, "segment");
-        this.readItems(VERSION, catalog, domain, locale, translationNodes);
-    }
-}
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21.java
deleted file mode 100644
index b4d615b..0000000
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.alaugks.spring.messagesource.xliff.catalog.xliff;
-
-import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogInterface;
-import org.w3c.dom.Document;
-
-import java.util.Locale;
-
-final class Xliff21 implements XliffInterface {
-    static final String VERSION = "2.1";
-
-    @Override
-    public boolean support(String version) {
-        return version.equals(VERSION);
-    }
-
-    @Override
-    public void read(CatalogInterface catalog, Document document, String domain, Locale locale) {
-        new Xliff20().read(catalog, document, domain, locale);
-    }
-}
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffAbstract.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffAbstract.java
index 9497fcb..47d737f 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffAbstract.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffAbstract.java
@@ -5,38 +5,29 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.util.List;
 import java.util.Locale;
 
-// http://docs.oasis-open.org/xliff/xliff-core/v2.0/csprd01/xliff-core-v2.0-csprd01.html#segment
-// http://docs.oasis-open.org/xliff/xliff-core/v2.1/os/xliff-core-v2.1-os.html#segment
-// http://docs.oasis-open.org/xliff/v1.2/xliff-profile-html/xliff-profile-html-1.2.html#General_Identifiers
-public class XliffAbstract {
+// https://docs.oasis-open.org/xliff/v1.2/xliff-profile-html/xliff-profile-html-1.2.html#General_Identifiers
+// https://docs.oasis-open.org/xliff/xliff-core/v2.0/csprd01/xliff-core-v2.0-csprd01.html#segment
+// https://docs.oasis-open.org/xliff/xliff-core/v2.1/os/xliff-core-v2.1-os.html#segment
+abstract class XliffAbstract {
     protected void readItems(
-            String version,
             CatalogInterface catalog,
             String domain,
             Locale locale,
-            NodeList translationNodes
+            NodeList translationNodes,
+            List<String> translationUnitIdentifiers
     ) {
         for (int item = 0; item < translationNodes.getLength(); item++) {
             Node translationNode = translationNodes.item(item);
 
-            /* <trans-unit id=""> */
-            String id = XliffParserUtility.getId(translationNode);
-
-            String resname = null;
-            if (Xliff12.VERSION.equals(version)) {
-                resname = XliffParserUtility.getResname(translationNode, "resname");
-            }
-
-            /* <trans-unit> */
+            /* Translation Node */
             Element translationNodeElement = (Element) translationNode;
-            /* <source> */
-            String sourceValue = XliffParserUtility.getSource(translationNodeElement);
             /* <target> */
             String targetValue = XliffParserUtility.getTargetValue(translationNodeElement);
             /* code */
-            String code = XliffParserUtility.getCode(id, resname, sourceValue);
+            String code = XliffParserUtility.getCode(translationNodeElement, translationUnitIdentifiers);
 
             /* Add catalog */
             catalog.put(locale, domain, code, targetValue);
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffCatalogBuilder.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffCatalogBuilder.java
index 9823bb8..492b7af 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffCatalogBuilder.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffCatalogBuilder.java
@@ -16,10 +16,12 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
-public final class XliffCatalogBuilder implements CatalogBuilderInterface {
+public class XliffCatalogBuilder implements CatalogBuilderInterface {
 
     private CatalogInterface catalog;
+    private List<String> translationUnitIdentifiers;
 
     @Override
     public CatalogInterface createCatalog(ResourcesLoaderInterface resourceLoader, CatalogInterface catalog) {
@@ -32,6 +34,10 @@ public CatalogInterface createCatalog(ResourcesLoaderInterface resourceLoader, C
         }
     }
 
+    public void setTranslationUnitIdentifiersOrdering(List<String> translationUnitIdentifiers) {
+        this.translationUnitIdentifiers = translationUnitIdentifiers;
+    }
+
     private void readFile(ArrayList<ResourcesLoader.Dto> translationFiles) throws ParserConfigurationException, IOException {
 
         XliffReader xliffReader = new XliffReader();
@@ -61,6 +67,9 @@ private void readFile(ArrayList<ResourcesLoader.Dto> translationFiles) throws Pa
 
             XliffInterface xliffInterface = xliffReader.getReader(version);
             if (xliffInterface != null) {
+                if (this.translationUnitIdentifiers != null) {
+                    xliffInterface.setTranslationUnitIdentifiersOrdering(this.translationUnitIdentifiers);
+                }
                 xliffInterface.read(this.catalog, document, translationFile.getDomain(), translationFile.getLocale());
             } else {
                 throw new XliffMessageSourceVersionSupportException(String.format("XLIFF version \"%s\" not supported.", version));
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffInterface.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffInterface.java
index 66a5497..f714c7e 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffInterface.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffInterface.java
@@ -3,10 +3,13 @@
 import io.github.alaugks.spring.messagesource.xliff.catalog.CatalogInterface;
 import org.w3c.dom.Document;
 
+import java.util.List;
 import java.util.Locale;
 
 public interface XliffInterface {
     boolean support(String version);
 
+    void setTranslationUnitIdentifiersOrdering(List<String> translationUnitIdentifiers);
+
     void read(CatalogInterface catalog, Document document, String domain, Locale locale);
 }
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtility.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtility.java
index 2cf2b38..c6b8d55 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtility.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtility.java
@@ -3,6 +3,8 @@
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.*;
 
+import java.util.List;
+
 final class XliffParserUtility {
 
     private XliffParserUtility() {
@@ -37,43 +39,34 @@ public static String getAttributeValue(Node translationNode, String attributeNam
     }
 
     public static String getElementValue(Element translationNodeElement, String elementName) {
-        Node sourceElement = getFirstChild(
-                translationNodeElement.getElementsByTagName(elementName)
+        return getCharacterDataFromElement(
+                getFirstChild(
+                        translationNodeElement.getElementsByTagName(elementName)
+                )
         );
-        return getCharacterDataFromElement(sourceElement);
-    }
-
-    public static String getSource(Element translationNodeElement) {
-        return getElementValue(translationNodeElement, "source");
     }
 
     public static String getTargetValue(Element translationNodeElement) {
         return getElementValue(translationNodeElement, "target");
     }
 
-    public static NodeList getTranslationNodes(Document document, String nodeName) {
+    public static NodeList getTranslationUnits(Document document, String nodeName) {
         return document.getElementsByTagName(nodeName);
     }
 
-    public static String getCode(String id, String resname, String sourceValue) {
-        //  resname|name -> id -> sourceValue
-
-        if (resname != null) {
-            return resname;
-        }
-
-        if (id != null) {
-            return id;
+    public static String getCode(
+            Element translationUnit,
+            List<String> translationUnitIdentifiers
+    ) {
+        if (translationUnitIdentifiers != null) {
+            for (String name : translationUnitIdentifiers) {
+                String value = getAttributeValue(translationUnit, name);
+                if (value != null) {
+                    return value;
+                }
+            }
         }
 
-        return sourceValue;
-    }
-
-    public static String getResname(Node translationNode, String name) {
-        return getAttributeValue(translationNode, name);
-    }
-
-    public static String getId(Node translationNode) {
-        return getAttributeValue(translationNode, "id");
+        return null;
     }
 }
diff --git a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReader.java b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReader.java
index e77728b..7c7741d 100644
--- a/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReader.java
+++ b/src/main/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReader.java
@@ -8,8 +8,7 @@ final class XliffReader {
     public XliffReader() {
         this.supportedVersions = Set.of(
                 new Xliff12(),
-                new Xliff20(),
-                new Xliff21()
+                new Xliff2()
         );
     }
 
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverAbstract.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverAbstract.java
index 9b62528..ac05410 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverAbstract.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverAbstract.java
@@ -11,11 +11,11 @@
 
 abstract class XliffMatchingResourcePatternResolverAbstract {
 
-    public XliffTranslationMessageSource resolver;
+    protected static XliffTranslationMessageSource messageSource;
 
     @Test
     void test_message_withDefaultMessage_messageExists() {
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 "hello_language",
                 null,
                 "My default message",
@@ -27,7 +27,7 @@ void test_message_withDefaultMessage_messageExists() {
 
     @Test
     void test_getMessage_withDefaultMessage_messageNotExists() {
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 "not_exists",
                 null,
                 "My default message",
@@ -40,7 +40,7 @@ void test_getMessage_withDefaultMessage_messageNotExists() {
     @Test
     void test_getMessage_withDefaultMessage_messageExists_messageWithArgs() {
         Object[] args = {"Road Runner", "Wile E. Coyote"};
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 "roadrunner",
                 args,
                 "My default message",
@@ -53,7 +53,7 @@ void test_getMessage_withDefaultMessage_messageExists_messageWithArgs() {
     @Test
     void test_getMessage_withDefaultMessage_messageNotExists_defaultMessageWithArgs() {
         Object[] args = {"Road Runner", "Wile E. Coyote"};
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 "not_exists",
                 args,
                 "{0} and {1} as default",
@@ -65,7 +65,7 @@ void test_getMessage_withDefaultMessage_messageNotExists_defaultMessageWithArgs(
 
     @Test
     void test_getMessage_messageExists() {
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 "hello_language",
                 null,
                 Locale.forLanguageTag("en")
@@ -79,7 +79,7 @@ void test_getMessage_messageNotExists() {
         Locale locale =  Locale.forLanguageTag("en");
 
         NoSuchMessageException exception = assertThrows(NoSuchMessageException.class, () -> {
-            this.resolver.getMessage(
+            messageSource.getMessage(
                     "not_exists",
                     null,
                     locale
@@ -92,7 +92,7 @@ void test_getMessage_messageNotExists() {
     @Test
     void test_getMessage_messageExists_messageWithArgs() {
         Object[] args = {"Road Runner", "Wile E. Coyote"};
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 "roadrunner",
                 args,
                 Locale.forLanguageTag("en")
@@ -109,7 +109,7 @@ void test_getMessage_resolvable_messageExists_messageWithArgs() {
                 codes,
                 args
         );
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 resolvable,
                 Locale.forLanguageTag("en")
         );
@@ -126,7 +126,7 @@ void test_getMessage_resolvable_messageNotExists() {
         );
 
         NoSuchMessageException exception = assertThrows(NoSuchMessageException.class, () -> {
-            this.resolver.getMessage(
+            messageSource.getMessage(
                     resolvable,
                     locale
             );
@@ -143,7 +143,7 @@ void test_getMessage_resolvable_messageNotExists_withDefaultMessage() {
                 null,
                 defaultMessage
         );
-        String message = this.resolver.getMessage(
+        String message = messageSource.getMessage(
                 resolvable,
                 Locale.forLanguageTag("en")
         );
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverCasesTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverCasesTest.java
index 2296d17..114c88c 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverCasesTest.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverCasesTest.java
@@ -2,9 +2,15 @@
 
 import io.github.alaugks.spring.messagesource.xliff.exception.XliffMessageSourceRuntimeException;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -64,7 +70,7 @@ void test_withRegion_fallback() {
     }
 
     @Test
-    void test_setSefaultDomain() {
+    void test_setDefaultDomain() {
         var resolver = new XliffTranslationMessageSource(TestUtilities.getMockedCacheManager());
         resolver.setBasenamePattern("translations/*");
         resolver.setDefaultLocale(Locale.forLanguageTag("en"));
@@ -92,4 +98,46 @@ void test_setBasenamePattern() {
         );
         assertEquals("Other Hello EN (otherdomain)", message);
     }
+
+    @ParameterizedTest(name = "{index} => translationUnitIdentifiers={0}, code={1}, expected={2}, targetValue={3}")
+    @MethodSource("dataProvider_setTranslationUnitIdentifiersOrdering")
+    void test_setTranslationUnitIdentifiersOrdering(ArrayList<String> translationUnitIdentifiers, String code, String expected) {
+        var resolver = new XliffTranslationMessageSource(TestUtilities.getMockedCacheManager());
+        resolver.setBasenamesPattern(List.of("translations/*"));
+        resolver.setDefaultLocale(Locale.forLanguageTag("en"));
+        resolver.setTranslationUnitIdentifiersOrdering(translationUnitIdentifiers);
+        resolver.initCache();
+
+        String message = resolver.getMessage(
+                code,
+                null,
+                Locale.forLanguageTag("en")
+        );
+        assertEquals(expected, message);
+    }
+
+    private static Stream<Arguments> dataProvider_setTranslationUnitIdentifiersOrdering() {
+        return Stream.of(
+            Arguments.of(
+                    new ArrayList<>(List.of("resname")),
+                    "code-resname-a",
+                    "Target"
+            ),
+            Arguments.of(
+                    new ArrayList<>(List.of("id")),
+                    "code-id-a",
+                    "Target"
+            ),
+            Arguments.of(
+                    new ArrayList<>(Arrays.asList("resname", "id")),
+                    "code-resname-a",
+                    "Target"
+            ),
+            Arguments.of(
+                    new ArrayList<>(Arrays.asList("id", "resname")),
+                    "code-id-a",
+                    "Target"
+            )
+        );
+    }
 }
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverInitCacheTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverInitCacheTest.java
index ef41c57..f3a8f7c 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverInitCacheTest.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverInitCacheTest.java
@@ -1,16 +1,16 @@
 package io.github.alaugks.spring.messagesource.xliff;
 
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 
 import java.util.Locale;
 
 class XliffMatchingResourcePatternResolverInitCacheTest extends XliffMatchingResourcePatternResolverAbstract {
 
-    @BeforeEach
-    void beforeEach() {
-        this.resolver = new XliffTranslationMessageSource(TestUtilities.getMockedCacheManager());
-        this.resolver.setBasenamePattern("translations/*");
-        this.resolver.setDefaultLocale(Locale.forLanguageTag("en"));
-        this.resolver.initCache();
+    @BeforeAll
+    static void beforeAll() {
+        messageSource = new XliffTranslationMessageSource(TestUtilities.getMockedCacheManager());
+        messageSource.setBasenamePattern("translations/*");
+        messageSource.setDefaultLocale(Locale.forLanguageTag("en"));
+        messageSource.initCache();
     }
 }
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverTest.java
index 55674f8..d960b8d 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverTest.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/XliffMatchingResourcePatternResolverTest.java
@@ -1,15 +1,15 @@
 package io.github.alaugks.spring.messagesource.xliff;
 
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 
 import java.util.Locale;
 
 class XliffMatchingResourcePatternResolverTest extends XliffMatchingResourcePatternResolverAbstract {
 
-    @BeforeEach
-    void beforeEach() {
-        this.resolver = new XliffTranslationMessageSource(TestUtilities.getMockedCacheManager());
-        this.resolver.setBasenamePattern("translations/*");
-        this.resolver.setDefaultLocale(Locale.forLanguageTag("en"));
+    @BeforeAll
+    static void beforeAll() {
+        messageSource = new XliffTranslationMessageSource(TestUtilities.getMockedCacheManager());
+        messageSource.setBasenamePattern("translations/*");
+        messageSource.setDefaultLocale(Locale.forLanguageTag("en"));
     }
 }
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 ffc6af4..c9fcd22 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
@@ -37,7 +37,7 @@ void test_getAll() {
     @Test
     void test_put_get_withDomain() {
         this.catalogCache.put(this.locale, "domain", "code", "targetValue");
-        assertEquals("targetValue", this.catalogCache.get(locale, "domain.code"));
+        assertEquals("targetValue", this.catalogCache.get(this.locale, "domain.code"));
     }
 
     @Test
@@ -52,7 +52,7 @@ void test_put_has_withDomain() {
     void test_put_get() {
         Locale locale = Locale.forLanguageTag("en");
         this.catalogCache.put(this.locale, "code", "targetValue");
-        assertEquals("targetValue", this.catalogCache.get(locale, "code"));
+        assertEquals("targetValue", this.catalogCache.get(this.locale, "code"));
     }
 
     @Test
@@ -66,7 +66,13 @@ void test_put_has() {
     @Test
     void test_get_onNull() {
         this.catalogCache.put(this.locale, "domain", "code", "targetValue");
-        assertNull(this.catalogCache.get(locale, "domain.foo"));
+        assertNull(this.catalogCache.get(this.locale, "domain.foo"));
+    }
+
+    @Test
+    void test_get_onNull_localeEmpty() {
+        this.catalogCache.put(this.locale, "domain", "code", "targetValue");
+        assertNull(this.catalogCache.get(Locale.forLanguageTag(""), "domain.foo"));
     }
 
     @Test
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapperTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapperTest.java
index c331288..addc5a1 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapperTest.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/CatalogWrapperTest.java
@@ -1,12 +1,18 @@
 package io.github.alaugks.spring.messagesource.xliff.catalog;
 
 import io.github.alaugks.spring.messagesource.xliff.TestUtilities;
+import io.github.alaugks.spring.messagesource.xliff.catalog.xliff.XliffCatalogBuilder;
+import io.github.alaugks.spring.messagesource.xliff.ressources.ResourcesLoaderInterface;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
 
 import java.util.Locale;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 class CatalogWrapperTest {
 
@@ -21,23 +27,148 @@ void beforeEach() {
 
     @Test
     void test_get() {
-        assertEquals("Hello EN (messages)", this.catalogWrapper.get(locale, "hello_language").toString());
+        assertEquals("Hello EN (messages)", this.catalogWrapper.get(this.locale, "hello_language").toString());
         // again
-        assertEquals("Hello EN (messages)", this.catalogWrapper.get(locale, "messages.hello_language").toString());
+        assertEquals("Hello EN (messages)", this.catalogWrapper.get(this.locale, "messages.hello_language").toString());
         // again
-        assertEquals("Hello EN (messages)", this.catalogWrapper.get(locale, "hello_language").toString());
+        assertEquals("Hello EN (messages)", this.catalogWrapper.get(this.locale, "hello_language").toString());
         // again
-        assertEquals("Hello EN (messages)", this.catalogWrapper.get(locale, "messages.hello_language").toString());
+        assertEquals("Hello EN (messages)", this.catalogWrapper.get(this.locale, "messages.hello_language").toString());
     }
 
     @Test
     void test_put() {
         this.catalogWrapper.setDefaultDomain("foo");
 
-        this.catalogWrapper.put(locale, "foo", "code", "foo_value");
-        assertEquals("foo_value", this.catalogWrapper.get(locale, "code").toString());
+        this.catalogWrapper.put(this.locale, "foo", "code", "foo_value");
+        assertEquals("foo_value", this.catalogWrapper.get(this.locale, "code").toString());
 
-        this.catalogWrapper.put(locale, "bar", "code", "bar_value");
-        assertEquals("bar_value", this.catalogWrapper.get(locale, "bar.code").toString());
+        this.catalogWrapper.put(this.locale, "bar", "code", "bar_value");
+        assertEquals("bar_value", this.catalogWrapper.get(this.locale, "bar.code").toString());
+    }
+
+    @Test
+    void test_getTargetValue_fromCache() {
+        XliffCatalogBuilder xliffCatalogBuilder = new XliffCatalogBuilder();
+        CatalogInterface catalog = TestUtilities.getTestCatalog();
+        ResourcesLoaderInterface resourcesLoader = TestUtilities.getResourcesLoader();
+
+        XliffCatalogBuilder mockedXliffCatalogBuilder = Mockito.spy(xliffCatalogBuilder);
+
+        CatalogWrapper catalogWrapper = new CatalogWrapper(
+                TestUtilities.getMockedCacheManager(),
+                resourcesLoader,
+                mockedXliffCatalogBuilder,
+                catalog
+        );
+
+        CatalogWrapper mockedCatalogWrapper = Mockito.spy(catalogWrapper);
+        mockedCatalogWrapper.initCache();
+        mockedCatalogWrapper.get(this.locale, "messages.hello_language"); // From Cache
+        mockedCatalogWrapper.get(this.locale, "roadrunner"); // From Cache
+
+        // initCache() called createCatalog(resourcesLoader, catalog)
+        // But createCatalog(resourcesLoader, catalog) will not be called the second time.
+        InOrder orderVerifier = Mockito.inOrder(mockedCatalogWrapper, mockedXliffCatalogBuilder);
+        orderVerifier.verify(mockedCatalogWrapper).initCache();
+        orderVerifier.verify(mockedXliffCatalogBuilder).createCatalog(resourcesLoader, catalog);
+
+        verify(mockedCatalogWrapper, times(1)).initCache();
+        verify(mockedXliffCatalogBuilder, times(1)).createCatalog(resourcesLoader, catalog);
+    }
+
+    @Test
+    void test_getTargetValue_fromCatalog_fromCache() {
+        XliffCatalogBuilder xliffCatalogBuilder = new XliffCatalogBuilder();
+        CatalogInterface catalog = TestUtilities.getTestCatalog();
+        ResourcesLoaderInterface resourcesLoader = TestUtilities.getResourcesLoader();
+        XliffCatalogBuilder mockedXliffCatalogBuilder = Mockito.spy(xliffCatalogBuilder);
+
+        CatalogWrapper catalogWrapper = new CatalogWrapper(
+                TestUtilities.getMockedCacheManager(),
+                resourcesLoader,
+                mockedXliffCatalogBuilder,
+                catalog
+        );
+
+        catalogWrapper.get(this.locale, "messages.hello_language"); // From Files + Init Cache
+        catalogWrapper.get(this.locale, "messages.hello_language"); // From Cache
+        catalogWrapper.get(this.locale, "roadrunner"); // From Cache
+        catalogWrapper.get(this.locale, "messages.hello_language"); // From Cache
+
+        verify(mockedXliffCatalogBuilder, times(1)).createCatalog(resourcesLoader, catalog);
+    }
+
+    @Test
+    void test_getTargetValue_fromCatalog_cacheNotInit() {
+        XliffCatalogBuilder xliffCatalogBuilder = new XliffCatalogBuilder();
+        CatalogInterface catalog = TestUtilities.getTestCatalog();
+        ResourcesLoaderInterface resourcesLoader = TestUtilities.getResourcesLoader();
+        XliffCatalogBuilder mockedXliffCatalogBuilder = Mockito.spy(xliffCatalogBuilder);
+
+        CatalogWrapper catalogWrapper = new CatalogWrapper(
+                TestUtilities.getMockedCacheManager(),
+                resourcesLoader,
+                mockedXliffCatalogBuilder,
+                catalog
+        );
+
+        catalogWrapper.get(this.locale, "messages.hello_language");
+
+        verify(mockedXliffCatalogBuilder, times(1)).createCatalog(resourcesLoader, catalog);
+    }
+
+    @Test
+    void test_fillCacheWithCodeBecauseCodeNotExists() {
+        XliffCatalogBuilder xliffCatalogBuilder = new XliffCatalogBuilder();
+        CatalogInterface catalog = TestUtilities.getTestCatalog();
+        ResourcesLoaderInterface resourcesLoader = TestUtilities.getResourcesLoader();
+        XliffCatalogBuilder mockedXliffCatalogBuilder = Mockito.spy(xliffCatalogBuilder);
+
+        CatalogWrapper catalogWrapper = new CatalogWrapper(
+                TestUtilities.getMockedCacheManager(),
+                resourcesLoader,
+                mockedXliffCatalogBuilder,
+                catalog
+        );
+
+        CatalogWrapper mockedCatalogWrapper = Mockito.spy(catalogWrapper);
+        mockedCatalogWrapper.initCache();
+
+        // First: put
+        assertEquals(
+                "messages.hello_language_not_exists",
+                mockedCatalogWrapper.get(this.locale, "messages.hello_language_not_exists").toString()
+        );
+
+        // Second: Get from Cache
+        assertEquals(
+                "messages.hello_language_not_exists",
+                mockedCatalogWrapper.get(this.locale, "messages.hello_language_not_exists").toString()
+        );
+
+        InOrder orderVerifier = Mockito.inOrder(mockedCatalogWrapper, mockedXliffCatalogBuilder);
+        // code not exists in cache
+        orderVerifier.verify(mockedCatalogWrapper).initCache();
+        // initCache() called createCatalog()
+        orderVerifier.verify(mockedXliffCatalogBuilder).createCatalog(resourcesLoader, catalog);
+        // get() called createCatalog() because code not exists in cache
+        orderVerifier.verify(mockedXliffCatalogBuilder).createCatalog(resourcesLoader, catalog);
+        // code add cache
+        orderVerifier.verify(mockedCatalogWrapper).put(
+                this.locale,
+                "messages",
+                "messages.hello_language_not_exists",
+                "messages.hello_language_not_exists"
+        );
+
+        verify(mockedCatalogWrapper, times(1)).initCache();
+        verify(mockedXliffCatalogBuilder, times(2)).createCatalog(resourcesLoader, catalog);
+        verify(mockedCatalogWrapper, times(1)).put(
+                this.locale,
+                "messages",
+                "messages.hello_language_not_exists",
+                "messages.hello_language_not_exists"
+        );
     }
 }
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20Test.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20Test.java
index 29eed3d..b2a822f 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20Test.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff20Test.java
@@ -28,7 +28,7 @@ void beforeEach() throws ParserConfigurationException, IOException, SAXException
 
     @Test
     void test_readXliffFile() {
-        Xliff20 version = new Xliff20();
+        Xliff2 version = new Xliff2();
         CatalogInterface catalog = new Catalog();
         Locale locale = Locale.forLanguageTag("en");
         version.read(catalog, document, "domain", locale);
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21Test.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21Test.java
index 6d7083a..0c5c066 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21Test.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/Xliff21Test.java
@@ -28,7 +28,7 @@ void beforeEach() throws ParserConfigurationException, IOException, SAXException
 
     @Test
     void test_readXliffFile() {
-        Xliff21 version = new Xliff21();
+        Xliff2 version = new Xliff2();
         CatalogInterface catalog = new Catalog();
         Locale locale = Locale.forLanguageTag("en");
         version.read(catalog, document, "domain", locale);
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtilityTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtilityTest.java
index 92d8cfb..4db393e 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtilityTest.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffParserUtilityTest.java
@@ -1,8 +1,12 @@
 package io.github.alaugks.spring.messagesource.xliff.catalog.xliff;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -10,16 +14,26 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 class XliffParserUtilityTest {
-    @Test
-    void test_createCode() {
-        assertEquals("my-resname", XliffParserUtility.getCode(null, "my-resname", "my-target-value"));
-        assertEquals("my-resname", XliffParserUtility.getCode("my-id", "my-resname", "my-target-value"));
-        assertEquals("my-id", XliffParserUtility.getCode("my-id", null, "my-target-value"));
+
+    @ParameterizedTest(name = "{index} => elementName={0}, translationUnitIdentifiers={1}, expected={2}")
+    @MethodSource("getCodeProvider")
+    void test_getCode(
+            String elementName,
+            ArrayList<String> translationUnitIdentifiers,
+            String expected
+    ) {
+        NodeList nodeList = XliffParserUtility.getTranslationUnits(getDocument(), elementName);
+        Element node = (Element) nodeList.item(0);
+        assertEquals(expected, XliffParserUtility.getCode(node, translationUnitIdentifiers));
     }
 
     @Test
@@ -41,7 +55,7 @@ void test_getElementValue_getCharacterDataFromElement_Node() {
         assertNull(value);
     }
 
-    private static Element getRootElement() {
+    private static Document getDocument() {
         try {
             InputStream fileStream = XliffParserUtilityTest
                     .class
@@ -50,11 +64,53 @@ private static Element getRootElement() {
 
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(fileStream);
-            return document.getDocumentElement();
+            return builder.parse(fileStream);
         } catch (ParserConfigurationException | IOException | SAXException e) {
             return null;
         }
     }
 
+    private static Element getRootElement() {
+        return Objects.requireNonNull(getDocument()).getDocumentElement();
+    }
+
+    private static Stream<Arguments> getCodeProvider() {
+        return Stream.of(
+            Arguments.of(
+                    "trans-unit-a",
+                    new ArrayList<>(Arrays.asList("resname", "id")),
+                    "resname-a"
+            ),
+            Arguments.of(
+                    "trans-unit-a",
+                    new ArrayList<>(Arrays.asList("id", "resname")),
+                    "id-a"
+            ),
+            Arguments.of(
+                    "trans-unit-b",
+                    new ArrayList<>(Arrays.asList("resname", "id")),
+                    "id-b"
+            ),
+            Arguments.of(
+                    "trans-unit-b",
+                    new ArrayList<>(Arrays.asList("id", "resname")),
+                    "id-b"
+            ),
+            Arguments.of(
+                    "trans-unit-c",
+                    new ArrayList<>(Arrays.asList("id", "resname")),
+                    null
+            ),
+            Arguments.of(
+                    "trans-unit-c",
+                    new ArrayList<>(),
+                    null
+            ),
+            Arguments.of(
+                    "trans-unit-c",
+                    null,
+                    null
+            )
+        );
+    }
 }
diff --git a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReaderTest.java b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReaderTest.java
index 855e0b7..f1f5070 100644
--- a/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReaderTest.java
+++ b/src/test/java/io/github/alaugks/spring/messagesource/xliff/catalog/xliff/XliffReaderTest.java
@@ -18,8 +18,8 @@ void beforeEach() {
     @Test
     void test_supportedVersions() {
         assertInstanceOf(Xliff12.class, this.reader.getReader("1.2"));
-        assertInstanceOf(Xliff20.class, this.reader.getReader("2.0"));
-        assertInstanceOf(Xliff21.class, this.reader.getReader("2.1"));
+        assertInstanceOf(Xliff2.class, this.reader.getReader("2.0"));
+        assertInstanceOf(Xliff2.class, this.reader.getReader("2.1"));
     }
 
     @Test
diff --git a/src/test/resources/fixtures/xliff-parser-utility-test.xliff b/src/test/resources/fixtures/xliff-parser-utility-test.xliff
index 9a6a827..502785d 100644
--- a/src/test/resources/fixtures/xliff-parser-utility-test.xliff
+++ b/src/test/resources/fixtures/xliff-parser-utility-test.xliff
@@ -11,4 +11,7 @@
                         ]]>
     </element-with-cdata-newline>
     <dummy><dummy-inner/></dummy>
+    <trans-unit-a id="id-a" resname="resname-a" />
+    <trans-unit-b id="id-b" />
+    <trans-unit-c />
 </root>
diff --git a/src/test/resources/translations/messages.xliff b/src/test/resources/translations/messages.xliff
index 4958922..a3bc7ca 100644
--- a/src/test/resources/translations/messages.xliff
+++ b/src/test/resources/translations/messages.xliff
@@ -22,6 +22,22 @@
                     {0} and {1}
                 </target>
             </trans-unit>
+            <trans-unit id="code-id-a" resname="code-resname-a">
+                <source>
+                    Source
+                </source>
+                <target>
+                    Target
+                </target>
+            </trans-unit>
+            <trans-unit id="code-id-b">
+                <source>
+                    Source
+                </source>
+                <target>
+                    Target
+                </target>
+            </trans-unit>
         </body>
     </file>
 </xliff>