This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 5efd217 SLING-10291 : Remove obsolete task configuration fileStorage
5efd217 is described below
commit 5efd217531089ad98ba155b3f4d2af7677e18def
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Sat Apr 10 16:11:40 2021 +0200
SLING-10291 : Remove obsolete task configuration fileStorage
---
.../feature/maven/mojos/AggregateFeaturesMojo.java | 23 ----------------------
.../feature/maven/mojos/AnalyseFeaturesMojo.java | 20 -------------------
.../maven/mojos/AggregateFeaturesMojoTest.java | 5 -----
.../maven/mojos/AnalyseFeaturesMojoTest.java | 23 ----------------------
4 files changed, 71 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
b/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
index 5eae489..9035e24 100644
---
a/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
+++
b/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojo.java
@@ -16,8 +16,6 @@
*/
package org.apache.sling.feature.maven.mojos;
-import java.io.File;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -50,8 +48,6 @@ import org.apache.sling.feature.maven.ProjectHelper;
threadSafe = true
)
public class AggregateFeaturesMojo extends AbstractIncludingFeatureMojo {
- private static final String FILE_STORAGE_CONFIG_KEY = "fileStorage";
- private static final String HANDLER_CONFIG_WILDCARD = "all";
/* A context flag to track if we have already been processed */
private static final String PROPERTY_HANDLED_AGGREGATE_FEATURES =
AggregateFeaturesMojo.class.getName() + "/generated";
@@ -135,26 +131,13 @@ public class AggregateFeaturesMojo extends
AbstractIncludingFeatureMojo {
builderContext.addConfigsOverrides(aggregate.getConfigurationOverrideRules());
- boolean wildcardSet = false;
for (final Map.Entry<String, Properties> entry :
handlerConfiguration.entrySet()) {
String key = entry.getKey();
Properties props = entry.getValue();
- if (HANDLER_CONFIG_WILDCARD.equals(key)) {
- if (!props.containsKey(FILE_STORAGE_CONFIG_KEY)) {
- props.put(FILE_STORAGE_CONFIG_KEY,
getFeatureModelStorage());
- }
- wildcardSet = true;
- }
-
builderContext.setHandlerConfiguration(key,
ProjectHelper.propertiesToMap(props));
}
- if (!wildcardSet) {
- builderContext.setHandlerConfiguration(HANDLER_CONFIG_WILDCARD,
- Collections.singletonMap(FILE_STORAGE_CONFIG_KEY,
getFeatureModelStorage()));
- }
-
final ArtifactId newFeatureID = new
ArtifactId(project.getGroupId(), project.getArtifactId(),
project.getVersion(), aggregate.classifier,
FeatureConstants.PACKAGING_FEATURE);
final Feature result = assembleFeature(newFeatureID,
builderContext, selection);
@@ -192,10 +175,4 @@ public class AggregateFeaturesMojo extends
AbstractIncludingFeatureMojo {
return FeatureBuilder.assemble(newFeatureID, builderContext,
selection.values().toArray(new Feature[selection.size()]));
}
-
- private String getFeatureModelStorage() {
- String featureModelFileStorage = project.getBuild().getDirectory() +
"/sling-slingfeature-maven-plugin-fmtmp";
- new File(featureModelFileStorage).mkdirs();
- return featureModelFileStorage;
- }
}
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
b/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
index fddc40c..8cd87e5 100644
---
a/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
+++
b/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
@@ -16,13 +16,11 @@
*/
package org.apache.sling.feature.maven.mojos;
-import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -55,10 +53,6 @@ import org.apache.sling.feature.scanner.Scanner;
)
public class AnalyseFeaturesMojo extends AbstractIncludingFeatureMojo {
- private static final String FILE_STORAGE_CONFIG_KEY = "fileStorage";
-
- private static final String ANALYSER_CONFIG_WILDCARD = "all";
-
/**
* The scans for the analyser
*/
@@ -110,7 +104,6 @@ public class AnalyseFeaturesMojo extends
AbstractIncludingFeatureMojo {
for (final Scan an : list) {
try {
Map<String, Map<String, String>> taskConfiguration =
an.getTaskConfiguration();
- addTaskConfigurationDefaults(taskConfiguration);
getLog().debug(MessageUtils.buffer().a("Setting up the
").strong("analyser")
.a(" with following configuration:").toString());
@@ -213,17 +206,4 @@ public class AnalyseFeaturesMojo extends
AbstractIncludingFeatureMojo {
protected FeatureProvider getFeatureProvider() {
return new BaseFeatureProvider();
}
-
- void addTaskConfigurationDefaults(Map<String, Map<String, String>>
taskConfiguration) {
- String featureModelFileStorage = project.getBuild().getDirectory() +
"/sling-slingfeature-maven-plugin-fmtmp";
- Map<String, String> wildCardCfg =
taskConfiguration.get(ANALYSER_CONFIG_WILDCARD);
- if (wildCardCfg == null) {
- wildCardCfg = new HashMap<String, String>();
- taskConfiguration.put(ANALYSER_CONFIG_WILDCARD, wildCardCfg);
- }
- if (!wildCardCfg.containsKey(FILE_STORAGE_CONFIG_KEY)) {
- new File(featureModelFileStorage).mkdirs();
- wildCardCfg.put(FILE_STORAGE_CONFIG_KEY, featureModelFileStorage);
- }
- }
}
diff --git
a/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
b/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
index 1d9a908..4ac86b4 100644
---
a/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
+++
b/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
@@ -594,10 +594,6 @@ public class AggregateFeaturesMojoTest {
afm.execute();
assertEquals(1, capturedBuilderContext.size());
BuilderContext bc = capturedBuilderContext.iterator().next();
-
- Map hc = (Map) invokePrivateMethod(bc, "getHandlerConfigurations");
- Map allConfig = (Map) hc.get("all");
- assertTrue(((String) allConfig.get("fileStorage")).length() > 0);
}
@SuppressWarnings("rawtypes")
@@ -661,7 +657,6 @@ public class AggregateFeaturesMojoTest {
Map hc = (Map) invokePrivateMethod(bc, "getHandlerConfigurations");
Map allConfig = (Map) hc.get("all");
assertEquals("a aa a", allConfig.get("a"));
- assertTrue(((String) allConfig.get("fileStorage")).length() > 0);
assertEquals("z", ((Map) hc.get("specific")).get("zz"));
}
diff --git
a/src/test/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojoTest.java
b/src/test/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojoTest.java
index dd67bd8..7c3408e 100644
---
a/src/test/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojoTest.java
+++
b/src/test/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojoTest.java
@@ -28,23 +28,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class AnalyseFeaturesMojoTest {
- @Test
- public void testTaskConfiguration() {
- Build mockBuild = Mockito.mock(Build.class);
- Mockito.when(mockBuild.getDirectory()).thenReturn("/some-build-dir");
-
- MavenProject mockProject = Mockito.mock(MavenProject.class);
- Mockito.when(mockProject.getBuild()).thenReturn(mockBuild);
-
- AnalyseFeaturesMojo afm = new AnalyseFeaturesMojo();
- afm.project = mockProject;
-
- Map<String, Map<String, String>> cfg = new HashMap<String,
Map<String,String>>();
- afm.addTaskConfigurationDefaults(cfg);
-
- Map<String, String> allCfg = cfg.get("all");
- assertTrue(allCfg.get("fileStorage").startsWith("/some-build-dir/"));
- }
@Test
public void testTaskConfigurationOverridden() {
@@ -64,8 +47,6 @@ public class AnalyseFeaturesMojoTest {
allMap.put("x", "y");
cfg.put("all", allMap);
- afm.addTaskConfigurationDefaults(cfg);
-
Map<String, String> allCfg = cfg.get("all");
assertEquals("/my-location", allCfg.get("fileStorage"));
assertEquals("y", allCfg.get("x"));
@@ -74,7 +55,6 @@ public class AnalyseFeaturesMojoTest {
@Test
public void testTaskConfigurationSupplied() {
Build mockBuild = Mockito.mock(Build.class);
- Mockito.when(mockBuild.getDirectory()).thenReturn("/some-build-dir");
MavenProject mockProject = Mockito.mock(MavenProject.class);
Mockito.when(mockProject.getBuild()).thenReturn(mockBuild);
@@ -88,10 +68,7 @@ public class AnalyseFeaturesMojoTest {
allMap.put("x", "y");
cfg.put("all", allMap);
- afm.addTaskConfigurationDefaults(cfg);
-
Map<String, String> allCfg = cfg.get("all");
- assertTrue(allCfg.get("fileStorage").startsWith("/some-build-dir/"));
assertEquals("y", allCfg.get("x"));
}
}
