Update usage of apiUrl and DescriptorKey #8807

Author: anatol-sialitski

modules/app/src/main/resources/lib/config.ts

@@ -76,16 +76,13 @@ export function getConfig(locales: string[], aiEnabled: boolean): Record<string,
         },
         theme,
         widgetApiUrl: portalLib.apiUrl({
-            application: 'admin',
-            api: 'widget'
+            api: 'admin:widget'
         }),
         statusApiUrl: portalLib.apiUrl({
-            application: 'admin',
-            api: 'status'
+            api: 'admin:status'
         }),
         eventApiUrl: portalLib.apiUrl({
-            application: 'admin',
-            api: 'event'
+            api: 'admin:event'
         }),
         phrasesAsJson: JSON.stringify(getPhrases(locales)),
         sharedSocketUrl: portalLib.assetUrl({

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/json/content/page/region/LayoutComponentJson.java

@@ -8,7 +8,7 @@
 import com.enonic.xp.app.contentstudio.rest.resource.content.ComponentDisplayNameResolver;
 import com.enonic.xp.data.PropertyArrayJson;
 import com.enonic.xp.data.PropertyTreeJson;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.region.LayoutComponent;
 
 @SuppressWarnings("UnusedDeclaration")

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/json/content/page/region/PartComponentJson.java

@@ -8,7 +8,7 @@
 import com.enonic.xp.app.contentstudio.rest.resource.content.ComponentDisplayNameResolver;
 import com.enonic.xp.data.PropertyArrayJson;
 import com.enonic.xp.data.PropertyTreeJson;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.region.PartComponent;
 
 @SuppressWarnings("UnusedDeclaration")

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/CreatePageJson.java

@@ -14,7 +14,7 @@
 import com.enonic.xp.data.PropertyArrayJson;
 import com.enonic.xp.data.PropertyTreeJson;
 import com.enonic.xp.page.CreatePageParams;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.PageTemplateKey;
 
 public class CreatePageJson

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/CreatePageTemplateJson.java

@@ -12,7 +12,7 @@
 import com.enonic.xp.content.ContentPath;
 import com.enonic.xp.data.PropertyArrayJson;
 import com.enonic.xp.data.PropertyTreeJson;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.schema.content.ContentTypeNames;
 
 public class CreatePageTemplateJson

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/PageDescriptorResource.java

@@ -29,7 +29,7 @@
 import com.enonic.xp.app.contentstudio.rest.resource.schema.mixin.InlineMixinResolver;
 import com.enonic.xp.i18n.LocaleService;
 import com.enonic.xp.jaxrs.JaxRsComponent;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.PageDescriptor;
 import com.enonic.xp.page.PageDescriptorService;
 import com.enonic.xp.page.PageDescriptors;

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/UpdatePageJson.java

@@ -13,7 +13,7 @@
 import com.enonic.xp.content.ContentId;
 import com.enonic.xp.data.PropertyArrayJson;
 import com.enonic.xp.data.PropertyTreeJson;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.PageTemplateKey;
 import com.enonic.xp.page.UpdatePageParams;
 

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/layout/LayoutDescriptorResource.java

@@ -2,6 +2,9 @@
 
 import java.util.stream.Collectors;
 
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.ws.rs.Consumes;
@@ -13,16 +16,13 @@
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-
 import com.enonic.xp.app.ApplicationKey;
 import com.enonic.xp.app.contentstudio.json.content.page.region.LayoutDescriptorJson;
 import com.enonic.xp.app.contentstudio.json.content.page.region.LayoutDescriptorsJson;
 import com.enonic.xp.app.contentstudio.rest.resource.ResourceConstants;
 import com.enonic.xp.app.contentstudio.rest.resource.content.JsonObjectsFactory;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.jaxrs.JaxRsComponent;
-import com.enonic.xp.page.DescriptorKey;
 import com.enonic.xp.region.LayoutDescriptor;
 import com.enonic.xp.region.LayoutDescriptorService;
 import com.enonic.xp.region.LayoutDescriptors;
@@ -55,9 +55,9 @@ public LayoutDescriptorsJson getByApplications( @QueryParam("applicationKey") fi
     {
         final LayoutDescriptors descriptors = layoutDescriptorService.getByApplication( ApplicationKey.from( applicationKey ) );
 
-        return new LayoutDescriptorsJson( descriptors.stream()
-                                              .map( l -> jsonObjectsFactory.createLayoutDescriptorJson( l, request.getLocales() ) )
-                                              .collect( Collectors.toUnmodifiableList() ) );
+        return new LayoutDescriptorsJson(
+            descriptors.stream().map( l -> jsonObjectsFactory.createLayoutDescriptorJson( l, request.getLocales() ) ).collect(
+                Collectors.toUnmodifiableList() ) );
     }
 
     @POST
@@ -66,9 +66,9 @@ public LayoutDescriptorsJson getByApplications( @QueryParam("applicationKey") fi
     public LayoutDescriptorsJson getByApplications( final GetByApplicationsParams params, @Context HttpServletRequest request )
     {
         final LayoutDescriptors layoutDescriptors = layoutDescriptorService.getByApplications( params.getApplicationKeys() );
-        return new LayoutDescriptorsJson( layoutDescriptors.stream()
-                                              .map( l -> jsonObjectsFactory.createLayoutDescriptorJson( l, request.getLocales() ) )
-                                              .collect( Collectors.toUnmodifiableList() ) );
+        return new LayoutDescriptorsJson(
+            layoutDescriptors.stream().map( l -> jsonObjectsFactory.createLayoutDescriptorJson( l, request.getLocales() ) ).collect(
+                Collectors.toUnmodifiableList() ) );
     }
 
     @Reference

modules/rest/src/main/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/part/PartDescriptorResource.java

@@ -25,9 +25,9 @@
 import com.enonic.xp.app.contentstudio.json.content.page.region.PartDescriptorsJson;
 import com.enonic.xp.app.contentstudio.rest.resource.ResourceConstants;
 import com.enonic.xp.app.contentstudio.rest.resource.content.JsonObjectsFactory;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.icon.Icon;
 import com.enonic.xp.jaxrs.JaxRsComponent;
-import com.enonic.xp.page.DescriptorKey;
 import com.enonic.xp.region.PartDescriptor;
 import com.enonic.xp.region.PartDescriptorService;
 import com.enonic.xp.security.RoleKeys;

modules/rest/src/test/java/com/enonic/xp/app/contentstudio/rest/resource/content/ContentResourceTest.java

@@ -154,7 +154,7 @@
 import com.enonic.xp.icon.Icon;
 import com.enonic.xp.index.ChildOrder;
 import com.enonic.xp.jaxrs.impl.MockRestResponse;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.Page;
 import com.enonic.xp.page.PageRegions;
 import com.enonic.xp.page.PageTemplateKey;

modules/rest/src/test/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/PageTemplateResourceTest.java

@@ -28,7 +28,7 @@
 import com.enonic.xp.core.impl.schema.content.BuiltinContentTypesAccessor;
 import com.enonic.xp.data.PropertyTree;
 import com.enonic.xp.page.CreatePageTemplateParams;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.Page;
 import com.enonic.xp.page.PageRegions;
 import com.enonic.xp.page.PageTemplate;

modules/rest/src/test/java/com/enonic/xp/app/contentstudio/rest/resource/content/page/layout/LayoutDescriptorResourceTest.java

@@ -18,7 +18,7 @@
 import com.enonic.xp.i18n.LocaleService;
 import com.enonic.xp.i18n.MessageBundle;
 import com.enonic.xp.inputtype.InputTypeName;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.region.LayoutDescriptor;
 import com.enonic.xp.region.LayoutDescriptorService;
 import com.enonic.xp.region.LayoutDescriptors;

modules/rest/src/test/java/com/enonic/xp/app/contentstudio/rest/resource/schema/content/FilterByContentResolverTest.java

@@ -28,7 +28,7 @@
 import com.enonic.xp.icon.Icon;
 import com.enonic.xp.inputtype.InputTypeConfig;
 import com.enonic.xp.inputtype.InputTypeProperty;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.PageDescriptor;
 import com.enonic.xp.page.PageDescriptorService;
 import com.enonic.xp.page.PageDescriptors;

modules/rest/src/test/java/com/enonic/xp/app/contentstudio/rest/resource/schema/content/FilterByContentResourceTest.java

@@ -22,7 +22,7 @@
 import com.enonic.xp.i18n.LocaleService;
 import com.enonic.xp.icon.Icon;
 import com.enonic.xp.inputtype.InputTypeName;
-import com.enonic.xp.page.DescriptorKey;
+import com.enonic.xp.descriptor.DescriptorKey;
 import com.enonic.xp.page.PageDescriptor;
 import com.enonic.xp.region.LayoutDescriptor;
 import com.enonic.xp.region.PartDescriptor;