You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2020/04/14 12:08:32 UTC
[sling-whiteboard] branch master updated: Rename ArtifactID to ID
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 82c8855 Rename ArtifactID to ID
82c8855 is described below
commit 82c8855c90a566ba40c664a9bf61faf7afd0e3c6
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Apr 14 13:08:18 2020 +0100
Rename ArtifactID to ID
---
.../main/java/org/osgi/util/features/Artifact.java | 2 +-
.../org/osgi/util/features/BuilderFactory.java | 4 ++--
.../java/org/osgi/util/features/Extension.java | 2 +-
.../org/osgi/util/features/ExtensionBuilder.java | 2 +-
.../org/osgi/util/features/FeatureService.java | 2 +-
.../util/features/{ArtifactID.java => ID.java} | 14 ++++++-------
.../org/osgi/util/features/impl/ArtifactImpl.java | 8 ++++----
.../util/features/impl/BuilderFactoryImpl.java | 6 +++---
.../osgi/util/features/impl/BundleBuilderImpl.java | 8 ++++----
.../util/features/impl/ExtensionBuilderImpl.java | 10 ++++-----
.../util/features/impl/FeatureBuilderImpl.java | 8 ++++----
.../util/features/impl/FeatureServiceImpl.java | 14 ++++++-------
.../util/features/impl/FeatureServiceImplTest.java | 24 +++++++++++-----------
13 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java
index 33c3c34..f91a0cf 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Artifact.java
@@ -24,5 +24,5 @@ public interface Artifact {
* Get the artifact's ID.
* @return The ID of this artifact.
*/
- ArtifactID getID();
+ ID getID();
}
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java
index bb46808..4a464bc 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/BuilderFactory.java
@@ -25,7 +25,7 @@ public interface BuilderFactory {
* @param id The artifact ID for the bundle object being built.
* @return The builder.
*/
- BundleBuilder newBundleBuilder(ArtifactID id);
+ BundleBuilder newBundleBuilder(ID id);
/**
* Obtain a new builder for Configuration objects.
@@ -48,7 +48,7 @@ public interface BuilderFactory {
* @param id The artifact ID for the feature object being built.
* @return The builder.
*/
- FeatureBuilder newFeatureBuilder(ArtifactID id);
+ FeatureBuilder newFeatureBuilder(ID id);
/**
* Obtain a new builder for Feature objects.
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java
index 9f74dab..737c3f1 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/Extension.java
@@ -69,5 +69,5 @@ public interface Extension {
* Get the Artifacts from this extension.
* @return The Artifacts, or {@code null} if this is not an Artifacts extension.
*/
- List<ArtifactID> getArtifacts();
+ List<ID> getArtifacts();
}
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java
index b86ce35..f7eb096 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/ExtensionBuilder.java
@@ -44,7 +44,7 @@ public interface ExtensionBuilder {
* @param aid The ArtifactID of the artifact to add.
* @return This builder.
*/
- ExtensionBuilder addArtifact(ArtifactID aid);
+ ExtensionBuilder addArtifact(ID aid);
/**
* Add an Artifact to the extension. Can only be called for extensions of type
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java
index 2953e25..aa4baf4 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/FeatureService.java
@@ -55,5 +55,5 @@ public interface FeatureService {
* @param ctx The merge context to use for the merge operation.
* @return The merged feature.
*/
- Feature mergeFeatures(ArtifactID targetID, Feature f1, Feature f2, MergeContext ctx);
+ Feature mergeFeatures(ID targetID, Feature f1, Feature f2, MergeContext ctx);
}
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/ArtifactID.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/ID.java
similarity index 90%
rename from osgi-featuremodel/src/main/java/org/osgi/util/features/ArtifactID.java
rename to osgi-featuremodel/src/main/java/org/osgi/util/features/ID.java
index 79e22bf..02039f1 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/ArtifactID.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/ID.java
@@ -32,7 +32,7 @@ import java.util.Objects;
* </ul>
* @ThreadSafe
*/
-public class ArtifactID {
+public class ID {
private final String groupId;
private final String artifactId;
private final String version; // The Artifact Version may not follow OSGi version rules
@@ -46,7 +46,7 @@ public class ArtifactID {
* @param mavenID
* @return
*/
- public static ArtifactID fromMavenID(String mavenID) {
+ public static ID fromMavenID(String mavenID) {
String[] parts = mavenID.split(":");
if (parts.length < 3 && parts.length > 5)
@@ -58,7 +58,7 @@ public class ArtifactID {
String t = parts.length > 3 ? parts[3] : null;
String c = parts.length > 4 ? parts[4] : null;
- return new ArtifactID(gid, aid, ver, t, c);
+ return new ID(gid, aid, ver, t, c);
}
/**
@@ -67,7 +67,7 @@ public class ArtifactID {
* @param artifactId The artifact ID.
* @param version The version.
*/
- public ArtifactID(String groupId, String artifactId, String version) {
+ public ID(String groupId, String artifactId, String version) {
this(groupId, artifactId, version, null, null);
}
@@ -79,7 +79,7 @@ public class ArtifactID {
* @param type The type identifier.
* @param classifier The classifier.
*/
- public ArtifactID(String groupId, String artifactId, String version, String type, String classifier) {
+ public ID(String groupId, String artifactId, String version, String type, String classifier) {
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
@@ -136,9 +136,9 @@ public class ArtifactID {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (!(obj instanceof ArtifactID))
+ if (!(obj instanceof ID))
return false;
- ArtifactID other = (ArtifactID) obj;
+ ID other = (ID) obj;
return Objects.equals(artifactId, other.artifactId) && Objects.equals(classifier, other.classifier)
&& Objects.equals(groupId, other.groupId) && Objects.equals(type, other.type)
&& Objects.equals(version, other.version);
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java
index c258702..b85486f 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ArtifactImpl.java
@@ -17,19 +17,19 @@
package org.osgi.util.features.impl;
import org.osgi.util.features.Artifact;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import java.util.Objects;
class ArtifactImpl implements Artifact {
- private final ArtifactID id;
+ private final ID id;
- ArtifactImpl(ArtifactID id) {
+ ArtifactImpl(ID id) {
this.id = id;
}
@Override
- public ArtifactID getID() {
+ public ID getID() {
return id;
}
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java
index e4f917e..5494bf1 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BuilderFactoryImpl.java
@@ -16,7 +16,7 @@
*/
package org.osgi.util.features.impl;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import org.osgi.util.features.BuilderFactory;
import org.osgi.util.features.BundleBuilder;
import org.osgi.util.features.ConfigurationBuilder;
@@ -28,7 +28,7 @@ import org.osgi.util.features.Extension.Type;
class BuilderFactoryImpl implements BuilderFactory {
@Override
- public BundleBuilder newBundleBuilder(ArtifactID id) {
+ public BundleBuilder newBundleBuilder(ID id) {
return new BundleBuilderImpl(id);
}
@@ -43,7 +43,7 @@ class BuilderFactoryImpl implements BuilderFactory {
}
@Override
- public FeatureBuilder newFeatureBuilder(ArtifactID id) {
+ public FeatureBuilder newFeatureBuilder(ID id) {
return new FeatureBuilderImpl(id);
}
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java
index ed8cef3..bd3903c 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/BundleBuilderImpl.java
@@ -16,7 +16,7 @@
*/
package org.osgi.util.features.impl;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import org.osgi.util.features.Bundle;
import org.osgi.util.features.BundleBuilder;
@@ -26,11 +26,11 @@ import java.util.Map;
import java.util.Objects;
class BundleBuilderImpl implements BundleBuilder {
- private final ArtifactID id;
+ private final ID id;
private final Map<String,Object> metadata = new HashMap<>();
- BundleBuilderImpl(ArtifactID id) {
+ BundleBuilderImpl(ID id) {
this.id = id;
}
@@ -54,7 +54,7 @@ class BundleBuilderImpl implements BundleBuilder {
private static class BundleImpl extends ArtifactImpl implements Bundle {
private final Map<String, Object> metadata;
- private BundleImpl(ArtifactID id, Map<String, Object> metadata) {
+ private BundleImpl(ID id, Map<String, Object> metadata) {
super(id);
this.metadata = Collections.unmodifiableMap(metadata);
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java
index a32760d..0e83694 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/ExtensionBuilderImpl.java
@@ -16,7 +16,7 @@
*/
package org.osgi.util.features.impl;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import org.osgi.util.features.Extension;
import org.osgi.util.features.ExtensionBuilder;
import org.osgi.util.features.Extension.Kind;
@@ -62,7 +62,7 @@ class ExtensionBuilderImpl implements ExtensionBuilder {
}
@Override
- public ExtensionBuilder addArtifact(ArtifactID aid) {
+ public ExtensionBuilder addArtifact(ID aid) {
addArtifact(aid.getGroupId(), aid.getArtifactId(), aid.getVersion(), aid.getType(), aid.getClassifier());
return this;
}
@@ -139,14 +139,14 @@ class ExtensionBuilderImpl implements ExtensionBuilder {
return content;
}
- public List<ArtifactID> getArtifacts() {
+ public List<ID> getArtifacts() {
BufferedReader r = new BufferedReader(new StringReader(content));
- List<ArtifactID> res = new ArrayList<>();
+ List<ID> res = new ArrayList<>();
String line = null;
try {
while ((line = r.readLine()) != null) {
- res.add(ArtifactID.fromMavenID(line));
+ res.add(ID.fromMavenID(line));
}
} catch (IOException e) {
// ignore
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java
index d4bce20..3d75475 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureBuilderImpl.java
@@ -16,7 +16,7 @@
*/
package org.osgi.util.features.impl;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import org.osgi.util.features.Bundle;
import org.osgi.util.features.Configuration;
import org.osgi.util.features.Extension;
@@ -32,7 +32,7 @@ import java.util.Map;
import java.util.Objects;
class FeatureBuilderImpl implements FeatureBuilder {
- private final ArtifactID id;
+ private final ID id;
private String title;
private String description;
@@ -47,7 +47,7 @@ class FeatureBuilderImpl implements FeatureBuilder {
private final Map<String,Extension> extensions = new HashMap<>();
private final Map<String,String> variables = new HashMap<>();
- FeatureBuilderImpl(ArtifactID id) {
+ FeatureBuilderImpl(ID id) {
this.id = id;
}
@@ -148,7 +148,7 @@ class FeatureBuilderImpl implements FeatureBuilder {
private final Map<String,Extension> extensions;
private final Map<String,String> variables;
- private FeatureImpl(ArtifactID id, String aTitle, String desc, String vnd, String lic, String loc,
+ private FeatureImpl(ID id, String aTitle, String desc, String vnd, String lic, String loc,
boolean comp, boolean fin, List<Bundle> bs, Map<String,Configuration> cs,
Map<String,Extension> es, Map<String,String> vars) {
super(id);
diff --git a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java
index 63168fd..7eb571e 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/util/features/impl/FeatureServiceImpl.java
@@ -16,7 +16,7 @@
*/
package org.osgi.util.features.impl;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import org.osgi.util.features.BuilderFactory;
import org.osgi.util.features.Bundle;
import org.osgi.util.features.BundleBuilder;
@@ -58,7 +58,7 @@ class FeatureServiceImpl implements FeatureService {
JsonObject json = Json.createReader(jsonReader).readObject();
String id = json.getString("id");
- FeatureBuilder builder = builderFactory.newFeatureBuilder(ArtifactID.fromMavenID(id));
+ FeatureBuilder builder = builderFactory.newFeatureBuilder(ID.fromMavenID(id));
builder.setTitle(json.getString("title", null));
builder.setDescription(json.getString("description", null));
@@ -87,7 +87,7 @@ class FeatureServiceImpl implements FeatureService {
if (val.getValueType() == JsonValue.ValueType.OBJECT) {
JsonObject jo = val.asJsonObject();
String bid = jo.getString("id");
- BundleBuilder builder = builderFactory.newBundleBuilder(ArtifactID.fromMavenID(bid));
+ BundleBuilder builder = builderFactory.newBundleBuilder(ID.fromMavenID(bid));
for (Map.Entry<String, JsonValue> entry : jo.entrySet()) {
if (entry.getKey().equals("id"))
@@ -203,7 +203,7 @@ class FeatureServiceImpl implements FeatureService {
for (JsonValue jv : ja2) {
if (jv.getValueType() == JsonValue.ValueType.STRING) {
String id = ((JsonString) jv).getString();
- builder.addArtifact(ArtifactID.fromMavenID(id));
+ builder.addArtifact(ID.fromMavenID(id));
}
}
break;
@@ -224,7 +224,7 @@ class FeatureServiceImpl implements FeatureService {
}
@Override
- public Feature mergeFeatures(ArtifactID targetID, Feature f1, Feature f2, MergeContext ctx) {
+ public Feature mergeFeatures(ID targetID, Feature f1, Feature f2, MergeContext ctx) {
FeatureBuilder fb = builderFactory.newFeatureBuilder(targetID);
copyAttrs(f1, fb);
@@ -242,11 +242,11 @@ class FeatureServiceImpl implements FeatureService {
List<Bundle> addedBundles = new ArrayList<>();
for (Bundle b : f2.getBundles()) {
- ArtifactID bID = b.getID();
+ ID bID = b.getID();
boolean found = false;
for (Iterator<Bundle> it = bundles.iterator(); it.hasNext(); ) {
Bundle orgb = it.next();
- ArtifactID orgID = orgb.getID();
+ ID orgID = orgb.getID();
if (bID.getGroupId().equals(orgID.getGroupId()) &&
bID.getArtifactId().equals(orgID.getArtifactId())) {
diff --git a/osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java b/osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java
index ea87787..bac8140 100644
--- a/osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java
+++ b/osgi-featuremodel/src/test/java/org/osgi/util/features/impl/FeatureServiceImplTest.java
@@ -17,7 +17,7 @@
package org.osgi.util.features.impl;
import org.junit.Test;
-import org.osgi.util.features.ArtifactID;
+import org.osgi.util.features.ID;
import org.osgi.util.features.BuilderFactory;
import org.osgi.util.features.Bundle;
import org.osgi.util.features.Configuration;
@@ -59,7 +59,7 @@ public class FeatureServiceImplTest {
List<Bundle> bundles = f.getBundles();
assertEquals(3, bundles.size());
- Bundle bundle = bf.newBundleBuilder(new ArtifactID("org.osgi", "osgi.promise", "7.0.1"))
+ Bundle bundle = bf.newBundleBuilder(new ID("org.osgi", "osgi.promise", "7.0.1"))
.addMetadata("hash", "4632463464363646436")
.addMetadata("start-order", 1L)
.build();
@@ -68,8 +68,8 @@ public class FeatureServiceImplTest {
ba.equals(bundle);
assertTrue(bundles.contains(bundle));
- assertTrue(bundles.contains(bf.newBundleBuilder(new ArtifactID("org.slf4j", "slf4j-api", "1.7.29")).build()));
- assertTrue(bundles.contains(bf.newBundleBuilder(new ArtifactID("org.slf4j", "slf4j-simple", "1.7.29")).build()));
+ assertTrue(bundles.contains(bf.newBundleBuilder(new ID("org.slf4j", "slf4j-api", "1.7.29")).build()));
+ assertTrue(bundles.contains(bf.newBundleBuilder(new ID("org.slf4j", "slf4j-simple", "1.7.29")).build()));
}
}
@@ -97,16 +97,16 @@ public class FeatureServiceImplTest {
.build();
- ArtifactID tid = new ArtifactID("foo", "bar", "1.2.3");
+ ID tid = new ID("foo", "bar", "1.2.3");
Feature f3 = fs.mergeFeatures(tid, f1, f2, ctx);
assertEquals(tid, f3.getID());
List<Bundle> bundles = f3.getBundles();
assertEquals(5, bundles.size());
- assertTrue(bundles.contains(bf.newBundleBuilder(new ArtifactID("org.slf4j", "slf4j-api", "1.7.29")).build()));
- assertTrue(bundles.contains(bf.newBundleBuilder(new ArtifactID("org.slf4j", "slf4j-api", "1.7.30")).build()));
- assertTrue(bundles.contains(bf.newBundleBuilder(new ArtifactID("org.slf4j", "slf4j-nop", "1.7.30")).build()));
+ assertTrue(bundles.contains(bf.newBundleBuilder(new ID("org.slf4j", "slf4j-api", "1.7.29")).build()));
+ assertTrue(bundles.contains(bf.newBundleBuilder(new ID("org.slf4j", "slf4j-api", "1.7.30")).build()));
+ assertTrue(bundles.contains(bf.newBundleBuilder(new ID("org.slf4j", "slf4j-nop", "1.7.30")).build()));
Map<String, Configuration> configs = f3.getConfigurations();
assertEquals(2, configs.size());
@@ -151,7 +151,7 @@ public class FeatureServiceImplTest {
.build())
.build();
- ArtifactID tid = new ArtifactID("g", "a", "1.2.3");
+ ID tid = new ID("g", "a", "1.2.3");
Feature f3 = fs.mergeFeatures(tid, f1, f2, ctx);
Map<String, Extension> extensions = f3.getExtensions();
@@ -164,10 +164,10 @@ public class FeatureServiceImplTest {
Extension artEx = extensions.get("my-art-ex");
assertEquals(Extension.Kind.MANDATORY, artEx.getKind());
assertEquals(Extension.Type.ARTIFACTS, artEx.getType());
- List<ArtifactID> artifacts = artEx.getArtifacts();
+ List<ID> artifacts = artEx.getArtifacts();
assertEquals(2, artifacts.size());
- assertTrue(artifacts.contains(new ArtifactID("g", "a", "1")));
- assertTrue(artifacts.contains(new ArtifactID("g", "a", "2")));
+ assertTrue(artifacts.contains(new ID("g", "a", "1")));
+ assertTrue(artifacts.contains(new ID("g", "a", "2")));
Extension jsonEx = extensions.get("my-json-ex");
assertEquals(Extension.Kind.TRANSIENT, jsonEx.getKind());