Rename method model package to insn

Minecraft-Malware-Prevention-Alliance · Jul 12, 2023 · c2e4a68 · c2e4a68
1 parent 470ecb6
commit c2e4a68
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 22 deletions.
diff --git a/concoction-lib/src/main/java/info/mmpa/concoction/output/DetectionArchetype.java b/concoction-lib/src/main/java/info/mmpa/concoction/output/DetectionArchetype.java
@@ -1,7 +1,7 @@
 package info.mmpa.concoction.output;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import info.mmpa.concoction.scan.model.method.InstructionsMatchingModel;
+import info.mmpa.concoction.scan.model.insn.InstructionsMatchingModel;
 
 import javax.annotation.Nonnull;
 

diff --git a/...can/model/method/AllMultiInstruction.java → .../scan/model/insn/AllMultiInstruction.java b/...can/model/method/AllMultiInstruction.java → .../scan/model/insn/AllMultiInstruction.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import info.mmpa.concoction.scan.model.TextMatchMode;
 import org.objectweb.asm.tree.AbstractInsnNode;

diff --git a/...can/model/method/AnyMultiInstruction.java → .../scan/model/insn/AnyMultiInstruction.java b/...can/model/method/AnyMultiInstruction.java → .../scan/model/insn/AnyMultiInstruction.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import info.mmpa.concoction.scan.model.TextMatchMode;
 import org.objectweb.asm.tree.AbstractInsnNode;

diff --git a/...oction/scan/model/method/Instruction.java → ...ncoction/scan/model/insn/Instruction.java b/...oction/scan/model/method/Instruction.java → ...ncoction/scan/model/insn/Instruction.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import info.mmpa.concoction.scan.model.TextMatchMode;
 import info.mmpa.concoction.util.InstructionStrings;

diff --git a/...n/model/method/InstructionMatchEntry.java → ...can/model/insn/InstructionMatchEntry.java b/...n/model/method/InstructionMatchEntry.java → ...can/model/insn/InstructionMatchEntry.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

diff --git a/...od/InstructionMatchEntryDeserializer.java → ...sn/InstructionMatchEntryDeserializer.java b/...od/InstructionMatchEntryDeserializer.java → ...sn/InstructionMatchEntryDeserializer.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/...thod/InstructionMatchEntrySerializer.java → ...insn/InstructionMatchEntrySerializer.java b/...thod/InstructionMatchEntrySerializer.java → ...insn/InstructionMatchEntrySerializer.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

diff --git a/...can/model/method/InstructionWildcard.java → .../scan/model/insn/InstructionWildcard.java b/...can/model/method/InstructionWildcard.java → .../scan/model/insn/InstructionWildcard.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;

diff --git a/...odel/method/InstructionWildcardMulti.java → .../model/insn/InstructionWildcardMulti.java b/...odel/method/InstructionWildcardMulti.java → .../model/insn/InstructionWildcardMulti.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;

diff --git a/...del/method/InstructionsMatchingModel.java → ...model/insn/InstructionsMatchingModel.java b/...del/method/InstructionsMatchingModel.java → ...model/insn/InstructionsMatchingModel.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;

diff --git a/...n/scan/model/method/MultiInstruction.java → ...ion/scan/model/insn/MultiInstruction.java b/...n/scan/model/method/MultiInstruction.java → ...ion/scan/model/insn/MultiInstruction.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

diff --git a/...an/model/method/NoneMultiInstruction.java → ...scan/model/insn/NoneMultiInstruction.java b/...an/model/method/NoneMultiInstruction.java → ...scan/model/insn/NoneMultiInstruction.java
@@ -1,4 +1,4 @@
-package info.mmpa.concoction.scan.model.method;
+package info.mmpa.concoction.scan.model.insn;
 
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;

diff --git a/concoction-lib/src/main/java/info/mmpa/concoction/scan/standard/StandardScan.java b/concoction-lib/src/main/java/info/mmpa/concoction/scan/standard/StandardScan.java
@@ -7,7 +7,7 @@
 import info.mmpa.concoction.model.path.SourcePathElement;
 import info.mmpa.concoction.output.Results;
 import info.mmpa.concoction.output.ResultsSink;
-import info.mmpa.concoction.scan.model.method.InstructionsMatchingModel;
+import info.mmpa.concoction.scan.model.insn.InstructionsMatchingModel;
 import info.mmpa.concoction.util.AsmUtil;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;

diff --git a/concoction-lib/src/main/java/info/mmpa/concoction/util/Serialization.java b/concoction-lib/src/main/java/info/mmpa/concoction/util/Serialization.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import info.mmpa.concoction.scan.model.method.InstructionMatchEntry;
-import info.mmpa.concoction.scan.model.method.InstructionMatchEntryDeserializer;
-import info.mmpa.concoction.scan.model.method.InstructionsMatchingModel;
+import info.mmpa.concoction.scan.model.insn.InstructionMatchEntry;
+import info.mmpa.concoction.scan.model.insn.InstructionMatchEntryDeserializer;
+import info.mmpa.concoction.scan.model.insn.InstructionsMatchingModel;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/concoction-lib/src/test/java/info/mmpa/concoction/scan/InstructionMatchingTests.java b/concoction-lib/src/test/java/info/mmpa/concoction/scan/InstructionMatchingTests.java
@@ -8,7 +8,7 @@
 import info.mmpa.concoction.model.path.MethodPathElement;
 import info.mmpa.concoction.output.Detection;
 import info.mmpa.concoction.output.Results;
-import info.mmpa.concoction.scan.model.method.InstructionsMatchingModel;
+import info.mmpa.concoction.scan.model.insn.InstructionsMatchingModel;
 import info.mmpa.concoction.scan.standard.StandardScan;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
@@ -18,15 +18,13 @@
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.NavigableSet;
 import java.util.Set;
 
 import static info.mmpa.concoction.util.Unchecked.cast;
-import static info.mmpa.concoction.util.TestSerialization.deserializeModel;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class InstructionMatchingTests {

diff --git a/...lib/src/test/java/info/mmpa/concoction/scan/model/InstructionMatchSerializationTests.java b/...lib/src/test/java/info/mmpa/concoction/scan/model/InstructionMatchSerializationTests.java
@@ -2,7 +2,7 @@
 
 import info.mmpa.concoction.output.DetectionArchetype;
 import info.mmpa.concoction.output.SusLevel;
-import info.mmpa.concoction.scan.model.method.*;
+import info.mmpa.concoction.scan.model.insn.*;
 import org.junit.jupiter.api.Test;
 import software.coley.collections.Maps;
 

diff --git a/concoction-lib/src/test/java/info/mmpa/concoction/util/TestSerialization.java b/concoction-lib/src/test/java/info/mmpa/concoction/util/TestSerialization.java
@@ -1,7 +1,7 @@
 package info.mmpa.concoction.util;
 
-import info.mmpa.concoction.scan.model.method.InstructionMatchEntry;
-import info.mmpa.concoction.scan.model.method.InstructionsMatchingModel;
+import info.mmpa.concoction.scan.model.insn.InstructionMatchEntry;
+import info.mmpa.concoction.scan.model.insn.InstructionsMatchingModel;
 import org.junit.jupiter.api.Assertions;
 
 import javax.annotation.Nonnull;