Merge pull request #6442 from chrisrueger/fix-some-spotbugs-findings

Fix some spotbugs findings
bndtools · Jan 24, 2025 · 43d9fe8 · 43d9fe8
2 parents 29b8483 + 031ed24
commit 43d9fe8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/aQute.libg/src/aQute/libg/re/Catalog.java b/aQute.libg/src/aQute/libg/re/Catalog.java
@@ -1160,7 +1160,7 @@ public Optional<MatchGroup> group(String name) {
 						}
 						String value = matcher.group(name);
 						if (value == null) {
-							Optional.empty();
+							return Optional.empty();
 						}
 						return Optional.of(new MatchGroupImpl(name, value));
 					}

diff --git a/aQute.libg/src/aQute/libg/remote/sink/RemoteSink.java b/aQute.libg/src/aQute/libg/remote/sink/RemoteSink.java
@@ -204,7 +204,6 @@ public Welcome getWelcome(int highest) {
 
 	@Override
 	public AreaImpl createArea(String areaId) throws Exception {
-		AreaImpl area = new AreaImpl();
 		if (areaId == null) {
 			int n = 1000;
 			while (!new File(areasDir, "" + n).isDirectory())

diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java b/biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java
@@ -280,7 +280,6 @@ public static SortedSet<EE> getEEsFromRequirement(String requirement) {
 		Parameters reqs = new Parameters(requirement);
 		SortedSet<EE> result = new TreeSet<>();
 		FilterParser fp = new FilterParser();
-		SortedSet<EE> all = all();
 
 		for (Map.Entry<String, Attrs> e : reqs.entrySet()) {
 			Attrs attrs = reqs.get(ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE);

diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/clauses/ImportPattern.java b/biz.aQute.bndlib/src/aQute/bnd/build/model/clauses/ImportPattern.java
@@ -28,7 +28,6 @@ public ImportPattern clone() {
 	}
 
 	public static ImportPattern error(String msg) {
-		Attrs a = new Attrs();
 		return new ImportPattern(msg, null);
 	}
 

diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Processor.java
@@ -2671,7 +2671,7 @@ public boolean isPropertySet(Set<String> keys) {
 		return false;
 	}
 
-	class Bracket {
+	static class Bracket {
 		final List<RunnableWithException>	atEnds	= new ArrayList<>();
 		final Map<Class<?>, Object>			data	= new HashMap<>();
 

diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -525,7 +524,6 @@ public RequirementBuilder getNativeCode(String header) {
 			return null;
 
 		boolean optional = false;
-		List<String> options = new LinkedList<>();
 
 		RequirementBuilder rb = new RequirementBuilder(NativeNamespace.NATIVE_NAMESPACE);
 		FilterBuilder sb = new FilterBuilder();
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ public ImportPattern clone() { @@
     	}
     	public static ImportPattern error(String msg) {
-    		Attrs a = new Attrs();
     		return new ImportPattern(msg, null);
     	}
@@ Expand Down @@