resource: Add addResource method to ResourceBuilder

Signed-off-by: BJ Hargrave <bj@hargrave.dev>
bndtools · Sep 23, 2022 · 6cd8742 · 6cd8742
1 parent f8736e7
commit 6cd8742
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
@@ -73,13 +73,19 @@ public class ResourceBuilder {
 
 	private boolean								built			= false;
 
+	public ResourceBuilder() {}
+
 	public ResourceBuilder(Resource source) {
+		this();
+		addResource(source);
+	}
+
+	public ResourceBuilder addResource(Resource source) {
 		addCapabilities(source.getCapabilities(null));
 		addRequirements(source.getRequirements(null));
+		return this;
 	}
 
-	public ResourceBuilder() {}
-
 	public ResourceBuilder addCapability(Capability capability) {
 		CapReqBuilder builder = CapReqBuilder.clone(capability);
 		return addCapability(builder);
@@ -833,6 +839,11 @@ public Resource build() {
 			return null;
 		}
 
+		@Override
+		public ResourceBuilder addResource(Resource source) {
+			return ResourceBuilder.this.addResource(source);
+		}
+
 		@Override
 		public ResourceBuilder addCapability(Capability capability) {
 			return ResourceBuilder.this.addCapability(capability);

diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/package-info.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/package-info.java
@@ -1,4 +1,4 @@
-@Version("4.2.0")
+@Version("4.3.0")
 package aQute.bnd.osgi.resource;
 
 import org.osgi.annotation.versioning.Version;