Move parsers from core-api #10650

enonic · Aug 15, 2024 · eb7923e · eb7923e
1 parent dcefb15
commit eb7923e
Show file tree

Hide file tree

Showing 102 changed files with 139 additions and 86 deletions.
diff --git a/modules/admin/admin-impl/build.gradle b/modules/admin/admin-impl/build.gradle
@@ -1,8 +1,10 @@
 dependencies {
     implementation project( ':admin:admin-api' )
     implementation project( ':core:core-internal' )
+    implementation project( ':core:core-parser' )
 
     testImplementation( testFixtures( project(":core:core-api") ) )
+    testImplementation( testFixtures( project(":core:core-parser") ) )
     testImplementation( testFixtures( project(":core:core-app") ) )
     testImplementation( testFixtures( project(":web:web-api") ) )
     testImplementation( testFixtures( project(":jaxrs:jaxrs-impl") ) )

diff --git a/modules/core/core-app/build.gradle b/modules/core/core-app/build.gradle
@@ -1,6 +1,7 @@
 dependencies {
     implementation project( ':core:core-api' )
     implementation project( ':core:core-internal' )
+    implementation project( ':core:core-parser' )
     implementation libs.osgi.service.cm
 
     testFixturesApi project( ':core:core-api' )

diff --git a/modules/core/core-auth/build.gradle b/modules/core/core-auth/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
 
     testImplementation( testFixtures( project(":core:core-app") ) )
 }

diff --git a/modules/core/core-common/build.gradle b/modules/core/core-common/build.gradle
@@ -0,0 +1,7 @@
+dependencies {
+    implementation project( ':core:core-api' )
+}
+
+jar {
+    bnd( 'Bundle-Name': 'Enonic XP Core - Common', 'Export-Package': 'com.enonic.xp.*' )
+}
diff --git a/modules/core/core-common/src/main/java/com/enonic/xp/impl/common/ApiMountResolver.java b/modules/core/core-common/src/main/java/com/enonic/xp/impl/common/ApiMountResolver.java
@@ -0,0 +1,40 @@
+package com.enonic.xp.impl.common;
+
+import com.enonic.xp.app.ApplicationKey;
+
+public final class ApiMountResolver
+{
+    private static final int APPLICATION_KEY_INDEX = 0;
+
+    private static final int API_KEY_INDEX = 1;
+
+    private final String[] apiMountParts;
+
+    public ApiMountResolver( final String apiMount )
+    {
+        this.apiMountParts = apiMount.split( ":", 2 );
+    }
+
+    public ApplicationKey resolveApplicationKey()
+    {
+        return apiMountParts.length != 1 ? resolveApplicationKey( apiMountParts[APPLICATION_KEY_INDEX].trim() ) : null;
+    }
+
+    public String resolveApiKey()
+    {
+        final String trimmedApiKey = apiMountParts.length == 1 ? apiMountParts[0].trim() : apiMountParts[API_KEY_INDEX].trim();
+        return trimmedApiKey.isBlank() ? null : trimmedApiKey;
+    }
+
+    private ApplicationKey resolveApplicationKey( final String applicationKey )
+    {
+        try
+        {
+            return ApplicationKey.from( applicationKey );
+        }
+        catch ( Exception e )
+        {
+            throw new IllegalArgumentException( String.format( "Invalid applicationKey '%s'", applicationKey ), e );
+        }
+    }
+}
diff --git a/modules/core/core-content/build.gradle b/modules/core/core-content/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
     implementation project( ':core:core-internal' )
 
     testFixturesApi( testFixtures( project(":core:core-app") ) )

diff --git a/modules/core/core-export/build.gradle b/modules/core/core-export/build.gradle
@@ -1,7 +1,8 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
 
-    testImplementation( testFixtures( project(":core:core-repo") ) )
+    testImplementation( testFixtures( project( ":core:core-repo" ) ) )
 }
 
 jar {

diff --git a/modules/core/core-macro/build.gradle b/modules/core/core-macro/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
     implementation project( ':core:core-internal' )
 
     testImplementation( testFixtures( project(":core:core-app") ) )

diff --git a/modules/core/core-parser/build.gradle b/modules/core/core-parser/build.gradle
@@ -0,0 +1,11 @@
+dependencies {
+    api( libs.guava ) {
+        exclude group: 'com.google.code.findbugs'
+    }
+    implementation project( ':core:core-api' )
+    implementation project( ':core:core-common' )
+}
+
+jar {
+    bnd( 'Bundle-Name': 'Enonic XP Core - Parser', 'Export-Package': 'com.enonic.xp.*' )
+}
diff --git a/...in/java/com/enonic/xp/xml/DomBuilder.java → ...in/java/com/enonic/xp/xml/DomBuilder.java b/...in/java/com/enonic/xp/xml/DomBuilder.java → ...in/java/com/enonic/xp/xml/DomBuilder.java
@@ -3,9 +3,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.enonic.xp.annotation.PublicApi;
-
-@PublicApi
 public final class DomBuilder
 {
     private final Document document;

diff --git a/...in/java/com/enonic/xp/xml/DomElement.java → ...in/java/com/enonic/xp/xml/DomElement.java b/...in/java/com/enonic/xp/xml/DomElement.java → ...in/java/com/enonic/xp/xml/DomElement.java
@@ -13,12 +13,10 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.enonic.xp.annotation.PublicApi;
 import com.enonic.xp.convert.Converters;
 
 import static com.google.common.base.Strings.nullToEmpty;
 
-@PublicApi
 public final class DomElement
 {
     private final Element elem;

diff --git a/...ain/java/com/enonic/xp/xml/DomHelper.java → ...ain/java/com/enonic/xp/xml/DomHelper.java b/...ain/java/com/enonic/xp/xml/DomHelper.java → ...ain/java/com/enonic/xp/xml/DomHelper.java
diff --git a/...ic/xp/xml/parser/ByteOrderMarkHelper.java → ...ic/xp/xml/parser/ByteOrderMarkHelper.java b/...ic/xp/xml/parser/ByteOrderMarkHelper.java → ...ic/xp/xml/parser/ByteOrderMarkHelper.java
diff --git a/...parser/ContentSelectorAliasConverter.java → ...parser/ContentSelectorAliasConverter.java b/...parser/ContentSelectorAliasConverter.java → ...parser/ContentSelectorAliasConverter.java
diff --git a/...p/xml/parser/InputTypeAliasConverter.java → ...p/xml/parser/InputTypeAliasConverter.java b/...p/xml/parser/InputTypeAliasConverter.java → ...p/xml/parser/InputTypeAliasConverter.java
diff --git a/.../xml/parser/InputTypeAliasConverters.java → .../xml/parser/InputTypeAliasConverters.java b/.../xml/parser/InputTypeAliasConverters.java → .../xml/parser/InputTypeAliasConverters.java
diff --git a/...c/xp/xml/parser/XmlApplicationParser.java → ...c/xp/xml/parser/XmlApplicationParser.java b/...c/xp/xml/parser/XmlApplicationParser.java → ...c/xp/xml/parser/XmlApplicationParser.java
diff --git a/...c/xp/xml/parser/XmlContentTypeParser.java → ...c/xp/xml/parser/XmlContentTypeParser.java b/...c/xp/xml/parser/XmlContentTypeParser.java → ...c/xp/xml/parser/XmlContentTypeParser.java
diff --git a/...m/enonic/xp/xml/parser/XmlFormMapper.java → ...m/enonic/xp/xml/parser/XmlFormMapper.java b/...m/enonic/xp/xml/parser/XmlFormMapper.java → ...m/enonic/xp/xml/parser/XmlFormMapper.java
diff --git a/...parser/XmlIdProviderDescriptorParser.java → ...parser/XmlIdProviderDescriptorParser.java b/...parser/XmlIdProviderDescriptorParser.java → ...parser/XmlIdProviderDescriptorParser.java
diff --git a/.../xml/parser/XmlInputTypeConfigMapper.java → .../xml/parser/XmlInputTypeConfigMapper.java b/.../xml/parser/XmlInputTypeConfigMapper.java → .../xml/parser/XmlInputTypeConfigMapper.java
diff --git a/...xml/parser/XmlInputTypeDefaultMapper.java → ...xml/parser/XmlInputTypeDefaultMapper.java b/...xml/parser/XmlInputTypeDefaultMapper.java → ...xml/parser/XmlInputTypeDefaultMapper.java
diff --git a/...xml/parser/XmlLayoutDescriptorParser.java → ...xml/parser/XmlLayoutDescriptorParser.java b/...xml/parser/XmlLayoutDescriptorParser.java → ...xml/parser/XmlLayoutDescriptorParser.java
diff --git a/.../xml/parser/XmlMacroDescriptorParser.java → .../xml/parser/XmlMacroDescriptorParser.java b/.../xml/parser/XmlMacroDescriptorParser.java → .../xml/parser/XmlMacroDescriptorParser.java
diff --git a/.../enonic/xp/xml/parser/XmlMixinParser.java → .../enonic/xp/xml/parser/XmlMixinParser.java b/.../enonic/xp/xml/parser/XmlMixinParser.java → .../enonic/xp/xml/parser/XmlMixinParser.java
diff --git a/.../enonic/xp/xml/parser/XmlModelParser.java → .../enonic/xp/xml/parser/XmlModelParser.java b/.../enonic/xp/xml/parser/XmlModelParser.java → .../enonic/xp/xml/parser/XmlModelParser.java
diff --git a/...enonic/xp/xml/parser/XmlObjectParser.java → ...enonic/xp/xml/parser/XmlObjectParser.java b/...enonic/xp/xml/parser/XmlObjectParser.java → ...enonic/xp/xml/parser/XmlObjectParser.java
diff --git a/...p/xml/parser/XmlPageDescriptorParser.java → ...p/xml/parser/XmlPageDescriptorParser.java b/...p/xml/parser/XmlPageDescriptorParser.java → ...p/xml/parser/XmlPageDescriptorParser.java
diff --git a/...p/xml/parser/XmlPartDescriptorParser.java → ...p/xml/parser/XmlPartDescriptorParser.java b/...p/xml/parser/XmlPartDescriptorParser.java → ...p/xml/parser/XmlPartDescriptorParser.java
diff --git a/...ml/parser/XmlRegionDescriptorsMapper.java → ...ml/parser/XmlRegionDescriptorsMapper.java b/...ml/parser/XmlRegionDescriptorsMapper.java → ...ml/parser/XmlRegionDescriptorsMapper.java
diff --git a/...xml/parser/XmlRelationshipTypeParser.java → ...xml/parser/XmlRelationshipTypeParser.java b/...xml/parser/XmlRelationshipTypeParser.java → ...xml/parser/XmlRelationshipTypeParser.java
diff --git a/...ml/parser/XmlServiceDescriptorParser.java → ...ml/parser/XmlServiceDescriptorParser.java b/...ml/parser/XmlServiceDescriptorParser.java → ...ml/parser/XmlServiceDescriptorParser.java
diff --git a/...m/enonic/xp/xml/parser/XmlSiteParser.java → ...m/enonic/xp/xml/parser/XmlSiteParser.java b/...m/enonic/xp/xml/parser/XmlSiteParser.java → ...m/enonic/xp/xml/parser/XmlSiteParser.java
@@ -2,12 +2,13 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.enonic.xp.api.ApiMountDescriptor;
 import com.enonic.xp.api.ApiMountDescriptors;
-import com.enonic.xp.app.ApplicationKey;
 import com.enonic.xp.app.ApplicationRelativeResolver;
+import com.enonic.xp.impl.common.ApiMountResolver;
 import com.enonic.xp.resource.ResourceKey;
 import com.enonic.xp.site.SiteDescriptor;
 import com.enonic.xp.site.XDataMapping;
@@ -66,10 +67,6 @@ public final class XmlSiteParser
 
     private static final String API_DESCRIPTOR_TAG_NAME = "api";
 
-    private static final int APPLICATION_KEY_INDEX = 0;
-
-    private static final int API_KEY_INDEX = 1;
-
     private SiteDescriptor.Builder siteDescriptorBuilder;
 
     public XmlSiteParser siteDescriptorBuilder( final SiteDescriptor.Builder siteDescriptorBuilder )
@@ -228,42 +225,11 @@ private ControllerMappingDescriptor toMappingDescriptor( final DomElement mappin
 
     private ApiMountDescriptor toApiMountDescriptor( final DomElement apiElement )
     {
-        final ApiMountDescriptor.Builder builder = ApiMountDescriptor.create();
-
-        final String apiMount = apiElement.getValue().trim();
+        final ApiMountResolver apiMountResolver = new ApiMountResolver( apiElement.getValue().trim() );
 
-        if ( !apiMount.contains( ":" ) )
-        {
-            builder.applicationKey( this.currentApplication );
-            if ( !apiMount.isBlank() )
-            {
-                builder.apiKey( apiMount );
-            }
-        }
-        else
-        {
-            final String[] parts = apiMount.split( ":", 2 );
-
-            builder.applicationKey( resolveApplicationKey( parts[APPLICATION_KEY_INDEX].trim() ) );
-            final String apiKey = parts[API_KEY_INDEX].trim();
-            if ( !apiKey.isBlank() )
-            {
-                builder.apiKey( apiKey );
-            }
-        }
-
-        return builder.build();
-    }
-
-    private ApplicationKey resolveApplicationKey( final String applicationKey )
-    {
-        try
-        {
-            return ApplicationKey.from( applicationKey );
-        }
-        catch ( Exception e )
-        {
-            throw new IllegalArgumentException( String.format( "Invalid applicationKey '%s'", applicationKey ), e );
-        }
+        return ApiMountDescriptor.create()
+            .applicationKey( Objects.requireNonNullElse( apiMountResolver.resolveApplicationKey(), this.currentApplication ) )
+            .apiKey( apiMountResolver.resolveApiKey() )
+            .build();
     }
 }
diff --git a/.../xml/parser/XmlStyleDescriptorParser.java → .../xml/parser/XmlStyleDescriptorParser.java b/.../xml/parser/XmlStyleDescriptorParser.java → .../xml/parser/XmlStyleDescriptorParser.java
diff --git a/...xml/parser/XmlWebappDescriptorParser.java → ...xml/parser/XmlWebappDescriptorParser.java b/...xml/parser/XmlWebappDescriptorParser.java → ...xml/parser/XmlWebappDescriptorParser.java
@@ -2,12 +2,13 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.enonic.xp.annotation.PublicApi;
 import com.enonic.xp.api.ApiMountDescriptor;
 import com.enonic.xp.api.ApiMountDescriptors;
-import com.enonic.xp.app.ApplicationKey;
+import com.enonic.xp.impl.common.ApiMountResolver;
 import com.enonic.xp.webapp.WebappDescriptor;
 import com.enonic.xp.xml.DomElement;
 
@@ -55,42 +56,11 @@ private List<ApiMountDescriptor> parseApiMounts( final DomElement apisElement )
 
     private ApiMountDescriptor toApiMountDescriptor( final DomElement apiElement )
     {
-        final ApiMountDescriptor.Builder builder = ApiMountDescriptor.create();
+        final ApiMountResolver apiMountResolver = new ApiMountResolver( apiElement.getValue().trim() );
 
-        final String apiMount = apiElement.getValue().trim();
-
-        if ( !apiMount.contains( ":" ) )
-        {
-            builder.applicationKey( this.currentApplication );
-            if ( !apiMount.isBlank() )
-            {
-                builder.apiKey( apiMount );
-            }
-        }
-        else
-        {
-            final String[] parts = apiMount.split( ":", 2 );
-
-            builder.applicationKey( resolveApplicationKey( parts[APPLICATION_KEY_INDEX].trim() ) );
-            final String apiKey = parts[API_KEY_INDEX].trim();
-            if ( !apiKey.isBlank() )
-            {
-                builder.apiKey( apiKey );
-            }
-        }
-
-        return builder.build();
-    }
-
-    private ApplicationKey resolveApplicationKey( final String applicationKey )
-    {
-        try
-        {
-            return ApplicationKey.from( applicationKey );
-        }
-        catch ( Exception e )
-        {
-            throw new IllegalArgumentException( String.format( "Invalid applicationKey '%s'", applicationKey ), e );
-        }
+        return ApiMountDescriptor.create()
+            .applicationKey( Objects.requireNonNullElse( apiMountResolver.resolveApplicationKey(), this.currentApplication ) )
+            .apiKey( apiMountResolver.resolveApiKey() )
+            .build();
     }
 }
diff --git a/.../enonic/xp/xml/parser/XmlXDataParser.java → .../enonic/xp/xml/parser/XmlXDataParser.java b/.../enonic/xp/xml/parser/XmlXDataParser.java → .../enonic/xp/xml/parser/XmlXDataParser.java
diff --git a/...ava/com/enonic/xp/xml/DomBuilderTest.java → ...ava/com/enonic/xp/xml/DomBuilderTest.java b/...ava/com/enonic/xp/xml/DomBuilderTest.java → ...ava/com/enonic/xp/xml/DomBuilderTest.java
diff --git a/...java/com/enonic/xp/xml/DomHelperTest.java → ...java/com/enonic/xp/xml/DomHelperTest.java b/...java/com/enonic/xp/xml/DomHelperTest.java → ...java/com/enonic/xp/xml/DomHelperTest.java
diff --git a/...p/xml/parser/ByteOrderMarkHelperTest.java → ...p/xml/parser/ByteOrderMarkHelperTest.java b/...p/xml/parser/ByteOrderMarkHelperTest.java → ...p/xml/parser/ByteOrderMarkHelperTest.java
diff --git a/.../parser/InputTypeAliasConvertersTest.java → .../parser/InputTypeAliasConvertersTest.java b/.../parser/InputTypeAliasConvertersTest.java → .../parser/InputTypeAliasConvertersTest.java
diff --git a/.../xml/parser/XmlApplicationParserTest.java → .../xml/parser/XmlApplicationParserTest.java b/.../xml/parser/XmlApplicationParserTest.java → .../xml/parser/XmlApplicationParserTest.java
diff --git a/.../xml/parser/XmlContentTypeParserTest.java → .../xml/parser/XmlContentTypeParserTest.java b/.../xml/parser/XmlContentTypeParserTest.java → .../xml/parser/XmlContentTypeParserTest.java
diff --git a/.../parser/XmlInputTypeConfigMapperTest.java → .../parser/XmlInputTypeConfigMapperTest.java b/.../parser/XmlInputTypeConfigMapperTest.java → .../parser/XmlInputTypeConfigMapperTest.java
diff --git a/...parser/XmlLayoutDescriptorParserTest.java → ...parser/XmlLayoutDescriptorParserTest.java b/...parser/XmlLayoutDescriptorParserTest.java → ...parser/XmlLayoutDescriptorParserTest.java
diff --git a/.../parser/XmlMacroDescriptorParserTest.java → .../parser/XmlMacroDescriptorParserTest.java b/.../parser/XmlMacroDescriptorParserTest.java → .../parser/XmlMacroDescriptorParserTest.java
diff --git a/...nic/xp/xml/parser/XmlMixinParserTest.java → ...nic/xp/xml/parser/XmlMixinParserTest.java b/...nic/xp/xml/parser/XmlMixinParserTest.java → ...nic/xp/xml/parser/XmlMixinParserTest.java
diff --git a/...l/parser/XmlPageDescriptorParserTest.java → ...l/parser/XmlPageDescriptorParserTest.java b/...l/parser/XmlPageDescriptorParserTest.java → ...l/parser/XmlPageDescriptorParserTest.java
diff --git a/...l/parser/XmlPartDescriptorParserTest.java → ...l/parser/XmlPartDescriptorParserTest.java b/...l/parser/XmlPartDescriptorParserTest.java → ...l/parser/XmlPartDescriptorParserTest.java
diff --git a/...parser/XmlRelationshipTypeParserTest.java → ...parser/XmlRelationshipTypeParserTest.java b/...parser/XmlRelationshipTypeParserTest.java → ...parser/XmlRelationshipTypeParserTest.java
diff --git a/...arser/XmlServiceDescriptorParserTest.java → ...arser/XmlServiceDescriptorParserTest.java b/...arser/XmlServiceDescriptorParserTest.java → ...arser/XmlServiceDescriptorParserTest.java
diff --git a/...onic/xp/xml/parser/XmlSiteParserTest.java → ...onic/xp/xml/parser/XmlSiteParserTest.java b/...onic/xp/xml/parser/XmlSiteParserTest.java → ...onic/xp/xml/parser/XmlSiteParserTest.java
diff --git a/.../parser/XmlStyleDescriptorParserTest.java → .../parser/XmlStyleDescriptorParserTest.java b/.../parser/XmlStyleDescriptorParserTest.java → .../parser/XmlStyleDescriptorParserTest.java
diff --git a/...parser/XmlWebappDescriptorParserTest.java → ...parser/XmlWebappDescriptorParserTest.java b/...parser/XmlWebappDescriptorParserTest.java → ...parser/XmlWebappDescriptorParserTest.java
diff --git a/...nic/xp/xml/parser/XmlXDataParserTest.java → ...nic/xp/xml/parser/XmlXDataParserTest.java b/...nic/xp/xml/parser/XmlXDataParserTest.java → ...nic/xp/xml/parser/XmlXDataParserTest.java
diff --git a/.../resources/com/enonic/xp/xml/document.xml → .../resources/com/enonic/xp/xml/document.xml b/.../resources/com/enonic/xp/xml/document.xml → .../resources/com/enonic/xp/xml/document.xml
diff --git a/...tionParserTest-serialized-application.xml → ...tionParserTest-serialized-application.xml b/...tionParserTest-serialized-application.xml → ...tionParserTest-serialized-application.xml
diff --git a/...entTypeParserTest-i18n-only-attribute.xml → ...entTypeParserTest-i18n-only-attribute.xml b/...entTypeParserTest-i18n-only-attribute.xml → ...entTypeParserTest-i18n-only-attribute.xml
diff --git a/.../parser/XmlContentTypeParserTest-i18n.xml → .../parser/XmlContentTypeParserTest-i18n.xml b/.../parser/XmlContentTypeParserTest-i18n.xml → .../parser/XmlContentTypeParserTest-i18n.xml
diff --git a/...arser/XmlContentTypeParserTest-mixins.xml → ...arser/XmlContentTypeParserTest-mixins.xml b/...arser/XmlContentTypeParserTest-mixins.xml → ...arser/XmlContentTypeParserTest-mixins.xml
diff --git a/...er/XmlContentTypeParserTest-optionSet.xml → ...er/XmlContentTypeParserTest-optionSet.xml b/...er/XmlContentTypeParserTest-optionSet.xml → ...er/XmlContentTypeParserTest-optionSet.xml
diff --git a/...p/xml/parser/XmlContentTypeParserTest.xml → ...p/xml/parser/XmlContentTypeParserTest.xml b/...p/xml/parser/XmlContentTypeParserTest.xml → ...p/xml/parser/XmlContentTypeParserTest.xml
diff --git a/.../XmlInputTypeConfigMapperTest-aliased.xml → .../XmlInputTypeConfigMapperTest-aliased.xml b/.../XmlInputTypeConfigMapperTest-aliased.xml → .../XmlInputTypeConfigMapperTest-aliased.xml
diff --git a/...lInputTypeConfigMapperTest-attributes.xml → ...lInputTypeConfigMapperTest-attributes.xml b/...lInputTypeConfigMapperTest-attributes.xml → ...lInputTypeConfigMapperTest-attributes.xml
diff --git a/...mlInputTypeConfigMapperTest-camelcase.xml → ...mlInputTypeConfigMapperTest-camelcase.xml b/...mlInputTypeConfigMapperTest-camelcase.xml → ...mlInputTypeConfigMapperTest-camelcase.xml
diff --git a/...er/XmlInputTypeConfigMapperTest-empty.xml → ...er/XmlInputTypeConfigMapperTest-empty.xml b/...er/XmlInputTypeConfigMapperTest-empty.xml → ...er/XmlInputTypeConfigMapperTest-empty.xml
diff --git a/...ser/XmlInputTypeConfigMapperTest-none.xml → ...ser/XmlInputTypeConfigMapperTest-none.xml b/...ser/XmlInputTypeConfigMapperTest-none.xml → ...ser/XmlInputTypeConfigMapperTest-none.xml
diff --git a/.../XmlInputTypeConfigMapperTest-resolve.xml → .../XmlInputTypeConfigMapperTest-resolve.xml b/.../XmlInputTypeConfigMapperTest-resolve.xml → .../XmlInputTypeConfigMapperTest-resolve.xml
diff --git a/...r/XmlInputTypeConfigMapperTest-simple.xml → ...r/XmlInputTypeConfigMapperTest-simple.xml b/...r/XmlInputTypeConfigMapperTest-simple.xml → ...r/XmlInputTypeConfigMapperTest-simple.xml
diff --git a/.../parser/XmlLayoutDescriptorParserTest.xml → .../parser/XmlLayoutDescriptorParserTest.xml b/.../parser/XmlLayoutDescriptorParserTest.xml → .../parser/XmlLayoutDescriptorParserTest.xml
diff --git a/...l/parser/XmlMacroDescriptorParserTest.xml → ...l/parser/XmlMacroDescriptorParserTest.xml b/...l/parser/XmlMacroDescriptorParserTest.xml → ...l/parser/XmlMacroDescriptorParserTest.xml
diff --git a/...onic/xp/xml/parser/XmlMixinParserTest.xml → ...onic/xp/xml/parser/XmlMixinParserTest.xml b/...onic/xp/xml/parser/XmlMixinParserTest.xml → ...onic/xp/xml/parser/XmlMixinParserTest.xml
diff --git a/...ml/parser/XmlPageDescriptorParserTest.xml → ...ml/parser/XmlPageDescriptorParserTest.xml b/...ml/parser/XmlPageDescriptorParserTest.xml → ...ml/parser/XmlPageDescriptorParserTest.xml
diff --git a/...ml/parser/XmlPartDescriptorParserTest.xml → ...ml/parser/XmlPartDescriptorParserTest.xml b/...ml/parser/XmlPartDescriptorParserTest.xml → ...ml/parser/XmlPartDescriptorParserTest.xml
diff --git a/.../parser/XmlRelationshipTypeParserTest.xml → .../parser/XmlRelationshipTypeParserTest.xml b/.../parser/XmlRelationshipTypeParserTest.xml → .../parser/XmlRelationshipTypeParserTest.xml
diff --git a/...parser/XmlServiceDescriptorParserTest.xml → ...parser/XmlServiceDescriptorParserTest.xml b/...parser/XmlServiceDescriptorParserTest.xml → ...parser/XmlServiceDescriptorParserTest.xml
diff --git a/...l/parser/XmlSiteParserTest-empty-site.xml → ...l/parser/XmlSiteParserTest-empty-site.xml b/...l/parser/XmlSiteParserTest-empty-site.xml → ...l/parser/XmlSiteParserTest-empty-site.xml
diff --git a/...eParserTest-serialized-site-with-apis.xml → ...eParserTest-serialized-site-with-apis.xml b/...eParserTest-serialized-site-with-apis.xml → ...eParserTest-serialized-site-with-apis.xml
diff --git a/...-serialized-site-with-mapping-filters.xml → ...-serialized-site-with-mapping-filters.xml b/...-serialized-site-with-mapping-filters.xml → ...-serialized-site-with-mapping-filters.xml
diff --git a/...zed-site-with-mapping-service-invalid.xml → ...zed-site-with-mapping-service-invalid.xml b/...zed-site-with-mapping-service-invalid.xml → ...zed-site-with-mapping-service-invalid.xml
diff --git a/...-serialized-site-with-mapping-service.xml → ...-serialized-site-with-mapping-service.xml b/...-serialized-site-with-mapping-service.xml → ...-serialized-site-with-mapping-service.xml
diff --git a/...serTest-serialized-site-with-mappings.xml → ...serTest-serialized-site-with-mappings.xml b/...serTest-serialized-site-with-mappings.xml → ...serTest-serialized-site-with-mappings.xml
diff --git a/...ser/XmlSiteParserTest-serialized-site.xml → ...ser/XmlSiteParserTest-serialized-site.xml b/...ser/XmlSiteParserTest-serialized-site.xml → ...ser/XmlSiteParserTest-serialized-site.xml
diff --git a/...l/parser/XmlSiteParserTest-utf16bebom.xml → ...l/parser/XmlSiteParserTest-utf16bebom.xml b/...l/parser/XmlSiteParserTest-utf16bebom.xml → ...l/parser/XmlSiteParserTest-utf16bebom.xml
diff --git a/...l/parser/XmlSiteParserTest-utf16lebom.xml → ...l/parser/XmlSiteParserTest-utf16lebom.xml b/...l/parser/XmlSiteParserTest-utf16lebom.xml → ...l/parser/XmlSiteParserTest-utf16lebom.xml
diff --git a/.../xml/parser/XmlSiteParserTest-utf8bom.xml → .../xml/parser/XmlSiteParserTest-utf8bom.xml b/.../xml/parser/XmlSiteParserTest-utf8bom.xml → .../xml/parser/XmlSiteParserTest-utf8bom.xml
diff --git a/...l/parser/XmlStyleDescriptorParserTest.xml → ...l/parser/XmlStyleDescriptorParserTest.xml b/...l/parser/XmlStyleDescriptorParserTest.xml → ...l/parser/XmlStyleDescriptorParserTest.xml
diff --git a/...bappDescriptorParserTest-empty-webapp.xml → ...bappDescriptorParserTest-empty-webapp.xml b/...bappDescriptorParserTest-empty-webapp.xml → ...bappDescriptorParserTest-empty-webapp.xml
diff --git a/...escriptorParserTest-serialized-webapp.xml → ...escriptorParserTest-serialized-webapp.xml b/...escriptorParserTest-serialized-webapp.xml → ...escriptorParserTest-serialized-webapp.xml
diff --git a/...iptorParserTest-webapp-invalid-mounts.xml → ...iptorParserTest-webapp-invalid-mounts.xml b/...iptorParserTest-webapp-invalid-mounts.xml → ...iptorParserTest-webapp-invalid-mounts.xml
diff --git a/...onic/xp/xml/parser/XmlXDataParserTest.xml → ...onic/xp/xml/parser/XmlXDataParserTest.xml b/...onic/xp/xml/parser/XmlXDataParserTest.xml → ...onic/xp/xml/parser/XmlXDataParserTest.xml
diff --git a/modules/core/core-parser/src/testFixtures/java/com/enonic/xp/support/ResourceTestHelper.java b/modules/core/core-parser/src/testFixtures/java/com/enonic/xp/support/ResourceTestHelper.java
@@ -0,0 +1,43 @@
+package com.enonic.xp.support;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+public class ResourceTestHelper
+{
+    private final Object testInstance;
+
+    public ResourceTestHelper( final Object testInstance )
+    {
+        this.testInstance = testInstance;
+    }
+
+    public String loadTestFile( final String fileName )
+    {
+        final URL url = getResource( testInstance.getClass().getSimpleName() + "-" + fileName );
+        try (InputStream stream = url.openStream())
+        {
+            return new String( stream.readAllBytes(), StandardCharsets.UTF_8 );
+        }
+        catch ( final Exception e )
+        {
+            throw new RuntimeException( "Failed to load test file: " + url, e );
+        }
+    }
+
+    public URL getTestResource( final String fileName )
+    {
+        return getResource( testInstance.getClass().getSimpleName() + "-" + fileName );
+    }
+
+    public URL getResource( final String fileName )
+    {
+        final URL resource = testInstance.getClass().getResource( fileName );
+        if ( resource == null )
+        {
+            throw new IllegalArgumentException( "Resource [" + fileName + "] not found relative to: " + testInstance.getClass() );
+        }
+        return resource;
+    }
+}
diff --git a/.../com/enonic/xp/support/XmlTestHelper.java → .../com/enonic/xp/support/XmlTestHelper.java b/.../com/enonic/xp/support/XmlTestHelper.java → .../com/enonic/xp/support/XmlTestHelper.java
diff --git a/...nic/xp/xml/parser/XmlModelParserTest.java → ...nic/xp/xml/parser/XmlModelParserTest.java b/...nic/xp/xml/parser/XmlModelParserTest.java → ...nic/xp/xml/parser/XmlModelParserTest.java
diff --git a/modules/core/core-schema/build.gradle b/modules/core/core-schema/build.gradle
@@ -1,8 +1,9 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
 
     testFixturesApi project( ':core:core-api' )
-    testImplementation( testFixtures( project(":core:core-app") ) )
+    testImplementation( testFixtures( project( ":core:core-app" ) ) )
 }
 
 jar {

diff --git a/modules/core/core-service/build.gradle b/modules/core/core-service/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
 
     testImplementation( testFixtures( project(":core:core-app") ) )
     testImplementation( testFixtures( project(":core:core-content") ) )

diff --git a/modules/core/core-site/build.gradle b/modules/core/core-site/build.gradle
@@ -1,7 +1,8 @@
 dependencies {
     implementation project( ':core:core-api' )
+    implementation project( ':core:core-parser' )
 
-    testImplementation( testFixtures( project(":core:core-app") ) )
+    testImplementation( testFixtures( project( ":core:core-app" ) ) )
 }
 
 jar {

diff --git a/modules/core/core-task/build.gradle b/modules/core/core-task/build.gradle
@@ -1,11 +1,13 @@
 dependencies {
     implementation project( ':portal:portal-api' )
     implementation project( ':core:core-internal' )
+    implementation project( ':core:core-parser' )
     implementation libs.hazelcast.hazelcast
 
     testImplementation( testFixtures( project(":script:script-impl") ) )
     testImplementation( project(":portal:portal-impl")  )
     testImplementation( testFixtures( project(":core:core-api") ) )
+    testImplementation( testFixtures( project(":core:core-parser") ) )
     testImplementation( testFixtures( project(":core:core-app") ) )
     testImplementation( testFixtures( project(":core:core-internal") ) )
 }

diff --git a/modules/itest/itest-core/build.gradle b/modules/itest/itest-core/build.gradle
@@ -10,6 +10,8 @@ dependencies {
     testImplementation project( ':core:core-scheduler' )
     testImplementation project( ':core:core-app' )
     testImplementation project( ':core:core-export' )
+    testImplementation project( ':core:core-common' )
+    testImplementation project( ':core:core-parser' )
 
     testImplementation libs.hazelcast.hazelcast
 

diff --git a/modules/lib/lib-schema/build.gradle b/modules/lib/lib-schema/build.gradle
@@ -3,4 +3,5 @@ dependencies {
     compileOnly project( ':script:script-api' )
 
     testImplementation project( ':tools:testing' )
+    testImplementation project( ':core:core-parser' )
 }
diff --git a/modules/portal/portal-impl/build.gradle b/modules/portal/portal-impl/build.gradle
@@ -2,12 +2,14 @@ dependencies {
     implementation project( ':portal:portal-api' )
     implementation project( ':admin:admin-api' )
     implementation project( ':core:core-internal' )
+    implementation project( ':core:core-parser' )
     implementation libs.attoparser
 
     testImplementation( project( ':core:core-macro' ) )
     testImplementation( testFixtures( project( ':script:script-impl' ) ) )
     testImplementation( project( ':web:web-impl' ) )
     testImplementation( testFixtures( project(":core:core-api") ) )
+    testImplementation( testFixtures( project(":core:core-parser") ) )
     testImplementation( testFixtures( project(":web:web-api") ) )
     testImplementation( testFixtures( project(":core:core-content") ) )
 }

diff --git a/modules/runtime/build.gradle b/modules/runtime/build.gradle
@@ -89,6 +89,8 @@ addBundle( project( ':admin:admin-api' ), 10 )
 
 // Core bundles
 addBundle( project( ':core:core-event' ), 22 )
+addBundle( project( ':core:core-common' ), 22 )
+addBundle( project( ':core:core-parser' ), 22 )
 addBundle( project( ':core:core-schema' ), 22 )
 addBundle( project( ':core:core-repo' ), 22 )
 addBundle( project( ':core:core-security' ), 22 )