Upgrade to XP8 #378

Author: alansemenov

build.gradle

@@ -2,31 +2,29 @@ plugins {
     id 'java'
     id 'jacoco'
     id 'maven-publish'
-    id 'com.enonic.defaults' version '2.1.6'
-    id 'com.enonic.xp.base' version '3.6.2'
-    id 'com.github.node-gradle.node' version '7.1.0'
+    alias( libs.plugins.enonic.defaults )
+    alias( libs.plugins.enonic.xp.base )
+    alias( libs.plugins.node.gradle )
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = sourceCompatibility
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(21)
+  }
 }
 
-
 dependencies {
-   // compileOnly: This is used for dependencies that are only needed during
-   // compilation. The library itself is not included in the final application
-   // build.
   compileOnly "com.enonic.xp:core-api:${xpVersion}"
   compileOnly "com.enonic.xp:portal-api:${xpVersion}"
   compileOnly "com.enonic.xp:script-api:${xpVersion}"
   compileOnly "com.enonic.xp:admin-api:${xpVersion}"
 
-  implementation 'com.enonic.lib:lib-router:3.2.0'
+  implementation libs.lib.router
 
-  testImplementation 'org.mockito:mockito-core:5.18.0'
-  testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
-  testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
+  testImplementation platform( libs.mockito.core )
+  testImplementation libs.junit.jupiter
+  testImplementation libs.mockito.jupiter
+  testRuntimeOnly libs.junit.launcher
   testImplementation "com.enonic.xp:testing:${xpVersion}"
   testImplementation "com.enonic.xp:admin-api:${xpVersion}"
 }
@@ -38,6 +36,7 @@ processResources {
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
     xp.enonicRepo('dev')
 }
@@ -49,8 +48,6 @@ jacocoTestReport {
   }
 }
 
-check.dependsOn jacocoTestReport
-
 test {
   useJUnitPlatform()
 }
@@ -67,7 +64,7 @@ node {
   version = '20.14.0'
 }
 
-tasks.withType(Copy) {
+tasks.withType( Copy ).configureEach {
   includeEmptyDirs = false
 }
 
@@ -87,8 +84,6 @@ tasks.register('npmBuild', NpmTask) {
   inputs.dir 'src/main/resources'
   outputs.dir 'build/resources/main'
 }
-jar.dependsOn npmBuild
-compileTestJava.dependsOn npmBuild
 
 tasks.register('npmCheck', NpmTask) {
 	dependsOn npmInstall
@@ -101,8 +96,6 @@ tasks.register('npmCheck', NpmTask) {
 	]
 }
 
-check.dependsOn npmCheck
-
 tasks.register('npmTest', NpmTask) {
 	args = [
 		'run',
@@ -115,7 +108,6 @@ tasks.register('npmTest', NpmTask) {
   inputs.dir 'src/bun'
   outputs.dir 'coverage'
 }
-test.dependsOn npmTest
 
 tasks.register('publishToNpm', NpmTask ) {
   onlyIf { !version.endsWith( '-SNAPSHOT' ) }
@@ -124,4 +116,8 @@ tasks.register('publishToNpm', NpmTask ) {
   workingDir = file('build/types')
 }
 
+jar.dependsOn npmBuild
+compileTestJava.dependsOn npmBuild
+test.dependsOn npmTest
+check.dependsOn npmCheck, jacocoTestReport
 publish.dependsOn publishToNpm

gradle.properties

@@ -1,4 +1,4 @@
 group = com.enonic.lib
 projectName = lib-asset
-xpVersion = 7.14.0
-version = 1.0.4-SNAPSHOT
+xpVersion = 8.0.0-SNAPSHOT
+version = 2.0.0-SNAPSHOT

gradle/libs.versions.toml

@@ -0,0 +1,21 @@
+[versions]
+
+junit = "6.0.0"
+mockito = "5.20.0"
+enonicDefaults = "2.1.6"
+enonicXpGradle = "3.6.2"
+nodeGradle = "7.1.0"
+
+[libraries]
+
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+mockito-core = { module = "org.mockito:mockito-bom", version.ref = "mockito" }
+mockito-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
+
+lib-router = { module = "com.enonic.lib:lib-router", version = "4.0.0-SNAPSHOT" }
+
+[plugins]
+enonic-defaults = { id = "com.enonic.defaults", version.ref = "enonicDefaults" }
+enonic-xp-base = { id = "com.enonic.xp.base", version.ref = "enonicXpGradle" }
+node-gradle = { id = "com.github.node-gradle.node", version.ref = "nodeGradle" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -15,6 +15,7 @@
 import com.enonic.xp.script.bean.BeanContext;
 import com.enonic.xp.script.bean.ScriptBean;
 import com.enonic.xp.site.Site;
+import com.enonic.xp.site.SiteConfigsDataSerializer;
 import com.enonic.xp.web.WebException;
 
 public class RequestVerifierHandler
@@ -90,7 +91,8 @@ private boolean verifyRequestMountedOnSites( final ApplicationKey applicationKey
 
     final Site site = contentResolverResult.getNearestSite();
 
-    final boolean isAppInstalledOnSite = site != null && site.getSiteConfigs().get( applicationKey ) != null;
+    final boolean isAppInstalledOnSite = site != null &&
+      SiteConfigsDataSerializer.fromData( site.getData().getRoot() ).get( applicationKey ) != null;
 
     if ( !isAppInstalledOnSite )
     {

src/main/java/com/enonic/lib/asset/RequestVerifierHandler.java

@@ -10,5 +10,5 @@ router.get('{path:.*}', (request: Request): Response => {
 });
 
 export const all = (request: Request): Response => {
-  return router.dispatch(request) as Response;
+  return router.dispatch(request);
 }

src/main/resources/services/asset/asset.ts

@@ -53,10 +53,10 @@ void testCreateAssetUrlAdminSiteOnProject()
     portalRequest.setBranch( Branch.from( "branch" ) );
     portalRequest.setBaseUri( "/admin/site/preview" );
     portalRequest.setRawPath( "/admin/site/preview/project/branch/" );
+    portalRequest.setContentPath( ContentPath.ROOT );
 
     runFunction( "lib/assetUrl-test.js", "createAssetUrlAdminSiteOnProject" );
 
-    verify( contentService, times( 1 ) ).findNearestSiteByPath( any( ContentPath.class ) );
     verify( portalUrlService, times( 1 ) ).generateUrl( any( GenerateUrlParams.class ) );
   }
 
@@ -71,6 +71,7 @@ void testCreateAssetUrlOnSite()
     portalRequest.setBranch( Branch.from( "branch" ) );
     portalRequest.setBaseUri( "/site" );
     portalRequest.setRawPath( "/site/project/branch/mysite" );
+    portalRequest.setContentPath( ContentPath.from( "/mysite" ) );
 
     runFunction( "lib/assetUrl-test.js", "createAssetUrlOnSite" );