style: run spotless java over project

jumanji144 · Dec 9, 2023 · 8370db8 · 8370db8
1 parent 84b6524
commit 8370db8
Show file tree

Hide file tree

Showing 75 changed files with 191 additions and 118 deletions.
diff --git a/jasm-cli/src/main/java/me/darknet/assembler/cli/JasmCli.java b/jasm-cli/src/main/java/me/darknet/assembler/cli/JasmCli.java
@@ -1,6 +1,7 @@
 package me.darknet.assembler.cli;
 
 import me.darknet.assembler.cli.commands.MainCommand;
+
 import picocli.CommandLine;
 
 public class JasmCli {

diff --git a/jasm-cli/src/main/java/me/darknet/assembler/cli/commands/CompileCommand.java b/jasm-cli/src/main/java/me/darknet/assembler/cli/commands/CompileCommand.java
@@ -8,6 +8,7 @@
 import me.darknet.assembler.compiler.Compiler;
 import me.darknet.assembler.compiler.CompilerOptions;
 import me.darknet.assembler.helper.Processor;
+
 import picocli.CommandLine;
 
 import java.io.File;

diff --git a/jasm-cli/src/main/java/me/darknet/assembler/cli/commands/DecompileCommand.java b/jasm-cli/src/main/java/me/darknet/assembler/cli/commands/DecompileCommand.java
@@ -3,6 +3,7 @@
 import me.darknet.assembler.printer.JvmClassPrinter;
 import me.darknet.assembler.printer.PrintContext;
 import me.darknet.assembler.printer.Printer;
+
 import picocli.CommandLine;
 
 import java.io.File;

diff --git a/jasm-cli/src/main/java/me/darknet/assembler/cli/commands/MainCommand.java b/jasm-cli/src/main/java/me/darknet/assembler/cli/commands/MainCommand.java
@@ -1,6 +1,7 @@
 package me.darknet.assembler.cli.commands;
 
 import me.darknet.assembler.parser.BytecodeFormat;
+
 import picocli.CommandLine;
 
 @CommandLine.Command(

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/JvmClassWriter.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/JvmClassWriter.java
@@ -1,6 +1,7 @@
 package me.darknet.assembler.compile;
 
 import me.darknet.assembler.compiler.InheritanceChecker;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/JvmCompiler.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/JvmCompiler.java
@@ -1,11 +1,5 @@
 package me.darknet.assembler.compile;
 
-import dev.xdark.blw.BytecodeLibrary;
-import dev.xdark.blw.asm.AsmBytecodeLibrary;
-import dev.xdark.blw.asm.ClassWriterProvider;
-import dev.xdark.blw.classfile.ClassBuilder;
-import dev.xdark.blw.classfile.ClassFileView;
-import dev.xdark.blw.version.JavaVersion;
 import me.darknet.assembler.ast.ASTElement;
 import me.darknet.assembler.compile.builder.BlwReplaceClassBuilder;
 import me.darknet.assembler.compile.visitor.BlwRootVisitor;
@@ -14,6 +8,13 @@
 import me.darknet.assembler.error.ErrorCollector;
 import me.darknet.assembler.error.Result;
 import me.darknet.assembler.transformer.Transformer;
+
+import dev.xdark.blw.BytecodeLibrary;
+import dev.xdark.blw.asm.AsmBytecodeLibrary;
+import dev.xdark.blw.asm.ClassWriterProvider;
+import dev.xdark.blw.classfile.ClassBuilder;
+import dev.xdark.blw.classfile.ClassFileView;
+import dev.xdark.blw.version.JavaVersion;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/JvmCompilerOptions.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/JvmCompilerOptions.java
@@ -1,6 +1,5 @@
 package me.darknet.assembler.compile;
 
-import dev.xdark.blw.version.JavaVersion;
 import me.darknet.assembler.compile.analysis.VariableNameLookup;
 import me.darknet.assembler.compile.analysis.jvm.JvmAnalysisEngine;
 import me.darknet.assembler.compile.analysis.jvm.JvmAnalysisEngineFactory;
@@ -9,6 +8,8 @@
 import me.darknet.assembler.compiler.CompilerOptions;
 import me.darknet.assembler.compiler.InheritanceChecker;
 import me.darknet.assembler.compiler.ReflectiveInheritanceChecker;
+
+import dev.xdark.blw.version.JavaVersion;
 import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.ClassWriter;
 

diff --git a/...omposition-jvm/src/main/java/me/darknet/assembler/compile/analysis/AnalysisException.java b/...omposition-jvm/src/main/java/me/darknet/assembler/compile/analysis/AnalysisException.java
@@ -1,8 +1,9 @@
 package me.darknet.assembler.compile.analysis;
 
+import me.darknet.assembler.compile.analysis.frame.FrameMergeException;
+
 import dev.xdark.blw.code.CodeElement;
 import dev.xdark.blw.simulation.SimulationException;
-import me.darknet.assembler.compile.analysis.frame.FrameMergeException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/AnalysisResults.java b/...-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/AnalysisResults.java
@@ -2,6 +2,7 @@
 
 import me.darknet.assembler.ast.primitive.ASTCode;
 import me.darknet.assembler.compile.analysis.frame.Frame;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/AnalysisUtils.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/AnalysisUtils.java
@@ -1,10 +1,11 @@
 package me.darknet.assembler.compile.analysis;
 
+import me.darknet.assembler.compiler.InheritanceChecker;
+
 import dev.xdark.blw.type.ClassType;
 import dev.xdark.blw.type.ObjectType;
 import dev.xdark.blw.type.PrimitiveType;
 import dev.xdark.blw.type.Types;
-import me.darknet.assembler.compiler.InheritanceChecker;
 import org.jetbrains.annotations.NotNull;
 
 public class AnalysisUtils {

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/Value.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/Value.java
@@ -1,7 +1,8 @@
 package me.darknet.assembler.compile.analysis;
 
-import dev.xdark.blw.type.*;
 import me.darknet.assembler.compiler.InheritanceChecker;
+
+import dev.xdark.blw.type.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/Values.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/Values.java
@@ -4,8 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
-import java.lang.reflect.Type;
 import java.lang.reflect.*;
+import java.lang.reflect.Type;
 import java.net.*;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/Frame.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/Frame.java
@@ -1,8 +1,9 @@
 package me.darknet.assembler.compile.analysis.frame;
 
-import dev.xdark.blw.type.ClassType;
 import me.darknet.assembler.compile.analysis.Local;
 import me.darknet.assembler.compiler.InheritanceChecker;
+
+import dev.xdark.blw.type.ClassType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/FrameOps.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/FrameOps.java
@@ -1,6 +1,7 @@
 package me.darknet.assembler.compile.analysis.frame;
 
 import me.darknet.assembler.compile.analysis.Local;
+
 import org.jetbrains.annotations.NotNull;
 
 public interface FrameOps<F extends Frame> {

diff --git a/...composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/TypedFrame.java b/...composition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/TypedFrame.java
@@ -1,8 +1,9 @@
 package me.darknet.assembler.compile.analysis.frame;
 
+import me.darknet.assembler.compile.analysis.Local;
+
 import dev.xdark.blw.type.ClassType;
 import dev.xdark.blw.type.Types;
-import me.darknet.assembler.compile.analysis.Local;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...osition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/TypedFrameImpl.java b/...osition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/TypedFrameImpl.java
@@ -1,10 +1,11 @@
 package me.darknet.assembler.compile.analysis.frame;
 
-import dev.xdark.blw.type.ClassType;
-import dev.xdark.blw.type.Types;
 import me.darknet.assembler.compile.analysis.AnalysisUtils;
 import me.darknet.assembler.compile.analysis.Local;
 import me.darknet.assembler.compiler.InheritanceChecker;
+
+import dev.xdark.blw.type.ClassType;
+import dev.xdark.blw.type.Types;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

diff --git a/...position-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/TypedFrameOps.java b/...position-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/TypedFrameOps.java
@@ -1,6 +1,7 @@
 package me.darknet.assembler.compile.analysis.frame;
 
 import me.darknet.assembler.compile.analysis.Local;
+
 import org.jetbrains.annotations.NotNull;
 
 public class TypedFrameOps implements FrameOps<TypedFrame> {

diff --git a/...omposition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/ValuedFrame.java b/...omposition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/ValuedFrame.java
@@ -1,10 +1,11 @@
 package me.darknet.assembler.compile.analysis.frame;
 
-import dev.xdark.blw.type.ClassType;
-import dev.xdark.blw.type.Types;
 import me.darknet.assembler.compile.analysis.Local;
 import me.darknet.assembler.compile.analysis.Value;
 import me.darknet.assembler.compile.analysis.ValuedLocal;
+
+import dev.xdark.blw.type.ClassType;
+import dev.xdark.blw.type.Types;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/ValuedFrameImpl.java b/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/ValuedFrameImpl.java
@@ -1,12 +1,13 @@
 package me.darknet.assembler.compile.analysis.frame;
 
-import dev.xdark.blw.type.ClassType;
-import dev.xdark.blw.type.Types;
 import me.darknet.assembler.compile.analysis.AnalysisUtils;
 import me.darknet.assembler.compile.analysis.Value;
 import me.darknet.assembler.compile.analysis.ValuedLocal;
 import me.darknet.assembler.compile.analysis.Values;
 import me.darknet.assembler.compiler.InheritanceChecker;
+
+import dev.xdark.blw.type.ClassType;
+import dev.xdark.blw.type.Types;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

diff --git a/...osition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/ValuedFrameOps.java b/...osition-jvm/src/main/java/me/darknet/assembler/compile/analysis/frame/ValuedFrameOps.java
@@ -3,6 +3,7 @@
 import me.darknet.assembler.compile.analysis.Local;
 import me.darknet.assembler.compile.analysis.ValuedLocal;
 import me.darknet.assembler.compile.analysis.Values;
+
 import org.jetbrains.annotations.NotNull;
 
 public class ValuedFrameOps implements FrameOps<ValuedFrame> {

diff --git a/...ition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/AnalysisSimulation.java b/...ition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/AnalysisSimulation.java
@@ -1,18 +1,19 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
+import me.darknet.assembler.compile.analysis.AnalysisException;
+import me.darknet.assembler.compile.analysis.Local;
+import me.darknet.assembler.compile.analysis.frame.Frame;
+import me.darknet.assembler.compile.analysis.frame.FrameMergeException;
+import me.darknet.assembler.compile.analysis.frame.FrameOps;
+import me.darknet.assembler.compiler.InheritanceChecker;
+
 import dev.xdark.blw.code.*;
 import dev.xdark.blw.code.instruction.BranchInstruction;
 import dev.xdark.blw.code.instruction.ConditionalJumpInstruction;
 import dev.xdark.blw.simulation.ExecutionEngines;
 import dev.xdark.blw.simulation.Simulation;
 import dev.xdark.blw.type.InstanceType;
 import dev.xdark.blw.type.Types;
-import me.darknet.assembler.compile.analysis.AnalysisException;
-import me.darknet.assembler.compile.analysis.Local;
-import me.darknet.assembler.compile.analysis.frame.Frame;
-import me.darknet.assembler.compile.analysis.frame.FrameMergeException;
-import me.darknet.assembler.compile.analysis.frame.FrameOps;
-import me.darknet.assembler.compiler.InheritanceChecker;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...n-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/BasicMethodValueLookup.java b/...n-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/BasicMethodValueLookup.java
@@ -1,8 +1,9 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
-import dev.xdark.blw.code.instruction.MethodInstruction;
 import me.darknet.assembler.compile.analysis.Value;
 import me.darknet.assembler.compile.analysis.Values;
+
+import dev.xdark.blw.code.instruction.MethodInstruction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...osition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/FieldValueLookup.java b/...osition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/FieldValueLookup.java
@@ -1,7 +1,8 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
-import dev.xdark.blw.code.instruction.FieldInstruction;
 import me.darknet.assembler.compile.analysis.Value;
+
+import dev.xdark.blw.code.instruction.FieldInstruction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/JvmAnalysisEngine.java b/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/JvmAnalysisEngine.java
@@ -1,15 +1,16 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
-import dev.xdark.blw.code.Instruction;
-import dev.xdark.blw.code.JavaOpcodes;
-import dev.xdark.blw.code.Label;
-import dev.xdark.blw.code.instruction.*;
-import dev.xdark.blw.simulation.ExecutionEngine;
 import me.darknet.assembler.compile.analysis.AnalysisException;
 import me.darknet.assembler.compile.analysis.AnalysisResults;
 import me.darknet.assembler.compile.analysis.VariableNameLookup;
 import me.darknet.assembler.compile.analysis.frame.Frame;
 import me.darknet.assembler.compile.analysis.frame.FrameOps;
+
+import dev.xdark.blw.code.Instruction;
+import dev.xdark.blw.code.JavaOpcodes;
+import dev.xdark.blw.code.Label;
+import dev.xdark.blw.code.instruction.*;
+import dev.xdark.blw.simulation.ExecutionEngine;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/JvmAnalysisEngineFactory.java b/...jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/JvmAnalysisEngineFactory.java
@@ -1,6 +1,7 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
 import me.darknet.assembler.compile.analysis.VariableNameLookup;
+
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/MethodValueLookup.java b/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/MethodValueLookup.java
@@ -1,7 +1,8 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
-import dev.xdark.blw.code.instruction.MethodInstruction;
 import me.darknet.assembler.compile.analysis.Value;
+
+import dev.xdark.blw.code.instruction.MethodInstruction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...n-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/TypedJvmAnalysisEngine.java b/...n-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/TypedJvmAnalysisEngine.java
@@ -1,15 +1,16 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
-import dev.xdark.blw.code.instruction.*;
-import dev.xdark.blw.constant.*;
-import dev.xdark.blw.type.ClassType;
-import dev.xdark.blw.type.MethodType;
-import dev.xdark.blw.type.Types;
 import me.darknet.assembler.compile.analysis.Local;
 import me.darknet.assembler.compile.analysis.VariableNameLookup;
 import me.darknet.assembler.compile.analysis.frame.FrameOps;
 import me.darknet.assembler.compile.analysis.frame.TypedFrame;
 import me.darknet.assembler.compile.analysis.frame.TypedFrameOps;
+
+import dev.xdark.blw.code.instruction.*;
+import dev.xdark.blw.constant.*;
+import dev.xdark.blw.type.ClassType;
+import dev.xdark.blw.type.MethodType;
+import dev.xdark.blw.type.Types;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

diff --git a/...-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/ValuedJvmAnalysisEngine.java b/...-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/ValuedJvmAnalysisEngine.java
@@ -1,13 +1,14 @@
 package me.darknet.assembler.compile.analysis.jvm;
 
-import dev.xdark.blw.code.instruction.*;
-import dev.xdark.blw.constant.*;
-import dev.xdark.blw.type.*;
 import me.darknet.assembler.compile.analysis.*;
 import me.darknet.assembler.compile.analysis.frame.FrameOps;
 import me.darknet.assembler.compile.analysis.frame.ValuedFrame;
 import me.darknet.assembler.compile.analysis.frame.ValuedFrameOps;
 import me.darknet.assembler.compiler.InheritanceChecker;
+
+import dev.xdark.blw.code.instruction.*;
+import dev.xdark.blw.constant.*;
+import dev.xdark.blw.type.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/...sition-jvm/src/main/java/me/darknet/assembler/compile/builder/BlwReplaceClassBuilder.java b/...sition-jvm/src/main/java/me/darknet/assembler/compile/builder/BlwReplaceClassBuilder.java
@@ -1,11 +1,12 @@
 package me.darknet.assembler.compile.builder;
 
+import me.darknet.assembler.compile.analysis.AnalysisResults;
+import me.darknet.assembler.compile.analysis.MethodAnalysisLookup;
+
 import dev.xdark.blw.classfile.MemberIdentifier;
 import dev.xdark.blw.classfile.generic.GenericClassBuilder;
 import dev.xdark.blw.classfile.generic.GenericMethodBuilder;
 import dev.xdark.blw.type.MethodType;
-import me.darknet.assembler.compile.analysis.AnalysisResults;
-import me.darknet.assembler.compile.analysis.MethodAnalysisLookup;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...ion-jvm/src/main/java/me/darknet/assembler/compile/visitor/BlwAnnotationArrayVisitor.java b/...ion-jvm/src/main/java/me/darknet/assembler/compile/visitor/BlwAnnotationArrayVisitor.java
@@ -1,15 +1,16 @@
 package me.darknet.assembler.compile.visitor;
 
+import me.darknet.assembler.ast.primitive.ASTIdentifier;
+import me.darknet.assembler.ast.specific.ASTValue;
+import me.darknet.assembler.visitor.ASTAnnotationArrayVisitor;
+import me.darknet.assembler.visitor.ASTAnnotationVisitor;
+
 import dev.xdark.blw.annotation.ElementArrayBuilder;
 import dev.xdark.blw.annotation.ElementEnum;
 import dev.xdark.blw.annotation.ElementType;
 import dev.xdark.blw.type.InstanceType;
 import dev.xdark.blw.type.ObjectType;
 import dev.xdark.blw.type.Types;
-import me.darknet.assembler.ast.primitive.ASTIdentifier;
-import me.darknet.assembler.ast.specific.ASTValue;
-import me.darknet.assembler.visitor.ASTAnnotationArrayVisitor;
-import me.darknet.assembler.visitor.ASTAnnotationVisitor;
 
 public class BlwAnnotationArrayVisitor implements ASTAnnotationArrayVisitor, BlwElementAdapter {
     private final ElementArrayBuilder<?> builder;