Clean AnnotatedOpDependencyMember

gselzer · ctrueden · commit 709c0222d16b · 2022-07-01T16:46:00.000-05:00
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java
@@ -45,20 +45,32 @@ public abstract class AnnotatedOpDependencyMember<T> implements
 {
 
 	private final Supplier<String> keyGenerator;
+	private String key;
+	private boolean keyGenerated;
+
 	private final Supplier<String> descriptionGenerator;
+	private String description;
+	private boolean descriptionGenerated;
+
 	private final Type type;
 	private final OpDependency annotation;
 
-	public AnnotatedOpDependencyMember(String key, Type type,
-		final OpDependency annotation)
-	{
-		this(key, "", type, annotation);
-	}
-
+	/**
+	 * This constructor is ideal for situations where the key and description are readily available
+	 *
+	 * @param key the key
+	 * @param description the description
+	 * @param type the {@link Type} of this {@link Member}
+	 * @param annotation the {@link OpDependency} annotation
+	 */
 	public AnnotatedOpDependencyMember(String key, String description, Type type,
 		final OpDependency annotation)
 	{
 		this(() -> key, () -> description, type, annotation);
+		this.key = key;
+		this.keyGenerated = true;
+		this.description = description;
+		this.descriptionGenerated = true;
 	}
 
 	/**
@@ -68,13 +80,15 @@ public AnnotatedOpDependencyMember(String key, String description, Type type,
 	 * @param keyGenerator the {@link Supplier} able to generate the key
 	 * @param descriptionGenerator the {@link Supplier} able to generate the description
 	 * @param type the {@link Type} of this {@link Member}
-	 * @param annotation
+	 * @param annotation the {@link OpDependency} annotation
 	 */
 	public AnnotatedOpDependencyMember(Supplier<String> keyGenerator, Supplier<String> descriptionGenerator, Type type,
 		final OpDependency annotation)
 	{
 		this.keyGenerator = keyGenerator;
+		this.keyGenerated = false;
 		this.descriptionGenerator = descriptionGenerator;
+		this.descriptionGenerated = false;
 		this.type = type;
 		this.annotation = annotation;
 	}
@@ -99,16 +113,31 @@ public boolean isAdaptable() {
 
 	@Override
 	public String getKey() {
-		return keyGenerator.get();
+		if (!keyGenerated) generateKey();
+		return key;
+	}
+
+	private synchronized void generateKey() {
+		if (keyGenerated) return;
+		key = keyGenerator.get();
+		keyGenerated = true;
 	}
 
 	@Override
 	public String getDescription() {
-		return descriptionGenerator.get();
+		if (!descriptionGenerated) generateDescription();
+		return description;
+	}
+
+	private synchronized void generateDescription() {
+		if (descriptionGenerated) return;
+		description = descriptionGenerator.get();
+		descriptionGenerated = true;
 	}
 
 	@Override
 	public Type getType() {
 		return type;
 	}
 }
+
