Skip to content

Commit d5f49fc

Browse files
anatol-sialitskianatol-sialitski
committed
Upgrade to the latest version of XP 8
#2058
1 parent 11741a8 commit d5f49fc

33 files changed

+1084
-423
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nodeGradle = "7.1.0"
88

99
# App
1010
libMustache = "2.1.1"
11-
libAsset = "1.0.3"
11+
libAsset = "2.0.0-SNAPSHOT"
1212

1313
[libraries]
1414

‎pnpm-lock.yaml‎

Lines changed: 778 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/com/enonic/xp/app/applications/json/content/page/DescriptorJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.enonic.xp.app.applications.json.ItemJson;
66
import com.enonic.xp.app.applications.json.form.FormJson;
77
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
8-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
8+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
99
import com.enonic.xp.region.ComponentDescriptor;
1010

1111
import static com.google.common.base.Strings.nullToEmpty;
@@ -25,7 +25,7 @@ public abstract class DescriptorJson
2525
private final boolean deletable;
2626

2727
public DescriptorJson( final ComponentDescriptor descriptor, final LocaleMessageResolver localeMessageResolver,
28-
final InlineMixinResolver inlineMixinResolver )
28+
final CmsFormFragmentServiceResolver inlineMixinResolver )
2929
{
3030
Preconditions.checkNotNull( descriptor );
3131
Preconditions.checkNotNull( localeMessageResolver );

‎src/main/java/com/enonic/xp/app/applications/json/content/page/PageDescriptorJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.enonic.xp.app.applications.json.content.page.region.RegionDescriptorJson;
99
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
10-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
10+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
1111
import com.enonic.xp.page.PageDescriptor;
1212
import com.enonic.xp.region.RegionDescriptor;
1313
import com.enonic.xp.region.RegionDescriptors;
@@ -18,7 +18,7 @@ public class PageDescriptorJson
1818
private final List<RegionDescriptorJson> regionsJson;
1919

2020
public PageDescriptorJson( final PageDescriptor descriptor, final LocaleMessageResolver localeMessageResolver,
21-
final InlineMixinResolver inlineMixinResolver )
21+
final CmsFormFragmentServiceResolver inlineMixinResolver )
2222
{
2323
super( descriptor, localeMessageResolver, inlineMixinResolver );
2424
Preconditions.checkNotNull( descriptor );

‎src/main/java/com/enonic/xp/app/applications/json/content/page/PageDescriptorListJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.stream.Collectors;
55

66
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
7-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
7+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
88
import com.enonic.xp.page.PageDescriptors;
99

1010
@SuppressWarnings("UnusedDeclaration")
@@ -18,7 +18,7 @@ public PageDescriptorListJson( final List<PageDescriptorJson> pageDescriptors )
1818
}
1919

