adobe · DominikSuess · Apr 29, 2024 · Apr 26, 2024 · Apr 28, 2024 · Apr 28, 2024
diff --git a/aemanalyser-core/src/main/java/com/adobe/aem/analyser/AemPackageConverter.java b/aemanalyser-core/src/main/java/com/adobe/aem/analyser/AemPackageConverter.java
@@ -169,7 +169,7 @@ public void convert(final Map<String, File> contentPackages) throws IOException,
                     .setBundleSlingInitialContentExtractor(bundleSlingInitialContentExtractor)
                     .setEntryHandlersManager(
                         new DefaultEntryHandlersManager(Collections.emptyMap(), true,
-                                SlingInitialContentPolicy.EXTRACT_AND_REMOVE, ConverterConstants.SYSTEM_USER_REL_PATH_DEFAULT)
+                                SlingInitialContentPolicy.EXTRACT_AND_REMOVE, bundleSlingInitialContentExtractor, ConverterConstants.SYSTEM_USER_REL_PATH_DEFAULT)
                         )
                     .setAclManager(
                             new DefaultAclManager()

diff --git a/aemanalyser-core/src/test/java/com/adobe/aem/analyser/AemPackageConverterTest.java b/aemanalyser-core/src/test/java/com/adobe/aem/analyser/AemPackageConverterTest.java
@@ -0,0 +1,171 @@
+/*
+  Copyright 2024 Adobe. All rights reserved.
+  This file is licensed to you under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License. You may obtain a copy
+  of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software distributed under
+  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+  OF ANY KIND, either express or implied. See the License for the specific language
+  governing permissions and limitations under the License.
+*/
+package com.adobe.aem.analyser;
+
+import org.apache.jackrabbit.vault.packaging.PackageManager;
+import org.apache.jackrabbit.vault.packaging.PackageType;
+import org.apache.jackrabbit.vault.packaging.VaultPackage;
+import org.apache.jackrabbit.vault.packaging.impl.PackageManagerImpl;
+import org.apache.sling.feature.Extension;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.cpconverter.ConverterException;
+import org.apache.sling.feature.io.json.FeatureJSONReader;
+import org.apache.sling.repoinit.parser.impl.ParseException;
+import org.apache.sling.repoinit.parser.impl.RepoInitParserImpl;
+import org.apache.sling.repoinit.parser.operations.CreatePath;
+import org.apache.sling.repoinit.parser.operations.Operation;
+import org.apache.sling.repoinit.parser.operations.PathSegmentDefinition;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URL;
+import java.util.Deque;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class AemPackageConverterTest {
+
+    public @Rule TemporaryFolder tempDir = new TemporaryFolder();
+
+    private final AemPackageConverter systemUnderTest = new AemPackageConverter();
+
+    private final PackageManager packageManager = new PackageManagerImpl();
+    private final Map<String, File> packages = new LinkedHashMap<>(1);
+
+    File outDir;
+    File featureDir;
+
+
+    @Before
+    public void setUp() throws IOException {
+
+        outDir = tempDir.newFolder("out");
+        featureDir = tempDir.newFolder("features");
+
+        systemUnderTest.setFeatureOutputDirectory(featureDir);
+        systemUnderTest.setConverterOutputDirectory(outDir);
+        systemUnderTest.setBundlesOutputDirectory(outDir);
+
+
+    }
+
+    @Test
+    public void testSlingInitialContent() throws ConverterException, IOException, ParseException {
+        URL url = AemPackageConverterTest.class.getClassLoader().getResource("packages/aem-guides-wknd-wcmio.all.zip");
+        packages.put("wcmio-all", new File(url.getFile()));
+
+        systemUnderTest.convert(packages);
+
+        File featureFile = new File(featureDir, "aem-guides-wknd-wcmio.all.json");
+
+        try(FileReader reader=  new FileReader(featureFile)){
+            Feature feature = FeatureJSONReader.read(reader, featureFile.getAbsolutePath());
+            assertNotNull(feature);
+
+            Extension repoinit = feature.getExtensions().getByName(Extension.EXTENSION_NAME_REPOINIT);
+
+            assertNotNull(repoinit);
+
+            RepoInitParserImpl parser = new RepoInitParserImpl(
+                  new StringReader(  repoinit.getText())
+            );
+
+            List<Operation> operations = parser.parse();
+
+            List<CreatePath> createPaths = operations.stream()
+                    .filter(op -> op instanceof CreatePath)
+                    .map(op -> (CreatePath) op)
+                    .collect(Collectors.toList());
+
+            assertEquals(45, createPaths.size());
+
+            Optional<CreatePath> cp  =createPaths.stream().filter((CreatePath createPath) -> {
+                List<PathSegmentDefinition> paths = createPath.getDefinitions();
+
+                if(paths.size() == 7){
+
+                    return  paths.get(0).getSegment().equals("apps") &&
+                            paths.get(0).getPrimaryType().equals("sling:Folder") &&
+                            paths.get(1).getSegment().equals("wcm-io") &&
+                            paths.get(1).getPrimaryType().equals("sling:Folder") &&
+                            paths.get(2).getSegment().equals("handler") &&
+                            paths.get(2).getPrimaryType().equals("sling:Folder") &&
+                            paths.get(3).getSegment().equals("link") &&
+                            paths.get(3).getPrimaryType().equals("sling:Folder") &&
+                            paths.get(4).getSegment().equals("components") &&
+                            paths.get(4).getPrimaryType().equals("sling:Folder") &&
+                            paths.get(5).getSegment().equals("global") &&
+                            paths.get(5).getPrimaryType().equals("sling:Folder") &&
+                            paths.get(6).getSegment().equals("include") &&
+                            paths.get(6).getPrimaryType().equals("sling:Folder");
+                }
+
+                return false;
+
+            }).findAny();
+
+            assertTrue("does not have desired create path statement of /apps/wcm-io/handler/link/components/global/include", cp.isPresent());
+
+            assertExtractedInitialContentFromBundle("io.wcm.handler.link", "2.1.0");
+            assertExtractedInitialContentFromBundle("io.wcm.handler.media", "2.0.4");
+            assertExtractedInitialContentFromBundle("io.wcm.handler.url", "2.1.0");
+            assertExtractedInitialContentFromBundle("io.wcm.wcm.commons", "1.10.0");
+            assertExtractedInitialContentFromBundle("io.wcm.wcm.ui.granite", "1.10.4");
+
+            File contentPackageCSVFile = new File(featureDir, "content-packages.csv");
+            String line = "";
+            Deque<String> lines = new LinkedList<>();
+
+            //parsing a CSV file into BufferedReader class constructor
+            try(FileReader fr = new FileReader(contentPackageCSVFile); BufferedReader br = new BufferedReader(fr)){
+                while ((line = br.readLine()) != null)   //returns a Boolean value
+                {
+                    lines.add(line);
+                }
+
+                assertEquals(9, lines.size());
+            }
+
+
+        }
+    }
+
+    private void assertExtractedInitialContentFromBundle(String module, String version) throws IOException {
+        File appsPackageFile = new File(outDir, String.format("io/wcm/%1$s-apps/%2$s/%1$s-apps-%2$s-cp2fm-converted.zip", module, version));
+        VaultPackage appsVltPackage = packageManager.open(appsPackageFile);
+        appsVltPackage.getPackageType().equals(PackageType.APPLICATION);
+        assertNotNull(appsVltPackage);
+
+        try(JarFile jarFile = new JarFile(new File(outDir,  String.format("io/wcm/%1$s/%2$s-cp2fm-converted/%1$s-%2$s-cp2fm-converted.jar", module, version)))){
+            assertNotNull(jarFile);
+            assertNotNull(jarFile.getManifest());
+        }
+    }
+
+
+}
diff --git a/aemanalyser-core/src/test/resources/packages/aem-guides-wknd-wcmio.all.zip b/aemanalyser-core/src/test/resources/packages/aem-guides-wknd-wcmio.all.zip