Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>

Author: chrisrueger

biz.aQute.bndlib.tests/test/test/ProjectTest.java

@@ -551,12 +551,10 @@ private void stale(Project project, boolean b) throws Exception {
 	}
 
 	/**
-	 * Verify that JarArtifactLifecycleListener plugins are called at the right
-	 * times.
+	 * Verify that JarLifecycleListener plugins are called at the right times.
 	 */
 	@Test
-	public void testJarArtifactLifecycleListenerIntegration() throws Exception {
-		Workspace ws = getWorkspace(IO.getFile("testresources/ws"));
+	public void testJarLifecycleListenerIntegration() throws Exception {
 		Project project = ws.getProject("p-stale");
 		assertNotNull(project);
 
@@ -589,14 +587,13 @@ public void afterWrite(Project p, File outputFile, Jar jar, Map<String, Object>
 	}
 
 	/**
-	 * Verify that WriteContext is passed correctly and allows data exchange.
+	 * Verify that the context map is passed correctly and allows data exchange.
 	 */
 	@Test
 	public void testJarArtifactWriteContextDataExchange() throws Exception {
 		Workspace ws = getWorkspace(IO.getFile("testresources/ws"));
 		Project project = ws.getProject("p-stale");
 
-		AtomicReference<String> beforeData = new AtomicReference<>();
 		AtomicReference<String> afterData = new AtomicReference<>();
 
 		JarLifecycleListener testListener = new JarLifecycleListener() {

biz.aQute.bndlib/src/aQute/bnd/build/Project.java

@@ -2150,7 +2150,7 @@ private void beforeJarWrite(Jar jar, File outputFile, Map<String, Object> contex
 			try {
 				listener.beforeWrite(this, jar, outputFile, context);
 			} catch (Exception e) {
-				logger.debug("Exception in JarArtifactLifecycleListener.beforeJarWrite", e);
+				logger.debug("Exception in JarLifecycleListener.beforeWrite", e);
 			}
 		}
 	}

biz.aQute.bndlib/src/aQute/bnd/service/JarLifecycleListener.java

@@ -53,7 +53,7 @@
  * public class DigestListener implements JarLifecycleListener {
  *
  * 	@Override
- * 	public void beforeJarWrite(Project project, Jar jar, File outputFile, Map<String, Object> context)
+ * 	public void beforeWrite(Project project, Jar jar, File outputFile, Map<String, Object> context)
  * 		throws Exception {
  * 		// Compute digest before the JAR is written to disk
  * 		byte[] digest = jar.getTimelessDigest();
@@ -62,7 +62,7 @@
  * 	}
  *
  * 	@Override
- * 	public void afterJarWrite(Project project, File outputFile, Jar jar, Map<String, Object> context)
+ * 	public void afterWrite(Project project, File outputFile, Jar jar, Map<String, Object> context)
  * 		throws Exception {
  * 		// Retrieve the computed digest
  * 		String digestHex = (String) context.get("digestHex");

bndtools.core/src/bndtools/central/Central.java

@@ -367,7 +367,9 @@ public static void applyRebuildTriggerPolicy(Workspace ws) {
 		BndPreferences prefs = new BndPreferences();
 		String policy = prefs.getRebuildTriggerPolicy();
 		ws.getPlugins(JarLifecycleListener.class)
-			.forEach(p -> ws.removeBasicPlugin(p));
+			.stream()
+			.filter(p -> p instanceof RebuildTriggerPolicyPlugin)
+			.forEach(ws::removeBasicPlugin);
 		ws.addBasicPlugin(new RebuildTriggerPolicyPlugin(policy));
 	}
 

bndtools.core/src/bndtools/central/RebuildTriggerPolicy.java

@@ -37,7 +37,7 @@
  * </ul>
  * <p>
  * The API-based optimization helps prevent rebuild cascades in dependent
- * projects when only internal implementation changes occur. *
+ * projects when only internal implementation changes occur.
  * <h2>Timestamp Preservation Strategy</h2>
  * <p>
  * To avoid unnecessary cascade rebuilds when only non-API changes occur, this

bndtools.core/src/bndtools/explorer/BndtoolsExplorer.java

@@ -498,11 +498,14 @@ public void run() {
 				rebuildPolicyAction.setText("Rebuild: Optimized");
 				rebuildPolicyAction.setToolTipText(
 					"Rebuild Trigger Policy: API-based rebuild optimization enabled - non-API changes just rebuild the current project and won't trigger cascades");
+				rebuildPolicyAction.setImageDescriptor(null);
 			} else if (REBUILDTRIGGERPOLICY_ALWAYS.equals(policy)) {
 				rebuildPolicyAction.setText("Rebuild: Always");
 				rebuildPolicyAction.setToolTipText("Rebuild Trigger Policy: All changes trigger downstream rebuilds");
+				rebuildPolicyAction.setImageDescriptor(null);
 			} else {
 				rebuildPolicyAction.setText("Rebuild: Unknown");
+				rebuildPolicyAction.setToolTipText("Rebuild Trigger Policy: Unknown value '" + policy + "'");
 				rebuildPolicyAction.setImageDescriptor(Icons.desc("errors"));
 			}
 			toolBarManager.update(true);

bndtools.core/src/bndtools/preferences/BndPreferences.java

@@ -339,9 +339,7 @@ public boolean isParallel() {
 	/**
 	 * Returns the stored rebuild trigger policy preference.
 	 *
-	 * @return the stored policy string, or an empty string if the Default option is selected (meaning
-	 *         the value from {@code build.bnd} should be used without Eclipse overriding it).
-	 */
+	 * @return the stored policy string; defaults to {@code "always"}.
 	public String getRebuildTriggerPolicy() {
 		return store.getString(PREF_REBUILD_TRIGGER_POLICY);
 	}
@@ -355,10 +353,8 @@ public String getRebuildTriggerPolicy() {
 	 *            value is stored as-is but treated as {@code "always"} by the
 	 *            build infrastructure.
 	 */
-	public void setRebuildTriggerPolicy(String policy) {
-		store.setValue(PREF_REBUILD_TRIGGER_POLICY,
-			policy == null ? REBUILDTRIGGERPOLICY_ALWAYS : policy);
-	}
+		String normalized = "api".equals(policy) ? policy : REBUILDTRIGGERPOLICY_ALWAYS;
+		store.setValue(PREF_REBUILD_TRIGGER_POLICY, normalized);
 
 	public Closeable onString(String key, Consumer<String> listener) {
 		IPropertyChangeListener l = e -> {

bndtools.core/src/bndtools/preferences/ui/BndBuildPreferencePage.java

@@ -91,7 +91,7 @@ protected Control createContents(Composite parent) {
 			+ "Limitations: If you have a jar dependency on the path that you are pulling classes into your bundle \n"
 			+ "e.g. via -includepackage or -conditionalpackage, these need to be rebuilt \n"
 			+ "even if the public API of the dependency hasn't changed.\n"
-			+ "This policy not work well in such cases.");
+			+ "This policy does not work well in such cases.");
 		lblOptimizedDesc.setForeground(composite.getDisplay()
 			.getSystemColor(SWT.COLOR_DARK_GRAY));
 		descData = new GridData(SWT.FILL, SWT.CENTER, true, false);

bndtools.core/test/bndtools/tasks/RebuildTriggerTest.java

@@ -132,22 +132,12 @@ private static File getDigestFile(File jarFile) {
 		}
 
 		/**
-		 * Check that the JAR timestamp is preserved when the content changes
-		 * Verify that the JAR's timestamp is preserved when the JAR content
-		 * changes but the exported API surface remains identical. The
-		 * optimization works by comparing a stored API-digest sidecar file
-		 * with the newly computed API digest during build. When they match,
-		 * the old file timestamp is kept so that downstream timestamp-based
-		 * staleness checks don't trigger unnecessary cascade rebuilds.
-		 * <p>
-		 * Since the p-stale test project is {@code -resourceonly} (no
-		 * exported packages), this test simulates the mechanism directly:
-		 * we write a known API digest, change the project content so the
-		 * full content digest changes, and verify that timestamp
-		 * preservation still engages via the API digest fallback.
+		 * Verify that timestamp preservation does not engage when the JAR content
+		 * changes and an API digest cannot be computed (e.g. a resource-only bundle
+		 * with no Export-Package).
 		 */
 		@Test
-		public void testApiDigestPreservesTimestampWhenApiUnchanged() throws Exception {
+		public void testTimestampNotPreservedWhenApiDigestMissing() throws Exception {
 			Workspace ws = getWorkspace(IO.getFile("testdata/ws"));
 			ws.addBasicPlugin(new RebuildTriggerPolicyPlugin(RebuildTriggerPolicy.REBUILDTRIGGERPOLICY_API));
 			Project project = ws.getProject("p-stale");

docs/_plugins/00-overview.md

@@ -66,7 +66,6 @@ Your plugin needs to implement an interface which is used in the bnd codebase. F
 ### Error Handling
 
 Most plugins follow a pattern where exceptions are logged but do not stop the build. Consult the specific plugin documentation for error behavior.
-```
 
 ## Tagging of repository plugins