SLING-8109 Replace KeyValueMap with Map<String,String>
diff --git a/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java b/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
index 90b5668..4081a01 100644
--- a/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
+++ b/src/main/java/org/apache/sling/feature/io/json/JSONReaderBase.java
@@ -31,7 +31,6 @@
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Include;
-import org.apache.sling.feature.KeyValueMap;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
@@ -49,8 +48,8 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.function.BiConsumer;
import java.util.Set;
+import java.util.function.BiConsumer;
import javax.json.Json;
import javax.json.JsonArrayBuilder;
@@ -150,7 +149,7 @@
* @return The same variables as a normal map
* @throws IOException If the json is invalid.
*/
- protected Map<String, String> readVariables(Map<String, Object> map, KeyValueMap kvMap) throws IOException {
+ protected Map<String, String> readVariables(Map<String, Object> map, Map<String,String> kvMap) throws IOException {
HashMap<String, String> variables = new HashMap<>();
if (map.containsKey(JSONConstants.FEATURE_VARIABLES)) {
@@ -320,7 +319,7 @@
}
protected void readFrameworkProperties(final Map<String, Object> map,
- final KeyValueMap container) throws IOException {
+ final Map<String,String> container) throws IOException {
if ( map.containsKey(JSONConstants.FEATURE_FRAMEWORK_PROPERTIES) ) {
final Object propsObj= map.get(JSONConstants.FEATURE_FRAMEWORK_PROPERTIES);
checkType(JSONConstants.FEATURE_FRAMEWORK_PROPERTIES, propsObj, Map.class);
diff --git a/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java b/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java
index 22c06db..4f7d77f 100644
--- a/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java
+++ b/src/main/java/org/apache/sling/feature/io/json/JSONWriterBase.java
@@ -24,7 +24,6 @@
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Include;
-import org.apache.sling.feature.KeyValueMap;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
@@ -68,7 +67,7 @@
cfgs.add(cfg);
}
}
- KeyValueMap md = artifact.getMetadata();
+ Map<String,String> md = artifact.getMetadata();
if ( md.isEmpty() && cfgs.isEmpty() ) {
generator.write(artifact.getId().toMvnId());
} else {
@@ -80,7 +79,7 @@
md.put("run-modes", (String) runmodes);
}
- for(final Map.Entry<String, String> me : md) {
+ for(final Map.Entry<String, String> me : md.entrySet()) {
generator.write(me.getKey(), me.getValue());
}
@@ -188,11 +187,11 @@
generator.writeEnd();
}
- protected void writeVariables(final JsonGenerator generator, final KeyValueMap vars) {
+ protected void writeVariables(final JsonGenerator generator, final Map<String,String> vars) {
if ( !vars.isEmpty()) {
generator.writeStartObject(JSONConstants.FEATURE_VARIABLES);
- for (final Map.Entry<String, String> entry : vars) {
+ for (final Map.Entry<String, String> entry : vars.entrySet()) {
String val = entry.getValue();
if (val != null)
generator.write(entry.getKey(), val);
@@ -204,11 +203,11 @@
}
}
- protected void writeFrameworkProperties(final JsonGenerator generator, final KeyValueMap props) {
+ protected void writeFrameworkProperties(final JsonGenerator generator, final Map<String,String> props) {
// framework properties
if ( !props.isEmpty() ) {
generator.writeStartObject(JSONConstants.FEATURE_FRAMEWORK_PROPERTIES);
- for(final Map.Entry<String, String> entry : props) {
+ for(final Map.Entry<String, String> entry : props.entrySet()) {
generator.write(entry.getKey(), entry.getValue());
}
generator.writeEnd();
@@ -248,7 +247,7 @@
generator.writeStartObject();
generator.write(JSONConstants.ARTIFACT_ID, artifact.getId().toMvnId());
- for(final Map.Entry<String, String> me : artifact.getMetadata()) {
+ for(final Map.Entry<String, String> me : artifact.getMetadata().entrySet()) {
generator.write(me.getKey(), me.getValue());
}
