Remove XML parsers from core-api #10650 (#11429)

* Remove XmlPartDescriptorParser #11434

* Remove XmlPageDescriptorParser #11435

* Remove XmlLayoutDescriptorParser #11436

* Remove XmlMixinDescriptorParser #11433

* Remove XmlDataDescriptorParser #11432

* Remove XmlStyleDescriptorParser #11431

* Remove XmlSiteDescriptorParser #11438
Split site.xml into two descriptors #11250

* Remove XmlContentTypeDescriptorParser #11437

* Remove XmlMacroDescriptorParser #11446

* Remove XmlApplicationParser #11447

* Remove XmlServiceDescriptorParser #11451

* Remove XmlTaskDescriptorParser #11452

* Remove XmlIdProviderDescriptorParser #11455

* Remove XmlWidgetDescriptorParser #11454

* Remove XmlAdminToolDescriptorParser #11449

* Remove XmlApiDescriptorParser #11450

* Remove XmlWebappDescriptorParser #11453

* Move XmlNodeParser and cleanup #11460

* Move XmlNodeParser and cleanup #11460

Author: anatol-sialitski

modules/admin/admin-api/src/main/java/com/enonic/xp/admin/tool/AdminToolDescriptor.java

@@ -108,7 +108,7 @@ public DescriptorKeys getApiMounts()
 
     public static ResourceKey toResourceKey( final DescriptorKey key )
     {
-        return ResourceKey.from( key.getApplicationKey(), "admin/tools/" + key.getName() + "/" + key.getName() + ".xml" );
+        return ResourceKey.from( key.getApplicationKey(), "admin/tools/" + key.getName() + "/" + key.getName() + ".yml" );
     }
 
     public static ResourceKey toIconResourceKey( final DescriptorKey key )

modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/tool/AdminToolDescriptorBuilderMapper.java

@@ -15,7 +15,6 @@
 import com.enonic.xp.resource.ResourceProcessor;
 import com.enonic.xp.resource.ResourceService;
 import com.enonic.xp.security.PrincipalKeys;
-import com.enonic.xp.xml.XmlException;
 
 @Component(immediate = true)
 public final class AdminToolDescriptorServiceImpl
@@ -87,24 +86,6 @@ private ResourceProcessor<DescriptorKey, AdminToolDescriptor> createProcessor( f
 
     private AdminToolDescriptor loadDescriptor( final DescriptorKey key, final Resource resource )
     {
-        final AdminToolDescriptor.Builder builder = AdminToolDescriptor.create().key( key );
-        parseXml( resource, builder );
-        return builder.build();
-    }
-
-    private void parseXml( final Resource resource, final AdminToolDescriptor.Builder builder )
-    {
-        try
-        {
-            final XmlAdminToolDescriptorParser parser = new XmlAdminToolDescriptorParser();
-            parser.currentApplication( resource.getKey().getApplicationKey() );
-            parser.builder( builder );
-            parser.source( resource.readString() );
-            parser.parse();
-        }
-        catch ( final Exception e )
-        {
-            throw new XmlException( e, "Could not load admin app descriptor [" + resource.getKey() + "]: " + e.getMessage() );
-        }
+        return YmlAdminToolDescriptorParser.parse( resource.readString(), key.getApplicationKey() ).key( key ).build();
     }
 }

modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/tool/AdminToolDescriptorServiceImpl.java

@@ -1,8 +1,13 @@
 package com.enonic.xp.admin.impl.tool;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.enonic.xp.admin.tool.AdminToolDescriptor;
 import com.enonic.xp.app.ApplicationKey;
 import com.enonic.xp.core.impl.schema.YmlParserBase;
