Merge pull request #7 from PatchworkMC/fix/various

Checked exceptions in access transformer remapping

Author: coderbot16

src/main/java/net/patchworkmc/manifest/accesstransformer/AccessTransformerEntry.java

@@ -3,6 +3,8 @@
 import java.util.Objects;
 
 import net.patchworkmc.manifest.accesstransformer.v2.ForgeAccessTransformer;
+import net.patchworkmc.manifest.accesstransformer.v2.exception.FatalRemappingException;
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
 import net.patchworkmc.manifest.api.Remapper;
 
 /**
@@ -30,18 +32,22 @@ public AccessTransformerEntry(String className, String memberName) {
 	}
 
 	public AccessTransformerEntry remap(Remapper remapper) {
-		String mappedMemberName;
-
-		if (this.isField) {
-			mappedMemberName = remapper.remapFieldName(this.className, this.memberName, "");
-		} else {
-			mappedMemberName = remapper.remapMethodName(this.className, this.memberName, this.descriptor);
-			this.descriptor = remapper.remapMemberDescription(descriptor);
+		try {
+			String mappedMemberName;
+
+			if (this.isField) {
+				mappedMemberName = remapper.remapFieldName(this.className, this.memberName, "");
+			} else {
+				mappedMemberName = remapper.remapMethodName(this.className, this.memberName, this.descriptor);
+				this.descriptor = remapper.remapMemberDescription(descriptor);
+			}
+
+			this.className = remapper.remapClassName(this.className);
+			this.memberName = mappedMemberName;
+			return this;
+		} catch (MissingMappingException ex) {
+			throw new FatalRemappingException(ex);
 		}
-
-		this.className = remapper.remapClassName(this.className);
-		this.memberName = mappedMemberName;
-		return this;
 	}
 
 	public String getClassName() {

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/ForgeAccessTransformer.java

@@ -7,7 +7,9 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.AccessLevel;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.Finalization;
 import net.patchworkmc.manifest.api.Remapper;
@@ -27,11 +29,15 @@ public ForgeAccessTransformer(Set<TransformedClass> classes) {
 	/**
 	 * Remaps everything in this AT representation, down to the fields and methods.
 	 */
