From 3961a7cbf8c888f7a950cfc43658d816fda50527 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 8 Sep 2017 18:36:57 +0100 Subject: [PATCH] Fix a bunch of small issues detected by using an intellij inspection --- .../obfuscation/AnnotatedMixinElementHandlerInjector.java | 5 +---- .../org/spongepowered/tools/obfuscation/TargetMap.java | 3 +-- .../tools/obfuscation/mirror/TypeHandle.java | 2 +- .../mixin/transformer/debug/RuntimeDecompilerAsync.java | 2 +- .../asm/service/mojang/LaunchClassLoaderUtil.java | 6 +----- .../asm/service/mojang/MixinServiceLaunchWrapper.java | 8 +++----- .../org/spongepowered/asm/mixin/MixinEnvironment.java | 2 +- .../asm/mixin/injection/callback/CallbackInjector.java | 3 +-- .../asm/mixin/injection/points/BeforeConstant.java | 4 ++-- .../spongepowered/asm/mixin/injection/struct/Target.java | 6 +++--- .../org/spongepowered/asm/mixin/struct/MemberRef.java | 4 ++-- .../spongepowered/asm/mixin/transformer/ClassInfo.java | 2 +- .../asm/mixin/transformer/InterfaceInfo.java | 2 +- .../asm/mixin/transformer/MixinApplicatorStandard.java | 2 +- .../asm/mixin/transformer/TargetClassContext.java | 6 +++--- src/main/java/org/spongepowered/asm/util/Annotations.java | 8 +++++++- src/main/java/org/spongepowered/asm/util/Bytecode.java | 2 +- .../java/org/spongepowered/asm/util/VersionNumber.java | 4 ++-- 18 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java index fb232b65..732f8b84 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java @@ -75,10 +75,7 @@ class AnnotatedMixinElementHandlerInjector extends AnnotatedMixinElementHandler } for (VariableElement param : this.element.getParameters()) { - AnnotationHandle coerce = AnnotationHandle.of(param, Coerce.class); - if (coerce != null) { - return true; - } + return AnnotationHandle.of(param, Coerce.class).exists(); } return false; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java index f50f7698..05c05df2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java @@ -238,8 +238,7 @@ public final class TargetMap extends HashMap> try { streamIn = new FileInputStream(sessionFile); objectinputstream = new ObjectInputStream(streamIn); - TargetMap map = (TargetMap)objectinputstream.readObject(); - return map; + return (TargetMap)objectinputstream.readObject(); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/mirror/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/mirror/TypeHandle.java index 3c0fdc59..f753d6eb 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/mirror/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/mirror/TypeHandle.java @@ -218,7 +218,7 @@ public class TypeHandle { * Get whether the element is probably public */ public boolean isPublic() { - return this.getTargetElement() != null ? this.getTargetElement().getModifiers().contains(Modifier.PUBLIC) : false; + return this.getTargetElement() != null && this.getTargetElement().getModifiers().contains(Modifier.PUBLIC); } /** diff --git a/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompilerAsync.java b/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompilerAsync.java index 5feaadb8..fc849e22 100644 --- a/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompilerAsync.java +++ b/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompilerAsync.java @@ -82,7 +82,7 @@ public class RuntimeDecompilerAsync extends RuntimeDecompiler implements Runnabl private void flush() { this.run = false; - for (File file = null; (file = this.queue.poll()) != null;) { + for (File file; (file = this.queue.poll()) != null;) { this.decompile(file); } } diff --git a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java index 29fb183a..1ae92037 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java +++ b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java @@ -114,11 +114,7 @@ public final class LaunchClassLoaderUtil { * @return true if the class name exists in the cache */ public boolean isClassLoaded(String name) { - if (this.cachedClasses != null && this.cachedClasses.containsKey(name)) { - return true; - } - - return false; + return this.cachedClasses != null && this.cachedClasses.containsKey(name); } /** diff --git a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java index b11287f2..82d49935 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java +++ b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java @@ -320,10 +320,8 @@ public class MixinServiceLaunchWrapper implements IMixinService { MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); for (ILegacyClassTransformer transformer : environment.getTransformers()) { - if (this.lock != null) { - // Clear the re-entrance semaphore - this.lock.clear(); - } + // Clear the re-entrance semaphore + this.lock.clear(); int pos = transformer.getName().lastIndexOf('.'); String simpleName = transformer.getName().substring(pos + 1); @@ -332,7 +330,7 @@ public class MixinServiceLaunchWrapper implements IMixinService { basicClass = transformer.transformClassBytes(name, transformedName, basicClass); transformTime.end(); - if (this.lock != null && this.lock.isSet()) { + if (this.lock.isSet()) { // Also add it to the exclusion list so we can exclude it if the environment triggers a rebuild environment.addTransformerExclusion(transformer.getName()); diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 2ca0b23c..e22195c0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -422,7 +422,7 @@ public final class MixinEnvironment implements ITokenProvider { /** * This option is always false. */ - ALWAYS_FALSE; + ALWAYS_FALSE } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java index e1147847..f7ca1016 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java @@ -519,9 +519,8 @@ public class CallbackInjector extends Injector { int position = callback.target.indexOf(callback.node); List expected = CallbackInjector.summariseLocals(this.methodNode.desc, callback.target.arguments.length + 1); List found = CallbackInjector.summariseLocals(callback.getDescriptorWithAllLocals(), callback.frameSize); - String message = String.format("LVT in %s has incompatible changes at opcode %d in callback %s.\nExpected: %s\n Found: %s", + return String.format("LVT in %s has incompatible changes at opcode %d in callback %s.\nExpected: %s\n Found: %s", callback.target, position, this, expected, found); - return message; } /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeConstant.java b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeConstant.java index 01e57f5c..b12b4ae0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeConstant.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeConstant.java @@ -150,7 +150,7 @@ public class BeforeConstant extends InjectionPoint { Boolean empty = Annotations.getValue(node, "nullValue", (Boolean)null); this.ordinal = Annotations.getValue(node, "ordinal", Integer.valueOf(-1)); - this.nullValue = empty != null ? empty.booleanValue() : false; + this.nullValue = empty != null && empty.booleanValue(); this.intValue = Annotations.getValue(node, "intValue", (Integer)null); this.floatValue = Annotations.getValue(node, "floatValue", (Float)null); this.longValue = Annotations.getValue(node, "longValue", (Long)null); @@ -172,7 +172,7 @@ public class BeforeConstant extends InjectionPoint { Boolean empty = strNullValue != null ? Boolean.parseBoolean(strNullValue) : null; this.ordinal = data.getOrdinal(); - this.nullValue = empty != null ? empty.booleanValue() : false; + this.nullValue = empty != null && empty.booleanValue(); this.intValue = Ints.tryParse(data.get("intValue", "")); this.floatValue = Floats.tryParse(data.get("floatValue", "")); this.longValue = Longs.tryParse(data.get("longValue", "")); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java index b38cbed6..72b4f0ba 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java @@ -406,15 +406,15 @@ public class Target implements Comparable, Iterable { return this.callbackDescriptor; } - String descriptor = this.callbackDescriptor.substring(0, this.callbackDescriptor.indexOf(')')); + StringBuilder descriptor = new StringBuilder(this.callbackDescriptor.substring(0, this.callbackDescriptor.indexOf(')'))); for (int l = startIndex; l < locals.length && extra > 0; l++) { if (locals[l] != null) { - descriptor += locals[l].getDescriptor(); + descriptor.append(locals[l].getDescriptor()); extra--; } } - return descriptor + ")V"; + return descriptor.append(")V").toString(); } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/struct/MemberRef.java b/src/main/java/org/spongepowered/asm/mixin/struct/MemberRef.java index 42afd63f..4e82cdf6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/struct/MemberRef.java +++ b/src/main/java/org/spongepowered/asm/mixin/struct/MemberRef.java @@ -71,7 +71,7 @@ public abstract class MemberRef { @Override public void setOpcode(int opcode) { - if ((opcode | Method.OPCODES) == 0) { + if ((opcode & Method.OPCODES) == 0) { throw new IllegalArgumentException("Invalid opcode for method instruction: 0x" + Integer.toHexString(opcode)); } @@ -142,7 +142,7 @@ public abstract class MemberRef { @Override public void setOpcode(int opcode) { - if ((opcode | Field.OPCODES) == 0) { + if ((opcode & Field.OPCODES) == 0) { throw new IllegalArgumentException("Invalid opcode for field instruction: 0x" + Integer.toHexString(opcode)); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 91131184..ba7a5eaa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -1108,7 +1108,7 @@ public final class ClassInfo { * @return Matched superclass or null if not found */ public ClassInfo findSuperClass(String superClass, Traversal traversal, boolean includeInterfaces) { - if (ClassInfo.OBJECT.name == superClass) { + if (ClassInfo.OBJECT.name.equals(superClass)) { return null; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index a9eb1731..70f5c0fc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -232,7 +232,7 @@ public final class InterfaceInfo { throw new InvalidMixinException(mixin, String.format("@Interface annotation on %s is missing a required parameter", mixin)); } - return new InterfaceInfo(mixin, prefix, iface, unique != null ? unique.booleanValue() : false); + return new InterfaceInfo(mixin, prefix, iface, unique != null && unique.booleanValue()); } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java index 9a345ac3..c90c1130 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -933,7 +933,7 @@ class MixinApplicatorStandard { if (Bytecode.hasFlag(mixinMethod, Opcodes.ACC_STATIC) && !Bytecode.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) && !Bytecode.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) - && !(Annotations.getVisible(mixinMethod, Overwrite.class) != null)) { + && Annotations.getVisible(mixinMethod, Overwrite.class) == null) { throw new InvalidMixinException(mixin, String.format("Mixin %s contains non-private static method %s", mixin, mixinMethod)); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 80c8a9ab..4cd052b7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -385,15 +385,15 @@ class TargetClassContext extends ClassContext implements ITargetClassContext { AnnotationNode classDebugAnnotation = Annotations.getVisible(this.classNode, Debug.class); if (classDebugAnnotation != null) { - this.forceExport = Boolean.TRUE.equals(Annotations.getValue(classDebugAnnotation, "export")); - if (Boolean.TRUE.equals(Annotations.getValue(classDebugAnnotation, "print"))) { + this.forceExport = Boolean.TRUE.equals(Annotations.getValue(classDebugAnnotation, "export")); + if (Boolean.TRUE.equals(Annotations.getValue(classDebugAnnotation, "print"))) { Bytecode.textify(this.classNode, System.err); } } for (MethodNode method : this.classNode.methods) { AnnotationNode methodDebugAnnotation = Annotations.getVisible(method, Debug.class); - if (methodDebugAnnotation != null && Boolean.TRUE.equals(Annotations.getValue(methodDebugAnnotation, "print"))) { + if (methodDebugAnnotation != null && Boolean.TRUE.equals(Annotations.getValue(methodDebugAnnotation, "print"))) { Bytecode.textify(method, System.err); } } diff --git a/src/main/java/org/spongepowered/asm/util/Annotations.java b/src/main/java/org/spongepowered/asm/util/Annotations.java index 75ca8bbd..28a0ff70 100644 --- a/src/main/java/org/spongepowered/asm/util/Annotations.java +++ b/src/main/java/org/spongepowered/asm/util/Annotations.java @@ -36,7 +36,9 @@ import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; +import com.google.common.base.Function; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; /** * Utility class for working with ASM annotations @@ -302,7 +304,11 @@ public final class Annotations { int foundNodes = nodes.size(); if (foundNodes > 1) { - throw new IllegalArgumentException("Conflicting annotations found: " + annotationClasses); + throw new IllegalArgumentException("Conflicting annotations found: " + Lists.transform(nodes, new Function() { + @Override public String apply(AnnotationNode input) { + return input.desc; + } + })); } return foundNodes == 0 ? null : nodes.get(0); diff --git a/src/main/java/org/spongepowered/asm/util/Bytecode.java b/src/main/java/org/spongepowered/asm/util/Bytecode.java index 1f6ad814..794162cb 100644 --- a/src/main/java/org/spongepowered/asm/util/Bytecode.java +++ b/src/main/java/org/spongepowered/asm/util/Bytecode.java @@ -639,7 +639,7 @@ public final class Bytecode { } else if (arg instanceof Type) { return arg.toString(); } else if (arg instanceof Class) { - return Type.getDescriptor((Class)arg).toString(); + return Type.getDescriptor((Class)arg); } return arg == null ? "" : arg.toString(); } diff --git a/src/main/java/org/spongepowered/asm/util/VersionNumber.java b/src/main/java/org/spongepowered/asm/util/VersionNumber.java index fa4c37c7..398e2ed3 100644 --- a/src/main/java/org/spongepowered/asm/util/VersionNumber.java +++ b/src/main/java/org/spongepowered/asm/util/VersionNumber.java @@ -127,7 +127,7 @@ public final class VersionNumber implements Comparable, Serializa */ @Override public int hashCode() { - return (int)(this.value >> 32) ^ (int)(this.value & 0xFFFFFFFF); + return (int)(this.value >> 32) ^ (int)(this.value & 0xFFFFFFFFL); } /** @@ -161,7 +161,7 @@ public final class VersionNumber implements Comparable, Serializa * @param version Version number to parse * @return Version number */ - public static final VersionNumber parse(String version) { + public static VersionNumber parse(String version) { return VersionNumber.parse(version, VersionNumber.NONE); }