Skip to content

Commit c76e523

Browse files
anatol-sialitskianatol-sialitski
committed
Rebase master to persisted-schema-poc
1 parent f386325 commit c76e523

File tree

8 files changed

+21
-22
lines changed

8 files changed

+21
-22
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.enonic.xp.schema.xdata.XData;
1717
import com.enonic.xp.schema.xdata.XDataName;
1818
import com.enonic.xp.schema.xdata.XDataService;
19-
import com.enonic.xp.site.SiteService;
19+
import com.enonic.xp.site.CmsService;
2020
import com.enonic.xp.site.XDataMappingService;
2121
import com.enonic.xp.site.XDataMappings;
2222
import com.enonic.xp.site.XDataOption;
@@ -28,14 +28,14 @@
2828
public final class XDataMappingServiceImpl
2929
implements XDataMappingService
3030
{
31-
private final SiteService siteService;
31+
private final CmsService cmsService;
3232

3333
private final XDataService xDataService;
3434

3535
@Activate
36-
public XDataMappingServiceImpl( @Reference SiteService siteService, @Reference XDataService xDataService )
36+
public XDataMappingServiceImpl( @Reference CmsService cmsService, @Reference XDataService xDataService )
3737
{
38-
this.siteService = siteService;
38+
this.cmsService = cmsService;
3939
this.xDataService = xDataService;
4040
}
4141

@@ -55,7 +55,7 @@ private XDataOptions getXDataByApps( final ApplicationKeys applicationKeys, fina
5555
final XDataMappings.Builder builder = XDataMappings.create();
5656

5757
applicationKeys.stream()
58-
.map( siteService::getDescriptor )
58+
.map( cmsService::getDescriptor )
5959
.filter( Objects::nonNull )
6060
.forEach( siteDescriptor -> builder.addAll( siteDescriptor.getXDataMappings() ) );
6161

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
import com.enonic.xp.repo.impl.storage.NodeStorageServiceImpl;
110110
import com.enonic.xp.repo.impl.version.VersionServiceImpl;
111111
import com.enonic.xp.resource.ResourceService;
112+
import com.enonic.xp.schema.content.CmsFormFragmentService;
112113
import com.enonic.xp.schema.content.ContentType;
113114
import com.enonic.xp.schema.content.ContentTypeName;
114-
import com.enonic.xp.schema.content.CmsFormFragmentService;
115115
import com.enonic.xp.schema.xdata.XDataService;
116116
import com.enonic.xp.security.IdProviderKey;
117117
import com.enonic.xp.security.PrincipalKey;
@@ -327,7 +327,7 @@ void setUpAbstractContentServiceTest()
327327

328328
projectService.create( CreateProjectParams.create().name( testprojectName ).displayName( "test" ).build() );
329329

330-
xDataMappingService = new XDataMappingServiceImpl( siteService, xDataService );
330+
xDataMappingService = new XDataMappingServiceImpl( cmsService, xDataService );
331331
siteConfigService = new SiteConfigServiceImpl( nodeService, projectService, contentTypeService, eventPublisher );
332332

333333
this.config = mock( ContentConfig.class, invocation -> invocation.getMethod().getDefaultValue() );

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ private void setUpContentService()
319319
final ContentAuditLogSupportImpl contentAuditLogSupport =
320320
new ContentAuditLogSupportImpl( contentConfig, Runnable::run, auditLogService, contentAuditLogFilterService );
321321

322-
xDataMappingService = new XDataMappingServiceImpl( siteService, xDataService );
322+
xDataMappingService = new XDataMappingServiceImpl( cmsService, xDataService );
323323
siteConfigService = new SiteConfigServiceImpl( nodeService, projectService, contentTypeService, eventPublisher );
324324

325325
final ContentConfig config = mock( ContentConfig.class, invocation -> invocation.getMethod().getDefaultValue() );

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@
3838
import com.enonic.xp.region.Regions;
3939
import com.enonic.xp.resource.ResourceProcessor;
4040
import com.enonic.xp.schema.content.ContentTypeName;
41-
import com.enonic.xp.site.CmsDescriptor;
4241
import com.enonic.xp.schema.xdata.XData;
4342
import com.enonic.xp.schema.xdata.XDataName;
43+
import com.enonic.xp.site.CmsDescriptor;
4444
import com.enonic.xp.site.SiteConfig;
4545
import com.enonic.xp.site.SiteConfigs;
4646
import com.enonic.xp.site.SiteConfigsDataSerializer;
47-
import com.enonic.xp.site.SiteDescriptor;
4847
import com.enonic.xp.site.XDataMapping;
4948
import com.enonic.xp.site.XDataMappings;
5049

@@ -328,7 +327,7 @@ public void create_with_extra_data()
328327

329328
final Content content = this.contentService.create( createContentParams );
330329

331-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
330+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
332331
.applicationKey(
333332
ApplicationKey.from( "app" ) )
334333
.xDataMappings( XDataMappings.from(
@@ -403,7 +402,7 @@ public void create_with_missing_required_extra_data()
403402

404403
final XDataName xdata = XDataName.from( "app:xdata1" );
405404

406-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
405+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
407406
.applicationKey(
408407
ApplicationKey.from( "app" ) )
409408
.xDataMappings( XDataMappings.from(
@@ -454,7 +453,7 @@ public void create_with_missing_required_x_data()
454453

455454
final XDataName xdata = XDataName.from( "app:xdata1" );
456455

457-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
456+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
458457
.applicationKey(
459458
ApplicationKey.from( "app" ) )
460459
.xDataMappings( XDataMappings.from(
@@ -500,7 +499,7 @@ public void create_with_missing_optional_x_data()
500499

501500
final XDataName xdata = XDataName.from( "app:xdata1" );
502501

503-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
502+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
504503
.applicationKey(
505504
ApplicationKey.from( "app" ) )
506505
.xDataMappings( XDataMappings.from(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.enonic.xp.schema.content.ContentTypeName;
2222
import com.enonic.xp.schema.xdata.XData;
2323
import com.enonic.xp.schema.xdata.XDataName;
24-
import com.enonic.xp.site.SiteDescriptor;
24+
import com.enonic.xp.site.CmsDescriptor;
2525
import com.enonic.xp.site.XDataMapping;
2626
import com.enonic.xp.site.XDataMappings;
2727

@@ -143,7 +143,7 @@ private ExtraDatas createExtraDatas()
143143
{
144144
final XDataName xDataName = XDataName.from( "com.enonic.app.test:xdata1" );
145145

146-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
146+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
147147
.applicationKey( ApplicationKey.from(
148148
"com.enonic.app.test" ) )
149149
.xDataMappings( XDataMappings.from(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.enonic.xp.schema.content.ContentTypeName;
1717
import com.enonic.xp.schema.xdata.XData;
1818
import com.enonic.xp.schema.xdata.XDataName;
19-
import com.enonic.xp.site.SiteDescriptor;
19+
import com.enonic.xp.site.CmsDescriptor;
2020
import com.enonic.xp.site.XDataMapping;
2121
import com.enonic.xp.site.XDataMappings;
2222

@@ -74,7 +74,7 @@ private ExtraDatas createExtraDatas()
7474
{
7575
final XDataName xDataName = XDataName.from( "com.enonic.app.test:xdata1" );
7676

77-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
77+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
7878
.applicationKey( ApplicationKey.from(
7979
"com.enonic.app.test" ) )
8080
.xDataMappings( XDataMappings.from(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
import com.enonic.xp.schema.xdata.XData;
4848
import com.enonic.xp.schema.xdata.XDataName;
4949
import com.enonic.xp.security.acl.AccessControlList;
50+
import com.enonic.xp.site.CmsDescriptor;
5051
import com.enonic.xp.site.SiteConfig;
51-
import com.enonic.xp.site.SiteDescriptor;
5252
import com.enonic.xp.site.XDataMapping;
5353
import com.enonic.xp.site.XDataMappings;
5454

@@ -644,7 +644,7 @@ private ExtraDatas createExtraDatas()
644644
{
645645
final XDataName xDataName = XDataName.from( "com.enonic.app.test:my_fragment" );
646646

647-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
647+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
648648
.applicationKey( ApplicationKey.from(
649649
"com.enonic.app.test" ) )
650650
.xDataMappings( XDataMappings.from(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
import com.enonic.xp.schema.xdata.XData;
7373
import com.enonic.xp.schema.xdata.XDataName;
7474
import com.enonic.xp.security.PrincipalKey;
75+
import com.enonic.xp.site.CmsDescriptor;
7576
import com.enonic.xp.site.SiteConfig;
76-
import com.enonic.xp.site.SiteDescriptor;
7777
import com.enonic.xp.site.XDataMapping;
7878
import com.enonic.xp.site.XDataMappings;
7979

@@ -498,7 +498,7 @@ public void testUpdatedWithExtradata()
498498
.displayName( "new display name" )
499499
.build() ) );
500500

501-
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( SiteDescriptor.create()
501+
when( resourceService.processResource( isA( ResourceProcessor.class ) ) ).thenReturn( CmsDescriptor.create()
502502
.applicationKey( myApp )
503503
.xDataMappings( XDataMappings.from(
504504
XDataMapping.create()

0 commit comments

Comments
 (0)