-	public void remap(Remapper remapper) {
+	public void remap(Remapper remapper, Consumer<MissingMappingException> errorLogger) {
 		Set<TransformedClass> remappedClasses = new HashSet<>();
 
 		for (TransformedClass transformedClass : this.classes) {
-			remappedClasses.add(transformedClass.remap(remapper));
+			try {
+				remappedClasses.add(transformedClass.remap(remapper, errorLogger));
+			} catch (MissingMappingException ex) {
+				errorLogger.accept(ex);
+			}
 		}
 
 		this.classes = remappedClasses;

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/Transformed.java

@@ -1,5 +1,6 @@
 package net.patchworkmc.manifest.accesstransformer.v2;
 
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.AccessLevel;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.Finalization;
 import net.patchworkmc.manifest.api.Remapper;
@@ -15,7 +16,7 @@ public Transformed(String name, AccessLevel accessLevel, Finalization finalizati
 		this.finalization = finalization;
 	}
 
-	public abstract Transformed remap(Remapper remapper);
+	public abstract Transformed remap(Remapper remapper) throws MissingMappingException;
 
 	public AccessLevel getAccessLevel() {
 		return accessLevel;

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/TransformedClass.java

@@ -1,11 +1,14 @@
 package net.patchworkmc.manifest.accesstransformer.v2;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.AccessLevel;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.Finalization;
 import net.patchworkmc.manifest.api.Remapper;
@@ -42,23 +45,48 @@ public Set<TransformedMethod> getMethods() {
 		return Collections.unmodifiableSet(methods);
 	}
 
-	@Override
-	public TransformedClass remap(Remapper remapper) {
+	public TransformedClass remap(Remapper remapper, Consumer<MissingMappingException> errorLogger) throws MissingMappingException {
 		String remappedName = remapper.remapClassName(getName());
 		Set<TransformedField> remappedFields = new HashSet<>();
 		Set<TransformedMethod> remappedMethods = new HashSet<>();
 
 		for (TransformedField field : this.getFields()) {
-			remappedFields.add(field.remap(remapper));
+			try {
+				remappedFields.add(field.remap(remapper));
+			} catch (MissingMappingException ex) {
+				errorLogger.accept(ex);
+			}
 		}
 
 		for (TransformedMethod method : getMethods()) {
-			remappedMethods.add(method.remap(remapper));
+			try {
+				remappedMethods.add(method.remap(remapper));
+			} catch (MissingMappingException ex) {
+				errorLogger.accept(ex);
+			}
 		}
 
 		return new TransformedClass(remappedName, getFinalization(), getAccessLevel(), remappedFields, remappedMethods, fieldWildcard, methodWildcard);
 	}
 
+	/**
+	 * @deprecated Use {@link TransformedClass#remap(Remapper, Consumer)} instead.
+	 */
+	@Override
+	@Deprecated
+	public TransformedClass remap(Remapper remapper) throws MissingMappingException {
+		ArrayList<MissingMappingException> suppressedExceptions = new ArrayList<>();
+		TransformedClass result = remap(remapper, suppressedExceptions::add);
+
+		if (!suppressedExceptions.isEmpty()) {
+			MissingMappingException ex = new MissingMappingException("Failed to remap some members for class!");
+			suppressedExceptions.forEach(ex::addSuppressed);
+			throw ex;
+		}
+
+		return result;
+	}
+
 	@Nullable
 	public TransformedWildcardMember getFieldWildcard() {
 		return fieldWildcard;

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/TransformedField.java

@@ -1,5 +1,6 @@
 package net.patchworkmc.manifest.accesstransformer.v2;
 
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.AccessLevel;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.Finalization;
 import net.patchworkmc.manifest.api.Remapper;
@@ -10,7 +11,7 @@ public TransformedField(String owner, String name, AccessLevel accessLevel, Fina
 	}
 
 	@Override
-	public TransformedField remap(Remapper remapper) {
+	public TransformedField remap(Remapper remapper) throws MissingMappingException {
 		return new TransformedField(remapper.remapClassName(getOwner()), remapper.remapFieldName(getOwner(), getName()), getAccessLevel(), getFinalization());
 	}
 }

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/TransformedMethod.java

@@ -1,5 +1,6 @@
 package net.patchworkmc.manifest.accesstransformer.v2;
 
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.AccessLevel;
 import net.patchworkmc.manifest.accesstransformer.v2.flags.Finalization;
 import net.patchworkmc.manifest.api.Remapper;
@@ -12,7 +13,7 @@ public TransformedMethod(String owner, String name, String descriptor, AccessLev
 	}
 
 	@Override
-	public TransformedMethod remap(Remapper remapper) {
+	public TransformedMethod remap(Remapper remapper) throws MissingMappingException {
 		return new TransformedMethod(remapper.remapClassName(getOwner()), remapper.remapMethodName(getOwner(), getName(), getDescriptor()),
 						remapper.remapMemberDescription(getDescriptor()), getAccessLevel(), getFinalization());
 	}

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/exception/FatalRemappingException.java

@@ -0,0 +1,11 @@
+package net.patchworkmc.manifest.accesstransformer.v2.exception;
+
+public class FatalRemappingException extends RuntimeException {
+	public FatalRemappingException(String message, Exception parent) {
+		super(message, parent);
+	}
+
+	public FatalRemappingException(Exception parent) {
+		super(parent);
+	}
+}

src/main/java/net/patchworkmc/manifest/accesstransformer/v2/exception/MissingMappingException.java

@@ -0,0 +1,11 @@
+package net.patchworkmc.manifest.accesstransformer.v2.exception;
+
+public class MissingMappingException extends Exception {
+	public MissingMappingException(String message) {
+		super(message);
+	}
+
+	public MissingMappingException(String message, Exception parent) {
+		super(message, parent);
+	}
+}

src/main/java/net/patchworkmc/manifest/api/Remapper.java

@@ -1,15 +1,17 @@
 package net.patchworkmc.manifest.api;
 
+import net.patchworkmc.manifest.accesstransformer.v2.exception.MissingMappingException;
+
 public interface Remapper {
-	String remapMemberDescription(String descriptor);
+	String remapMemberDescription(String descriptor) throws MissingMappingException;
 
-	default String remapFieldName(String owner, String name) {
+	default String remapFieldName(String owner, String name) throws MissingMappingException {
 		return remapFieldName(owner, name, "");
 	}
 
-	String remapFieldName(String owner, String name, String descriptor);
+	String remapFieldName(String owner, String name, String descriptor) throws MissingMappingException;
 
-	String remapMethodName(String owner, String name, String descriptor);
+	String remapMethodName(String owner, String name, String descriptor) throws MissingMappingException;
 
-	String remapClassName(String name);
+	String remapClassName(String name) throws MissingMappingException;
 }