2020
public PageDescriptorListJson( final PageDescriptors pageDescriptors, final LocaleMessageResolver localeMessageResolver,
21-
final InlineMixinResolver inlineMixinResolver )
21+
final CmsFormFragmentServiceResolver inlineMixinResolver )
2222
{
2323
this.pageDescriptors = pageDescriptors.stream().map(
2424
pageDescriptor -> new PageDescriptorJson( pageDescriptor, localeMessageResolver, inlineMixinResolver ) ).collect(

‎src/main/java/com/enonic/xp/app/applications/json/content/page/region/LayoutDescriptorJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import com.enonic.xp.app.applications.json.content.page.DescriptorJson;
77
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
8-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
8+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
99
import com.enonic.xp.region.LayoutDescriptor;
1010
import com.enonic.xp.region.RegionDescriptor;
1111
import com.enonic.xp.region.RegionDescriptors;
@@ -16,7 +16,7 @@ public class LayoutDescriptorJson
1616
private final List<RegionDescriptorJson> regionsJson;
1717

1818
public LayoutDescriptorJson( final LayoutDescriptor descriptor, final LocaleMessageResolver localeMessageResolver,
19-
final InlineMixinResolver inlineMixinResolver )
19+
final CmsFormFragmentServiceResolver inlineMixinResolver )
2020
{
2121
super( descriptor, localeMessageResolver, inlineMixinResolver );
2222

‎src/main/java/com/enonic/xp/app/applications/json/content/page/region/LayoutDescriptorsJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.google.common.collect.ImmutableList;
66

77
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
8-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
8+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
99
import com.enonic.xp.region.LayoutDescriptor;
1010
import com.enonic.xp.region.LayoutDescriptors;
1111

@@ -21,7 +21,7 @@ public LayoutDescriptorsJson( final List<LayoutDescriptorJson> layoutDescriptorJ
2121
}
2222

2323
public LayoutDescriptorsJson( final LayoutDescriptors descriptors, final LocaleMessageResolver localeMessageResolver,
24-
final InlineMixinResolver inlineMixinResolver )
24+
final CmsFormFragmentServiceResolver inlineMixinResolver )
2525
{
2626
ImmutableList.Builder<LayoutDescriptorJson> builder = new ImmutableList.Builder<>();
2727
if ( descriptors != null )

‎src/main/java/com/enonic/xp/app/applications/json/content/page/region/PartDescriptorJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import com.enonic.xp.app.applications.json.content.page.DescriptorJson;
44
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
5-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
5+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
66
import com.enonic.xp.region.PartDescriptor;
77

88
public class PartDescriptorJson
99
extends DescriptorJson
1010
{
1111

1212
public PartDescriptorJson( final PartDescriptor descriptor, final LocaleMessageResolver localeMessageResolver,
13-
final InlineMixinResolver inlineMixinResolver )
13+
final CmsFormFragmentServiceResolver inlineMixinResolver )
1414
{
1515
super( descriptor, localeMessageResolver, inlineMixinResolver );
1616
}

‎src/main/java/com/enonic/xp/app/applications/json/content/page/region/PartDescriptorsJson.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.stream.Collectors;
55

66
import com.enonic.xp.app.applications.rest.resource.schema.content.LocaleMessageResolver;
7-
import com.enonic.xp.app.applications.rest.resource.schema.mixin.InlineMixinResolver;
7+
import com.enonic.xp.app.applications.rest.resource.schema.mixin.CmsFormFragmentServiceResolver;
88
import com.enonic.xp.region.PartDescriptors;
99

1010

@@ -19,7 +19,7 @@ public PartDescriptorsJson( final List<PartDescriptorJson> descriptorJsonList )
1919
}
2020

2121
public PartDescriptorsJson( final PartDescriptors descriptors, final LocaleMessageResolver localeMessageResolver,
22-
final InlineMixinResolver inlineMixinResolver )
22+
final CmsFormFragmentServiceResolver inlineMixinResolver )
2323
{
2424
this.descriptorJsonList = descriptors.stream().map(
2525
descriptor -> new PartDescriptorJson( descriptor, localeMessageResolver, inlineMixinResolver ) ).collect(

‎src/main/java/com/enonic/xp/app/applications/json/form/FormDefaultValuesJsonProcessor.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ private static void processFormItems( final Iterable<FormItem> formItems, final
3636
{
3737
final Input input = formItem.toInput();
3838
final InputJson inputJson = (InputJson) formItemJson;
39-
if ( input.getDefaultValue() != null )
40-
{
41-
try
42-
{
43-
final Value defaultValue = InputTypes.BUILTIN.resolve( input.getInputType() ).
44-
createDefaultValue( input );
45-
if ( defaultValue != null )
46-
{
47-
inputJson.setDefaultValue( defaultValue );
48-
}
49-
}
50-
catch ( IllegalArgumentException ex )
51-
{
52-
// DO NOTHING
53-
}
54-
}
39+
// if ( input.getDefaultValue() != null )
40+
// {
41+
// try
42+
// {
43+
// final Value defaultValue = InputTypes.BUILTIN.resolve( input.getInputType() ).
44+
// createDefaultValue( input );
45+
// if ( defaultValue != null )
46+
// {
47+
// inputJson.setDefaultValue( defaultValue );
48+
// }
49+
// }
50+
// catch ( IllegalArgumentException ex )
51+
// {
52+
// // DO NOTHING
53+
// }
54+
// }
5555
}
5656
else if ( formItem.getType() == FORM_ITEM_SET )
5757
{

0 commit comments

Comments
 (0)