Fix and merge master into persisted-schema-poc

Author: anatol-sialitski

modules/core/core-api/src/main/java/com/enonic/xp/style/StyleDescriptor.java

@@ -154,7 +154,7 @@ public Builder addStyleElement( final ImageStyle element )
             return this;
         }
 
-        public Builder addStyleElements( final Iterable<ElementStyle> elements )
+        public Builder addStyleElements( final Iterable<ImageStyle> elements )
         {
             elements.forEach( this::addStyleElement );
             return this;

modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/PatchContentCommand.java

@@ -70,7 +70,7 @@ private PatchContentResult doExecute()
             .partDescriptorService( this.partDescriptorService )
             .layoutDescriptorService( this.layoutDescriptorService )
             .contentDataSerializer( this.translator.getContentDataSerializer() )
-            .siteService( this.siteService )
+            .cmsService( this.cmsService )
             .build()
             .produce();
 

modules/core/core-content/src/main/java/com/enonic/xp/core/impl/content/parser/YmlStyleDescriptorParser.java

@@ -16,7 +16,6 @@
 import com.enonic.xp.app.ApplicationKey;
 import com.enonic.xp.core.impl.schema.YmlParserBase;
 import com.enonic.xp.schema.LocalizedText;
-import com.enonic.xp.style.ElementStyle;
 import com.enonic.xp.style.ImageStyle;
 import com.enonic.xp.style.StyleDescriptor;
 
@@ -53,7 +52,7 @@ static StyleDescriptor.Builder create()
 
         @JsonProperty("image")
         @JsonDeserialize(using = ImageStyleDeserializer.class)
-        abstract StyleDescriptor.Builder addStyleElements( Iterable<ElementStyle> elements );
+        abstract StyleDescriptor.Builder addStyleElements( Iterable<ImageStyle> elements );
     }
 
     @JsonDeserialize(builder = ImageStyle.Builder.class)

modules/core/core-content/src/test/java/com/enonic/xp/core/impl/content/UpdateContentCommandTest.java

@@ -82,7 +82,7 @@ public class UpdateContentCommandTest
 
     private final XDataService xDataService = mock( XDataService.class );
 
-    private final CmsService cmsService = Mockito.mock( CmsService.class );
+    private final CmsService cmsService = mock( CmsService.class );
 
     private final NodeService nodeService = mock( NodeService.class );
 
@@ -269,7 +269,7 @@ void update_to_invalid_with_require_valid()
 
         final UpdateContentCommand command = UpdateContentCommand.create( createCommand( params ) )
             .params( params )
