You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:57:51 UTC
[sling-org-apache-sling-provisioning-model] 13/19: SLING-4786 :
Attributes and configuration format are wronlgy written out
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit f66c21ebfac9d8fed52e59fd37697f3a35a947f3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jun 8 11:57:31 2015 +0000
SLING-4786 : Attributes and configuration format are wronlgy written out
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1684166 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/provisioning/model/io/ModelReader.java | 23 +++++++++++++---------
.../sling/provisioning/model/io/ModelWriter.java | 8 ++++----
.../org/apache/sling/provisioning/model/U.java | 14 +++++++++++++
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
index 903a578..9419880 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
@@ -32,7 +32,9 @@ import org.apache.sling.provisioning.model.Model;
import org.apache.sling.provisioning.model.ModelConstants;
import org.apache.sling.provisioning.model.RunMode;
-
+/**
+ * This class offers a method to read a model using a {@code Reader} instance.
+ */
public class ModelReader {
private enum CATEGORY {
@@ -56,8 +58,11 @@ public class ModelReader {
/**
* Reads the model file
- * The reader is not closed.
- * @throws IOException
+ * The reader is not closed. It is up to the caller to close the reader.
+ *
+ * @param reader The reader providing the model
+ * @param location Optional location string identifying the source of the model.
+ * @throws IOException If an error occurs
*/
public static Model read(final Reader reader, final String location)
throws IOException {
@@ -69,14 +74,14 @@ public class ModelReader {
private final Model model = new Model();
- private Feature feature = null;
- private RunMode runMode = null;
- private ArtifactGroup artifactGroup = null;
- private Configuration config = null;
+ private Feature feature;
+ private RunMode runMode;
+ private ArtifactGroup artifactGroup;
+ private Configuration config;
- private String comment = null;
+ private String comment;
- private StringBuilder configBuilder = null;
+ private StringBuilder configBuilder;
private LineNumberReader lineNumberReader;
diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
index 3f371c6..470e5fa 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
@@ -147,7 +147,7 @@ public class ModelWriter {
for(final Map.Entry<String, String> entry : ad.getMetadata().entrySet()) {
if ( first ) {
first = false;
- pw.print(" { ");
+ pw.print(" [");
} else {
pw.print(", ");
}
@@ -155,7 +155,7 @@ public class ModelWriter {
pw.print("=");
pw.print(entry.getValue());
}
- pw.print("}");
+ pw.print("]");
}
pw.println();
}
@@ -182,9 +182,9 @@ public class ModelWriter {
}
pw.print(config.getPid());
if ( !ModelConstants.CFG_FORMAT_FELIX_CA.equals(format) ) {
- pw.print(" { format=}");
+ pw.print(" [format=");
pw.print(format);
- pw.print(" }");
+ pw.print("]");
}
pw.println();
diff --git a/src/test/java/org/apache/sling/provisioning/model/U.java b/src/test/java/org/apache/sling/provisioning/model/U.java
index f2a5756..65576de 100644
--- a/src/test/java/org/apache/sling/provisioning/model/U.java
+++ b/src/test/java/org/apache/sling/provisioning/model/U.java
@@ -117,6 +117,20 @@ public class U {
U.assertArtifact(g, "mvn:org.apache.sling/org.apache.sling.fragment.ws/${ws.version}/jar");
}
}
+ final Feature exampleFeature = m.getFeature("example");
+ final RunMode defaultExampleRM = exampleFeature.getRunMode();
+ final List<Configuration> configs = assertConfigurationsInRunMode(defaultExampleRM, 3);
+ final Configuration cfg = assertConfiguration(configs, "org.apache.sling.another.config");
+ }
+
+ public static Configuration assertConfiguration(final List<Configuration> configs, final String pid) {
+ for(final Configuration c : configs) {
+ if ( c.getPid().equals(pid) && c.getFactoryPid() == null ) {
+ return c;
+ }
+ }
+ fail("Configuration with PID " + pid + " not found in " + configs);
+ return null;
}
public static void assertArtifact(final Artifact artifact,
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.