+import com.enonic.xp.descriptor.DescriptorKeys;
+import com.enonic.xp.schema.LocalizedText;
+import com.enonic.xp.security.PrincipalKeys;
 
 public final class YmlAdminToolDescriptorParser
 {
@@ -17,4 +22,22 @@ public static AdminToolDescriptor.Builder parse( final String resource, final Ap
     {
         return PARSER.parse( resource, AdminToolDescriptor.Builder.class, currentApplication );
     }
+
+    private abstract static class AdminToolDescriptorBuilderMapper
+    {
+        @JsonProperty("displayName")
+        public abstract AdminToolDescriptor.Builder displayName( LocalizedText text );
+
+        @JsonProperty("description")
+        public abstract AdminToolDescriptor.Builder description( LocalizedText text );
+
+        @JsonProperty("allow")
+        public abstract AdminToolDescriptor.Builder addAllowedPrincipals( PrincipalKeys allowedPrincipals );
+
+        @JsonProperty("apis")
+        public abstract AdminToolDescriptor.Builder apiMounts( DescriptorKeys apiDescriptors );
+
+        @JsonProperty("interfaces")
+        public abstract AdminToolDescriptor.Builder addInterfaces( Iterable<String> interfaceNames );
+    }
 }

modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/tool/XmlAdminToolDescriptorParser.java

@@ -8,11 +8,11 @@
 
 import com.enonic.xp.admin.widget.WidgetDescriptor;
 import com.enonic.xp.app.ApplicationKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.descriptor.DescriptorKeyLocator;
 import com.enonic.xp.descriptor.DescriptorKeys;
 import com.enonic.xp.descriptor.DescriptorLoader;
 import com.enonic.xp.icon.Icon;
-import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.resource.Resource;
 import com.enonic.xp.resource.ResourceKey;
 import com.enonic.xp.resource.ResourceService;
@@ -49,20 +49,16 @@ public DescriptorKeys find( final ApplicationKey key )
     @Override
     public ResourceKey toResource( final DescriptorKey key )
     {
-        return ResourceKey.from( key.getApplicationKey(), PATH + "/" + key.getName() + "/" + key.getName() + ".xml" );
+        return ResourceKey.from( key.getApplicationKey(), PATH + "/" + key.getName() + "/" + key.getName() + ".yml" );
     }
 
     @Override
     public WidgetDescriptor load( final DescriptorKey key, final Resource resource )
     {
-        final WidgetDescriptor.Builder builder = WidgetDescriptor.create();
-        builder.key( key );
-
-        final String descriptorXml = resource.readString();
-        parseXml( key.getApplicationKey(), builder, descriptorXml );
-        final Icon icon = loadIcon( key );
-        builder.setIcon( icon );
-        return builder.build();
+        return YmlWidgetDescriptorParser.parse( resource.readString(), key.getApplicationKey() )
+            .key( key )
+            .setIcon( loadIcon( key ) )
+            .build();
     }
 
     @Override
@@ -77,15 +73,6 @@ public WidgetDescriptor postProcess( final WidgetDescriptor descriptor )
         return descriptor;
     }
 
-    private void parseXml( final ApplicationKey applicationKey, final WidgetDescriptor.Builder builder, final String xml )
-    {
-        final XmlWidgetDescriptorParser parser = new XmlWidgetDescriptorParser();
-        parser.builder( builder );
-        parser.currentApplication( applicationKey );
-        parser.source( xml );
-        parser.parse();
-    }
-
     private Icon loadIcon( final DescriptorKey key )
     {
         final String iconPath = PATH + "/" + key.getName() + "/" + key.getName() + ".svg";

modules/admin/admin-impl/src/main/java/com/enonic/xp/admin/impl/tool/YmlAdminToolDescriptorParser.java

@@ -1,8 +1,12 @@
 package com.enonic.xp.admin.impl.widget;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.enonic.xp.admin.widget.WidgetDescriptor;
 import com.enonic.xp.app.ApplicationKey;
 import com.enonic.xp.core.impl.schema.YmlParserBase;
+import com.enonic.xp.schema.LocalizedText;
+import com.enonic.xp.security.PrincipalKeys;
 
 public final class YmlWidgetDescriptorParser
 {
@@ -17,4 +21,22 @@ public static WidgetDescriptor.Builder parse( final String resource, final Appli
     {
         return PARSER.parse( resource, WidgetDescriptor.Builder.class, currentApplication );
     }
+
+    private abstract static class WidgetDescriptorBuilderMapper
+    {
+        @JsonProperty("displayName")
+        public abstract WidgetDescriptor.Builder displayName( LocalizedText text );
+
+        @JsonProperty("description")
+        public abstract WidgetDescriptor.Builder description( LocalizedText text );
+
+        @JsonProperty("allow")
+        public abstract WidgetDescriptor.Builder allowedPrincipals( PrincipalKeys allowedPrincipals );
+
+        @JsonProperty("interfaces")
+        public abstract WidgetDescriptor.Builder addInterfaces( Iterable<String> interfaceNames );
+
+        @JsonProperty("config")
+        public abstract WidgetDescriptor.Builder addProperty( String key, String value );
+    }
 }