-            .contentValidators( List.of( new ContentNameValidator(), new SiteConfigsValidator( siteService ), new OccurrenceValidator(),
+            .contentValidators( List.of( new ContentNameValidator(), new SiteConfigsValidator( cmsService ), new OccurrenceValidator(),
                                          new ExtraDataValidator( xDataService ) ) )
             .build();
 
@@ -313,7 +313,7 @@ private UpdateContentCommand createCommand( UpdateContentParams params )
             .eventPublisher( eventPublisher )
             .mediaInfo( mediaInfo )
             .xDataService( xDataService )
-            .siteService( siteService )
+            .cmsService( cmsService )
             .pageDescriptorService( pageDescriptorService )
             .partDescriptorService( partDescriptorService )
             .layoutDescriptorService( layoutDescriptorService )

modules/core/core-content/src/test/java/com/enonic/xp/core/impl/content/parser/YmlStyleDescriptorParserTest.java

@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.enonic.xp.app.ApplicationKey;
-import com.enonic.xp.style.ElementStyle;
 import com.enonic.xp.style.ImageStyle;
 import com.enonic.xp.style.StyleDescriptor;
 
@@ -35,11 +34,11 @@ void test()
         assertEquals( currentApplication, descriptor.getApplicationKey() );
         assertEquals( "assets/styles.css", descriptor.getCssPath() );
 
-        final List<ElementStyle> elements = descriptor.getElements();
+        final List<ImageStyle> elements = descriptor.getElements();
         assertNotNull( elements );
         assertEquals( 2, elements.size() );
 
-        final ElementStyle imageStyle_1 = elements.getFirst();
+        final ImageStyle imageStyle_1 = elements.getFirst();
         assertInstanceOf( ImageStyle.class, imageStyle_1 );
 
         assertEquals( "editor-width-auto", imageStyle_1.getName() );

modules/core/core-content/src/test/java/com/enonic/xp/core/impl/content/processor/ImageContentProcessorTest.java

@@ -23,7 +23,7 @@
 import com.enonic.xp.content.ExtraData;
 import com.enonic.xp.content.ExtraDatas;
 import com.enonic.xp.content.Media;
-import com.enonic.xp.core.impl.schema.xdata.BuiltinXDataTypesAccessor;
+import com.enonic.xp.core.impl.content.schema.BuiltinXDataTypesAccessor;
 import com.enonic.xp.data.PropertyTree;
 import com.enonic.xp.data.ValueFactory;
 import com.enonic.xp.media.MediaInfo;

modules/itest/itest-core/src/test/java/com/enonic/xp/core/content/ContentServiceImplTest_create.java

@@ -36,7 +36,7 @@
 import com.enonic.xp.region.Regions;
 import com.enonic.xp.resource.ResourceProcessor;
 import com.enonic.xp.schema.content.ContentTypeName;
-import com.enonic.xp.site.SiteDescriptor;
+import com.enonic.xp.site.CmsDescriptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -274,7 +274,7 @@ public void create_with_site_config()
         final ApplicationKey appKey = ApplicationKey.from( "abc:abc" );
 
         Mockito.when( resourceService.processResource( isA( ResourceProcessor.class ) ) )
-            .thenReturn( SiteDescriptor.create().applicationKey( appKey ).form( siteForm ).build() );
+            .thenReturn( CmsDescriptor.create().applicationKey( appKey ).form( siteForm ).build() );
 
         final PropertyTree contentData = new PropertyTree();
         contentData.addString( "title", "This is my page" );

modules/lib/lib-content/src/main/java/com/enonic/xp/lib/content/deserializer/PropertyTreeTranslator.java

@@ -14,27 +14,27 @@
 import com.enonic.xp.schema.xdata.XData;
 import com.enonic.xp.schema.xdata.XDataName;
 import com.enonic.xp.schema.xdata.XDataService;
-import com.enonic.xp.site.SiteDescriptor;
-import com.enonic.xp.site.SiteService;
+import com.enonic.xp.site.CmsDescriptor;
+import com.enonic.xp.site.CmsService;
 
 public final class PropertyTreeTranslator
 {
     private final ContentTypeService contentTypeService;
 
     private final XDataService xDataService;
 
-    private final SiteService siteService;
+    private final CmsService cmsService;
 
     private final PropertyTreeMarshallerService marshaller;
 
     private final Function<ContentTypeName, Boolean> strictValidationResolver;
 
-    public PropertyTreeTranslator( ContentTypeService contentTypeService, XDataService xDataService, SiteService siteService,
+    public PropertyTreeTranslator( ContentTypeService contentTypeService, XDataService xDataService, CmsService cmsService,
                                    PropertyTreeMarshallerService marshaller, Function<ContentTypeName, Boolean> strictValidationResolver )
     {
         this.contentTypeService = contentTypeService;
         this.xDataService = xDataService;
-        this.siteService = siteService;
+        this.cmsService = cmsService;
         this.marshaller = marshaller;
         this.strictValidationResolver = strictValidationResolver;
     }
@@ -66,7 +66,7 @@ public PropertyTree translate( Map<String, Object> map, XDataName xDataName, Con
 
     public PropertyTree translate( Map<String, Object> map, ApplicationKey appKey, ContentTypeName contentTypeName )
     {
-        SiteDescriptor descriptor = siteService.getDescriptor( appKey );
+        CmsDescriptor descriptor = cmsService.getDescriptor( appKey );
         if ( descriptor == null )
         {
             throw new IllegalArgumentException( "Unknown site descriptor: " + appKey );

modules/lib/lib-content/src/test/java/com/enonic/xp/lib/content/PatchContentHandlerTest.java

@@ -26,7 +26,7 @@
 import com.enonic.xp.schema.content.GetContentTypeParams;
 import com.enonic.xp.schema.xdata.XData;
 import com.enonic.xp.schema.xdata.XDataName;
-import com.enonic.xp.site.SiteDescriptor;
+import com.enonic.xp.site.CmsDescriptor;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -72,19 +72,21 @@ public void patchSiteConfig()
 
         mockXData();
 
-        final SiteDescriptor siteDescriptor1 = SiteDescriptor.create()
+        final CmsDescriptor siteDescriptor1 = CmsDescriptor.create()
+            .applicationKey( ApplicationKey.from( "appKey1" ) )
             .form( Form.create()
                        .addFormItem( Input.create().label( "a" ).name( "a" ).inputType( InputTypeName.TEXT_LINE ).build() )
                        .addFormItem( Input.create().label( "b" ).name( "b" ).inputType( InputTypeName.CHECK_BOX ).build() )
                        .build() )
             .build();
 
-        final SiteDescriptor siteDescriptor2 = SiteDescriptor.create()
+        final CmsDescriptor siteDescriptor2 = CmsDescriptor.create()
+            .applicationKey( ApplicationKey.from( "appKey2" ) )
             .form( Form.create().addFormItem( Input.create().label( "c" ).name( "c" ).inputType( InputTypeName.LONG ).build() ).build() )
             .build();
 
-        when( this.siteService.getDescriptor( ApplicationKey.from( "appKey1" ) ) ).thenReturn( siteDescriptor1 );
-        when( this.siteService.getDescriptor( ApplicationKey.from( "appKey2" ) ) ).thenReturn( siteDescriptor2 );
+        when( this.cmsService.getDescriptor( ApplicationKey.from( "appKey1" ) ) ).thenReturn( siteDescriptor1 );
+        when( this.cmsService.getDescriptor( ApplicationKey.from( "appKey2" ) ) ).thenReturn( siteDescriptor2 );
 
         runFunction( "/test/PatchContentHandlerTest.js", "patchSiteConfig" );
     }
@@ -103,14 +105,15 @@ public void patchSiteSingleDescriptor()
 
         mockXData();
 
-        final SiteDescriptor siteDescriptor1 = SiteDescriptor.create()
+        final CmsDescriptor siteDescriptor1 = CmsDescriptor.create()
+            .applicationKey( ApplicationKey.from( "appKey1" ) )
             .form( Form.create()
                        .addFormItem( Input.create().label( "a" ).name( "a" ).inputType( InputTypeName.TEXT_LINE ).build() )
                        .addFormItem( Input.create().label( "b" ).name( "b" ).inputType( InputTypeName.CHECK_BOX ).build() )
                        .build() )
             .build();
 
-        when( this.siteService.getDescriptor( ApplicationKey.from( "appKey1" ) ) ).thenReturn( siteDescriptor1 );
+        when( this.cmsService.getDescriptor( ApplicationKey.from( "appKey1" ) ) ).thenReturn( siteDescriptor1 );
         runFunction( "/test/PatchContentHandlerTest.js", "patchSiteSingleDescriptor" );
     }
 

modules/portal/portal-impl/src/test/java/com/enonic/xp/portal/impl/handler/SlashApiHandlerTest.java

@@ -814,7 +814,7 @@ void testSiteMountApiDefinedIdApis()
         final DescriptorKeys siteApiMountDescriptors =
             DescriptorKeys.from( DescriptorKey.from( applicationKey, "api-key-1" ), DescriptorKey.from( applicationKey, "api-key-2" ) );
 
-        final SiteDescriptor siteDescriptor = SiteDescriptor.create().apiMounts( siteApiMountDescriptors ).build();
+        final SiteDescriptor siteDescriptor = SiteDescriptor.create().applicationKey( ApplicationKey.from( "myapp" ) ).apiMounts( siteApiMountDescriptors ).build();
         when( siteService.getDescriptor( eq( applicationKey ) ) ).thenReturn( siteDescriptor );
 
         WebResponse response = this.handler.handle( request );