Author: cziegeler Date: Fri Sep 29 15:10:20 2017 New Revision: 1810120 URL: http://svn.apache.org/viewvc?rev=1810120&view=rev Log: Support maven coordinates
Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java?rev=1810120&r1=1810119&r2=1810120&view=diff ============================================================================== --- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java (original) +++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java Fri Sep 29 15:10:20 2017 @@ -77,7 +77,7 @@ public class ApplicationJSONReader exten final String frameworkId = this.getProperty(map, JSONConstants.APP_FRAMEWORK); if ( frameworkId != null ) { - app.setFramework(ArtifactId.fromMvnId(frameworkId)); + app.setFramework(ArtifactId.parse(frameworkId)); } this.readBundles(map, app.getBundles(), app.getConfigurations()); this.readFrameworkProperties(map, app.getFrameworkProperties()); Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java?rev=1810120&r1=1810119&r2=1810120&view=diff ============================================================================== --- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java (original) +++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java Fri Sep 29 15:10:20 2017 @@ -116,7 +116,7 @@ public class FeatureJSONReader extends J } else { final Object idObj = map.get(JSONConstants.FEATURE_ID); checkType(JSONConstants.FEATURE_ID, idObj, String.class); - fId = ArtifactId.fromMvnId(idObj.toString()); + fId = ArtifactId.parse(idObj.toString()); } this.feature = new Feature(fId); this.feature.setLocation(this.location); @@ -138,7 +138,7 @@ public class FeatureJSONReader extends J if ( map.containsKey(JSONConstants.FEATURE_UPGRADEOF) ) { final Object idObj = map.get(JSONConstants.FEATURE_UPGRADEOF); checkType(JSONConstants.FEATURE_UPGRADEOF, idObj, String.class); - this.feature.setUpgradeOf(ArtifactId.fromMvnId(idObj.toString())); + this.feature.setUpgradeOf(ArtifactId.parse(idObj.toString())); } if ( map.containsKey(JSONConstants.FEATURE_UPGRADES) ) { final Object listObj = map.get(JSONConstants.FEATURE_UPGRADES); @@ -147,7 +147,7 @@ public class FeatureJSONReader extends J final List<Object> list = (List<Object>) listObj; for(final Object element : list) { checkType(JSONConstants.FEATURE_UPGRADES, element, String.class); - feature.getUpgrades().add(ArtifactId.fromMvnId(element.toString())); + feature.getUpgrades().add(ArtifactId.parse(element.toString())); } } @@ -169,7 +169,7 @@ public class FeatureJSONReader extends J checkType("Include", inc, Map.class, String.class); final Include include; if ( inc instanceof String ) { - final ArtifactId id = ArtifactId.fromMvnId(inc.toString()); + final ArtifactId id = ArtifactId.parse(inc.toString()); include = new Include(id); } else { @SuppressWarnings("unchecked") @@ -178,7 +178,7 @@ public class FeatureJSONReader extends J throw new IOException(exceptionPrefix + " include is missing required artifact id"); } checkType("Include " + JSONConstants.ARTIFACT_ID, obj.get(JSONConstants.ARTIFACT_ID), String.class); - final ArtifactId id = ArtifactId.fromMvnId(obj.get(JSONConstants.ARTIFACT_ID).toString()); + final ArtifactId id = ArtifactId.parse(obj.get(JSONConstants.ARTIFACT_ID).toString()); include = new Include(id); if ( obj.containsKey(JSONConstants.INCLUDE_REMOVALS) ) { @@ -191,7 +191,7 @@ public class FeatureJSONReader extends J final List<Object> list = (List<Object>)removalObj.get(JSONConstants.FEATURE_BUNDLES); for(final Object val : list) { checkType("Include removal bundles", val, String.class); - include.getBundleRemovals().add(ArtifactId.fromMvnId(val.toString())); + include.getBundleRemovals().add(ArtifactId.parse(val.toString())); } } if ( removalObj.containsKey(JSONConstants.FEATURE_CONFIGURATIONS) ) { @@ -232,7 +232,7 @@ public class FeatureJSONReader extends J final List<ArtifactId> ids = new ArrayList<>(); for(final Object aid : artifactList) { checkType("Include removal extension artifact", aid, String.class); - ids.add(ArtifactId.fromMvnId(aid.toString())); + ids.add(ArtifactId.parse(aid.toString())); } include.getArtifactExtensionRemovals().put(nameObj.toString(), ids); } else { Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java?rev=1810120&r1=1810119&r2=1810120&view=diff ============================================================================== --- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java (original) +++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java Fri Sep 29 15:10:20 2017 @@ -141,7 +141,7 @@ abstract class JSONReaderBase { final Artifact artifact; checkType(artifactType, entry, Map.class, String.class); if ( entry instanceof String ) { - artifact = new Artifact(ArtifactId.fromMvnId(entry.toString())); + artifact = new Artifact(ArtifactId.parse(entry.toString())); } else { @SuppressWarnings("unchecked") final Map<String, Object> bundleObj = (Map<String, Object>) entry; @@ -149,7 +149,7 @@ abstract class JSONReaderBase { throw new IOException(exceptionPrefix + " " + artifactType + " is missing required artifact id"); } checkType(artifactType + " " + JSONConstants.ARTIFACT_ID, bundleObj.get(JSONConstants.ARTIFACT_ID), String.class); - final ArtifactId id = ArtifactId.fromMvnId(bundleObj.get(JSONConstants.ARTIFACT_ID).toString()); + final ArtifactId id = ArtifactId.parse(bundleObj.get(JSONConstants.ARTIFACT_ID).toString()); artifact = new Artifact(id); for(final Map.Entry<String, Object> metadataEntry : bundleObj.entrySet()) {