small fixes

wttech · Jul 27, 2023 · 2644d87 · 2644d87
1 parent faac248
commit 2644d87
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/...aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java b/...aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java
@@ -139,7 +139,9 @@ private Set<String> getAccessControlledPaths(Context context)
         for (JackrabbitAccessControlEntry jackrabbitAccessControlEntry : jackrabbitAccessControlEntries) {
           Set<Restriction> restrictions = ((ACE) jackrabbitAccessControlEntry).getRestrictions();
           for (Restriction restriction : restrictions) {
-            result.add(restriction.getProperty().getValue(Type.STRING));
+            if (Type.PATH.equals(restriction.getProperty().getType())) {
+              result.add(restriction.getProperty().getValue(Type.PATH));
+            }
           }
         }
       }

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/ScriptMoveServlet.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/ScriptMoveServlet.kt
@@ -50,9 +50,9 @@ class ScriptMoveServlet : AbstractFormServlet<ScriptMoveForm>(ScriptMoveForm::cl
         this.modelFactory = modelFactory
     }
 
-    override fun doPost(form: ScriptMoveForm, resolver: ResourceResolver): ResponseEntity<Any> {
+    override fun doPost(form: ScriptMoveForm, resourceResolver: ResourceResolver): ResponseEntity<Any> {
         return try {
-            val session = resolver.adaptTo(Session::class.java)!!
+            val session = resourceResolver.adaptTo(Session::class.java)!!
             val dest = StringUtils.defaultIfEmpty(form.dest, StringUtils.substringBeforeLast(form.path, "/"))
             val rename = if (containsExtension(form.path)) {
                 form.rename + if (containsExtension(form.rename)) "" else Apm.FILE_EXT
@@ -61,15 +61,15 @@ class ScriptMoveServlet : AbstractFormServlet<ScriptMoveForm>(ScriptMoveForm::cl
             }
             var destPath = "$dest/$rename"
             if (form.path != destPath) {
-                destPath = createUniquePath(destPath, resolver)
+                destPath = createUniquePath(destPath, resourceResolver)
                 session.move(form.path, destPath)
                 session.save()
             }
             if (!containsExtension(form.path)) {
-                val valueMap = resolver.getResource(destPath)?.adaptTo(ModifiableValueMap::class.java)
+                val valueMap = resourceResolver.getResource(destPath)?.adaptTo(ModifiableValueMap::class.java)
                 valueMap?.put(JcrConstants.JCR_TITLE, form.rename)
             }
-            resolver.commit()
+            resourceResolver.commit()
             ok {
                 message = "Item successfully moved"
             }

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/dto/ScriptDto.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/dto/ScriptDto.kt
@@ -29,7 +29,7 @@ class ScriptDto(script: Script) {
     val path: String = script.path
     val author: String? = script.author
     val launchEnabled: Boolean = script.isLaunchEnabled
-    val launchMode: String = script.launchMode.name.toLowerCase()
+    val launchMode: String = script.launchMode.name.lowercase()
     val lastModified: Date? = script.lastModified
     val valid: Boolean = script.isValid
 

diff --git a/.../core/src/main/kotlin/com/cognifide/apm/core/endpoints/params/RequestParameterInjector.kt b/.../core/src/main/kotlin/com/cognifide/apm/core/endpoints/params/RequestParameterInjector.kt
@@ -88,7 +88,7 @@ class RequestParameterInjector : Injector, StaticInjectAnnotationProcessorFactor
                     .mapKeys { it.key as String }
                     .filterKeys { it.startsWith(prefix) }
                     .mapKeys { it.key.removePrefix(prefix) }
-                    .mapKeys { it.key.decapitalize() }
+                    .mapKeys { entry -> entry.key.replaceFirstChar { it.lowercase() } }
 
     private fun toLocalDateTime(annotatedElement: AnnotatedElement, parameterValue: org.apache.sling.api.request.RequestParameter): LocalDateTime {
         val dateFormat = annotatedElement.getAnnotation(DateFormat::class.java)?.value

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/response/JsonObject.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/response/JsonObject.kt
@@ -76,6 +76,7 @@ private class PropertyDelegate<T>(
         private val default: T
 ) {
 
+    @Suppress("UNCHECKED_CAST")
     operator fun getValue(thisRef: Any?, property: KProperty<*>): T? {
         return properties[name] as T ?: default
     }

diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/version/VersionService.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/version/VersionService.kt
@@ -28,7 +28,7 @@ interface VersionService {
 
     fun getVersionPath(script: Script): String
 
-    fun updateVersionIfNeeded(resolver: ResourceResolver, vararg script: Script)
+    fun updateVersionIfNeeded(resolver: ResourceResolver, vararg scripts: Script)
 
     fun countChecksum(root: Iterable<Script>): String