Merge pull request #69 from Cognifide/vlt-skip-properties-with-wildcards

VLT skip properties with wildcards

Author: pun-ky

README.md

@@ -63,7 +63,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.8'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.9'
     }
 }
 

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.cognifide.gradle'
-version '2.0.8'
+version '2.0.9'
 description = 'Gradle AEM Plugin'
 defaultTasks = ['clean', 'publishToMavenLocal']
 

src/main/kotlin/com/cognifide/gradle/aem/AemConfig.kt

@@ -196,7 +196,7 @@ open class AemConfig(project: Project) : Serializable {
     var vaultSkipProperties: MutableList<String> = mutableListOf(
             "jcr:lastModified",
             "jcr:created",
-            "cq:lastModified",
+            "cq:lastModified*",
             "cq:lastReplicat*",
             "jcr:uuid"
     )

src/main/kotlin/com/cognifide/gradle/aem/vlt/VltCleaner.kt

@@ -1,5 +1,6 @@
 package com.cognifide.gradle.aem.vlt
 
+import com.cognifide.gradle.aem.internal.Patterns
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.filefilter.NameFileFilter
 import org.apache.commons.io.filefilter.TrueFileFilter
@@ -8,13 +9,16 @@ import org.apache.commons.lang3.StringUtils
 import org.gradle.api.logging.Logger
 import java.io.File
 import java.io.IOException
+import java.util.regex.Pattern
 
 class VltCleaner(val root: File, val logger: Logger) {
 
     companion object {
         val VLT_FILE = ".vlt"
 
         val JCR_CONTENT_FILE = ".content.xml"
+
+        val CONTENT_PROP_PATTERN = Pattern.compile("([^=]+)=\"([^\"]+)\"")
     }
 
     fun removeVltFiles() {
@@ -44,7 +48,7 @@ class VltCleaner(val root: File, val logger: Logger) {
 
         for (line in lines) {
             val cleanLine = StringUtils.trimToEmpty(line)
-            if (contentProperties.any { cleanLine.startsWith(it) }) {
+            if (lineContainsProperty(line, contentProperties)) {
                 when {
                     cleanLine.endsWith("/>") -> {
                         result.add(result.removeAt(result.size - 1) + "/>")
@@ -65,5 +69,15 @@ class VltCleaner(val root: File, val logger: Logger) {
         return result
     }
 
+    private fun lineContainsProperty(line: String, props: List<String>): Boolean {
+        val normalizedLine = line.trim().removeSuffix("/>").removeSuffix(">")
+        val matcher = CONTENT_PROP_PATTERN.matcher(normalizedLine)
+        if (matcher.matches()) {
+            return Patterns.wildcard(matcher.group(1), props)
+        }
+
+        return false
+    }
+
 }
 

src/test/kotlin/com/cognifide/gradle/aem/vlt/VltCleanerTest.kt

@@ -15,15 +15,15 @@ class VltCleanerTest {
 
     @Test
     fun shouldCleanupDotContentWithDefaultClosing() {
-        cleanUpDotContent("cleanupDotContent/defaultClosing")
+        cleanupDotContent("cleanupDotContent/defaultClosing")
     }
 
     @Test
     fun shouldCleanupDotContentWithSelfClosing() {
-        cleanUpDotContent("cleanupDotContent/selfClosing")
+        cleanupDotContent("cleanupDotContent/selfClosing")
     }
 
-    private fun cleanUpDotContent(case: String) {
+    private fun cleanupDotContent(case: String) {
         val expectedFile = File(javaClass.getResource("$case-expected.xml").toURI())
         val sourceFile = File(javaClass.getResource("$case.xml").toURI())
         val testedFile = File(tmpDir.newFolder(), ".content.xml")
@@ -32,7 +32,7 @@ class VltCleanerTest {
         VltCleaner(testedFile.parentFile, NopLogger()).cleanupDotContent(listOf(
                 "jcr:lastModified",
                 "jcr:created",
-                "cq:lastModified",
+                "cq:lastModified*",
                 "cq:lastReplicat*",
                 "jcr:uuid"
         ), "\r\n")

src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/gradle/buildscript.gradle

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.cognifide.gradle:aem-plugin:2.0.8'
+    classpath 'com.cognifide.gradle:aem-plugin:2.0.9'
     classpath "org.dm.gradle:gradle-bundle-plugin:0.10.0"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.4"
 }

src/test/resources/com/cognifide/gradle/aem/test/compose/bundle-and-content/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.8'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.9'
         classpath 'org.dm.gradle:gradle-bundle-plugin:0.10.0'
     }
 }

src/test/resources/com/cognifide/gradle/aem/test/debug/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.8'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.9'
     }
 }
 

src/test/resources/com/cognifide/gradle/aem/vlt/cleanupDotContent/defaultClosing.xml

@@ -6,6 +6,7 @@
     jcr:uuid="123e4567-e89b-12d3-a456-426655440000"
     jcr:title="Sample Page"
     sling:resourceType="example/core/components/page"
+    cq:lastReplicatedBy="foo"
     cq:lastModifiedBy="foo">
   </jcr:content>
 </jcr:root>

src/test/resources/com/cognifide/gradle/aem/vlt/cleanupDotContent/selfClosing.xml

@@ -6,5 +6,6 @@
     jcr:uuid="123e4567-e89b-12d3-a456-426655440000"
     jcr:title="Sample Page"
     sling:resourceType="example/core/components/page"
+    cq:lastReplicatedBy="foo"
     cq:lastModifiedBy="foo"/>
 </jcr:root>