diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index ebd6bc6d..72220b51 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -101,7 +101,6 @@ ProjectName/
**Development Tools:**
- **JavaGenerator** - Java code generation utilities
-- **AntTasks** - Custom Ant build tasks
### Legacy Projects (No Gradle builds)
- **SpecsHWUtils** - Hardware utilities (Eclipse project only)
@@ -122,7 +121,7 @@ File: `.github/workflows/nightly.yml`
5. Generates dependency graphs
### Tested Projects (in CI order):
-AntTasks, AsmParser, CommonsCompressPlus, CommonsLangPlus, GearmanPlus, GitlabPlus, GitPlus, Gprofer, GsonPlus, GuiHelper, JacksonPlus, JadxPlus, JavaGenerator, jOptions, JsEngine, LogbackPlus, MvelPlus, SlackPlus, SpecsUtils, SymjaPlus, tdrcLibrary, XStreamPlus
+CommonsLangPlus, GitPlus, GsonPlus, GuiHelper, JacksonPlus, JadxPlus, JavaGenerator, jOptions, JsEngine, SpecsUtils, SymjaPlus, tdrcLibrary, XStreamPlus
### Local Validation Steps
1. **Build specific project**: `cd ProjectName && gradle build`
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f6064405..d12a5a91 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout specs-java-libs
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setup Java
uses: actions/setup-java@v4
@@ -37,13 +37,8 @@ jobs:
- name: Build and test all Gradle projects sequentially
run: |
projects=(
- AntTasks
- AsmParser
- CommonsCompressPlus
CommonsLangPlus
- GitlabPlus
GitPlus
- Gprofer
GsonPlus
GuiHelper
JacksonPlus
@@ -51,9 +46,6 @@ jobs:
JavaGenerator
jOptions
JsEngine
- LogbackPlus
- MvelPlus
- SlackPlus
SpecsUtils
SymjaPlus
tdrcLibrary
diff --git a/AntTasks/build.gradle b/AntTasks/build.gradle
deleted file mode 100644
index fcfe2501..00000000
--- a/AntTasks/build.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-plugins {
- id 'distribution'
- id 'java'
-}
-
-java {
- withSourcesJar()
-
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
-}
-
-// Repositories providers
-repositories {
- mavenCentral()
-}
-
-dependencies {
- testImplementation "junit:junit:4.13.1"
-
- implementation ':jOptions'
- implementation ':SpecsUtils'
-
- // Ivy dependencies
- implementation 'org.apache.ant:ant:1.9.1'
- implementation 'org.apache.ivy:ivy:2.5.0-rc1'
- implementation 'org.apache.ant:ant-jsch:1.10.5'
- implementation 'org.slf4j:slf4j-simple:1.7.25'
- implementation 'com.io7m.xom:xom:1.2.10'
-}
-
-// Project sources
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- resources {
- srcDir 'resources'
- }
- }
-
- test {
- java {
- srcDir 'test'
- }
- resources {
- srcDir 'resources'
- }
- }
-}
diff --git a/AntTasks/resources/pt/up/fe/specs/ant/tasks/sftp.xml.template b/AntTasks/resources/pt/up/fe/specs/ant/tasks/sftp.xml.template
deleted file mode 100644
index 22fc7cb9..00000000
--- a/AntTasks/resources/pt/up/fe/specs/ant/tasks/sftp.xml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AntTasks/settings.gradle b/AntTasks/settings.gradle
deleted file mode 100644
index fd458edf..00000000
--- a/AntTasks/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-rootProject.name = 'AntTasks'
-
-includeBuild("../jOptions")
-includeBuild("../SpecsUtils")
diff --git a/AntTasks/src/pt/up/fe/specs/ant/AAntTask.java b/AntTasks/src/pt/up/fe/specs/ant/AAntTask.java
deleted file mode 100644
index 17447a10..00000000
--- a/AntTasks/src/pt/up/fe/specs/ant/AAntTask.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.ant;
-
-import org.suikasoft.jOptions.DataStore.ADataClass;
-
-public abstract class AAntTask extends ADataClass implements AntTask {
-
-}
diff --git a/AntTasks/src/pt/up/fe/specs/ant/AntResource.java b/AntTasks/src/pt/up/fe/specs/ant/AntResource.java
deleted file mode 100644
index adda38d8..00000000
--- a/AntTasks/src/pt/up/fe/specs/ant/AntResource.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright 2013 SPeCS Research Group.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.ant;
-
-import pt.up.fe.specs.util.providers.ResourceProvider;
-
-/**
- * @author Joao Bispo
- *
- */
-public enum AntResource implements ResourceProvider {
-
- SFTP_TEMPLATE("sftp.xml.template");
-
- private final String resource;
-
- private static final String BASE_PATH = "pt/up/fe/specs/ant/tasks/";
-
- private AntResource(String resource) {
- this.resource = BASE_PATH + resource;
- }
-
- /* (non-Javadoc)
- * @see pt.up.fe.specs.util.Interfaces.ResourceProvider#getResource()
- */
- @Override
- public String getResource() {
- return resource;
- }
-
-}
diff --git a/AntTasks/src/pt/up/fe/specs/ant/AntTask.java b/AntTasks/src/pt/up/fe/specs/ant/AntTask.java
deleted file mode 100644
index 410a954c..00000000
--- a/AntTasks/src/pt/up/fe/specs/ant/AntTask.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.ant;
-
-import java.io.File;
-import java.util.UUID;
-
-import pt.up.fe.specs.util.SpecsIo;
-
-public interface AntTask {
-
- /**
- *
- * @return the ANT script of this task
- */
- String getScript();
-
- default void run() {
- String scriptName = getClass().getSimpleName() + "_" + UUID.randomUUID().toString() + ".xml";
-
- // Write script to a temporary folder
- File antScript = new File(SpecsAnt.getTemporaryFolder(), scriptName);
-
- // Save script
- SpecsIo.write(antScript, getScript());
-
- SpecsAnt.runAnt(antScript, null);
- }
-}
diff --git a/AntTasks/src/pt/up/fe/specs/ant/SpecsAnt.java b/AntTasks/src/pt/up/fe/specs/ant/SpecsAnt.java
deleted file mode 100644
index c487ca75..00000000
--- a/AntTasks/src/pt/up/fe/specs/ant/SpecsAnt.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.ant;
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-
-import pt.up.fe.specs.util.SpecsIo;
-import pt.up.fe.specs.util.SpecsLogs;
-import pt.up.fe.specs.util.lazy.Lazy;
-
-/**
- * Utility methods related with ANT.
- *
- * @author JoaoBispo
- *
- */
-public class SpecsAnt {
-
- private static final Lazy TEMPORARY_FOLDER = Lazy.newInstance(SpecsAnt::initTempFolder);
-
- private static File initTempFolder() {
- File tempFolder = SpecsIo.getTempFolder("specs_ant");
- SpecsIo.deleteFolderContents(tempFolder);
- return tempFolder;
- }
-
- public static void runAnt(File antScript, String target) {
-
- // Launch ant
- Project project = new Project();
- project.init();
-
- ProjectHelper.configureProject(project, antScript);
-
- project.addBuildListener(SpecsAnt.newStdoutListener());
-
- // Run script
- target = target != null ? target : project.getDefaultTarget();
- project.executeTarget(target);
- }
-
- /**
- * Standard listener for ANT project.
- *
- *
- * Outputs a message when an ANT target starts and finishes.
- *
- * @return
- */
- public static BuildListener newStdoutListener() {
- BuildListener outListener = new BuildListener() {
-
- @Override
- public void taskStarted(BuildEvent arg0) {
- // System.out.println("Task Started: "+arg0.getTask().getTaskName());
- // System.out.println(arg0.getMessage());
- }
-
- @Override
- public void taskFinished(BuildEvent arg0) {
- // System.out.println(arg0.getMessage());
- }
-
- @Override
- public void targetStarted(BuildEvent arg0) {
- SpecsLogs.msgInfo("[ANT]:Started target '" + arg0.getTarget() + "'");
- // System.out.println(arg0.getMessage());
-
- }
-
- @Override
- public void targetFinished(BuildEvent arg0) {
- SpecsLogs.msgInfo("[ANT]:Finished target '" + arg0.getTarget() + "'");
- }
-
- @Override
- public void messageLogged(BuildEvent arg0) {
- // So that it can show errors (e.g., javac)
- if (!arg0.getMessage().startsWith("[") && arg0.getPriority() < 3) {
- SpecsLogs.msgInfo(arg0.getMessage());
- }
- // if (arg0.getPriority() < 3) {
- // System.out.println(arg0.getMessage());
- // }
-
- // SpecsLogs.msgInfo(arg0.getMessage());
- // System.out.println(arg0.getMessage());
-
- }
-
- @Override
- public void buildStarted(BuildEvent arg0) {
- // System.out.println("Build Started");
- }
-
- @Override
- public void buildFinished(BuildEvent arg0) {
- // System.out.println(arg0.getMessage());
-
- }
- };
-
- return outListener;
- }
-
- /**
- * Returns a File object pointing to a file equal to the given, but with another name.
- *
- * @param file
- * @param newName
- * @return
- */
- public static File updateOutput(File file, String newName) {
-
- // If newName is null, return original file
- if (newName == null) {
- return file;
- }
-
- // If newName is the same as the current name, return original file
- if (file.getName().equals(newName)) {
- SpecsLogs.info("New name for file is the same as the current name ('" + newName + "')");
- return file;
- }
-
- // New file in temporary folder
- File tempFolder = getTemporaryFolder();
-
- // Put renamed file in a new folder. If we are in Windows and only the case of the name changes,
- // it will copy the file over itself, producing a file with 0-bytes
- File newOutputFolder = SpecsIo.mkdir(tempFolder, "renamedFile");
-
- File newOutputFile = new File(newOutputFolder, newName);
-
- // Copy file
- SpecsIo.copy(file, newOutputFile);
-
- // Update reference
- file = newOutputFile;
-
- return file;
- }
-
- public static File getTemporaryFolder() {
- return TEMPORARY_FOLDER.get();
- }
-}
diff --git a/AntTasks/src/pt/up/fe/specs/ant/tasks/Sftp.java b/AntTasks/src/pt/up/fe/specs/ant/tasks/Sftp.java
deleted file mode 100644
index 25910611..00000000
--- a/AntTasks/src/pt/up/fe/specs/ant/tasks/Sftp.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.ant.tasks;
-
-import java.io.File;
-
-import org.suikasoft.jOptions.Datakey.DataKey;
-import org.suikasoft.jOptions.Datakey.KeyFactory;
-
-import pt.up.fe.specs.ant.AAntTask;
-import pt.up.fe.specs.ant.AntResource;
-import pt.up.fe.specs.ant.SpecsAnt;
-import pt.up.fe.specs.util.SpecsIo;
-import pt.up.fe.specs.util.utilities.Replacer;
-
-public class Sftp extends AAntTask {
-
- public static final DataKey LOGIN = KeyFactory.string("login");
- public static final DataKey PASS = KeyFactory.string("pass");
- public static final DataKey HOST = KeyFactory.string("host");
- public static final DataKey PORT = KeyFactory.string("port");
- public static final DataKey DESTINATION_FOLDER = KeyFactory.string("destinatonFolder");
- public static final DataKey FILE_TO_TRANSFER = KeyFactory.file("fileToTransfer");
- public static final DataKey NEW_FILENAME = KeyFactory.string("newFilename");
- public static final DataKey COMMANDS_FILE = KeyFactory.file("commandsFile");
-
- @Override
- public String getScript() {
-
- File fileToTransfer = get(FILE_TO_TRANSFER);
-
- if (!fileToTransfer.isFile()) {
- throw new RuntimeException("Could not find file to transfer '" + fileToTransfer + "'");
- }
-
- // Check if it needs a name change
- if (hasValue(NEW_FILENAME)) {
- fileToTransfer = SpecsAnt.updateOutput(fileToTransfer, get(NEW_FILENAME));
- }
-
- Replacer template = new Replacer(AntResource.SFTP_TEMPLATE);
-
- template.replace("", get(LOGIN));
- template.replace("", get(PASS));
- template.replace("", get(HOST));
- template.replace("", get(PORT));
- template.replace("", get(DESTINATION_FOLDER));
-
- template = template.replace("", fileToTransfer.getAbsolutePath());
- template = template.replace("", fileToTransfer.getName());
-
- String commands = getCommands();
- template = template.replace("", commands);
-
- return template.toString();
- }
-
- private String getCommands() {
- if (!hasValue(COMMANDS_FILE)) {
- return "";
- }
-
- String commandsPath = SpecsIo.getCanonicalPath(get(COMMANDS_FILE));
-
- Replacer template = new Replacer(
- "\" trust=\"yes\" username=\"\" password=\"\" commandResource=\"\"/>");
-
- template.replace("", get(LOGIN));
- template.replace("", get(PASS));
- template.replace("", get(HOST));
- template.replace("", commandsPath);
-
- return template.toString();
- }
-}
diff --git a/AntTasks/test/pt/up/fe/specs/ant/TasksTest.java b/AntTasks/test/pt/up/fe/specs/ant/TasksTest.java
deleted file mode 100644
index 34ae00d8..00000000
--- a/AntTasks/test/pt/up/fe/specs/ant/TasksTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.ant;
-
-import java.io.File;
-
-import org.junit.Test;
-
-import pt.up.fe.specs.ant.tasks.Sftp;
-import pt.up.fe.specs.util.SpecsIo;
-
-public class TasksTest {
-
- @Test
- public void testSftp() {
- // Create dummy file for transfer
- File dummyFile = new File("dummmy_file.txt");
- SpecsIo.write(dummyFile, "dummy");
-
- AntTask sftpTask = new Sftp()
- .set(Sftp.LOGIN, "login")
- .set(Sftp.PASS, "pass")
- .set(Sftp.HOST, "host")
- .set(Sftp.PORT, "port")
- .set(Sftp.DESTINATION_FOLDER, "destinationFolder")
- .set(Sftp.NEW_FILENAME, "new_name.txt")
- .set(Sftp.FILE_TO_TRANSFER, dummyFile);
-
- System.out.println("Output:\n" + sftpTask.getScript());
-
- SpecsIo.delete(dummyFile);
- }
-
-}
diff --git a/AsmParser/build.gradle b/AsmParser/build.gradle
deleted file mode 100644
index 1f48c8a3..00000000
--- a/AsmParser/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-plugins {
- id 'distribution'
- id 'java'
-}
-
-java {
- withSourcesJar()
-
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
-}
-
-// Repositories providers
-repositories {
- mavenCentral()
-}
-
-dependencies {
- testImplementation "junit:junit:4.13.1"
-
- implementation ':SpecsUtils'
- implementation ':jOptions'
-
- implementation 'com.google.code.gson:gson:2.12.1'
-}
-
-// Project sources
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- resources {
- srcDir 'resources'
- }
- }
- test {
- java {
- srcDir 'test'
- }
- resources {
- srcDir 'test'
- }
- }
-}
diff --git a/AsmParser/resources/pt/up/fe/specs/asmparser/example.json b/AsmParser/resources/pt/up/fe/specs/asmparser/example.json
deleted file mode 100644
index 7ca9f2bf..00000000
--- a/AsmParser/resources/pt/up/fe/specs/asmparser/example.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "fields": [
- "registerd",
- "registers",
- "opcodea",
- "imm"
- ],
-
- "instructions": {
- "type1": "100101_registerd(5)_1000_opcodea(1)_0_imm(15)",
- "type2": "100101_0_opcodea(1)_000_registera(5)_11_registers(14)"
- }
-
-
-}
\ No newline at end of file
diff --git a/AsmParser/settings.gradle b/AsmParser/settings.gradle
deleted file mode 100644
index 4c233b5d..00000000
--- a/AsmParser/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-rootProject.name = 'AsmParser'
-
-includeBuild("../SpecsUtils")
-includeBuild("../jOptions")
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/ExtractResult.java b/AsmParser/src/pt/up/fe/specs/asmparser/ExtractResult.java
deleted file mode 100644
index d256b4d4..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/ExtractResult.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package pt.up.fe.specs.asmparser;
-
-public record ExtractResult(String currentString, int amount) {
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/InstructionFormatParser.java b/AsmParser/src/pt/up/fe/specs/asmparser/InstructionFormatParser.java
deleted file mode 100644
index c224f02f..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/InstructionFormatParser.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.suikasoft.jOptions.Interfaces.DataStore;
-import org.suikasoft.jOptions.storedefinition.StoreDefinitions;
-
-import pt.up.fe.specs.asmparser.ast.ConstantNode;
-import pt.up.fe.specs.asmparser.ast.FieldNode;
-import pt.up.fe.specs.asmparser.ast.IgnoreNode;
-import pt.up.fe.specs.asmparser.ast.InstructionFormatNode;
-import pt.up.fe.specs.asmparser.ast.RuleNode;
-import pt.up.fe.specs.asmparser.parser32bit.Asm32bitParser;
-import pt.up.fe.specs.binarytranslation.asm.parsing.AsmFieldData;
-import pt.up.fe.specs.binarytranslation.asm.parsing.AsmFieldType;
-import pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser.BinaryAsmInstructionParser;
-import pt.up.fe.specs.util.SpecsStrings;
-import pt.up.fe.specs.util.SpecsSystem;
-
-public class InstructionFormatParser {
-
- public static void main(String[] args) {
- SpecsSystem.programStandardInit();
-
- // var rule = new InstructionFormatParser().parse("100101_registerd(5)_1000_opcodea(1)_0_imm(15)");
-
- var rule2 = new InstructionFormatParser().parse("0110_xx_registerd(5)_1000_opcodea(1)_0_imm(15)");
-
- System.out.println(rule2.toTree());
-
- var parser2 = Asm32bitParser.build(0, rule2);
- var res = parser2.parse(Long.parseLong("01100011111100000010101010101101", 2));
-
- System.out.println("RES: " + Arrays.toString(res));
-
- test();
- }
-
- enum TestAsmField implements AsmFieldType {
- INST1,
- INST2;
- }
-
- private static void test() {
- var addr = "0000";
- var rule = "0110_xx_registerd(5)_1000_opcodea(1)_0_imm(15)";
- var instruction = "01100011111100000010101010101101";
- var instructionHex = Long.toString(Long.parseLong(instruction, 2), 16);
- var instructionLong = Long.parseLong(instruction, 2);
- var iterations = 1_000_000;
-
- // String-based
- var stringParser = new BinaryAsmInstructionParser(TestAsmField.INST1, rule, null);
-
- var start1 = System.nanoTime();
- var acc1 = 0l;
- for (int i = 0; i < iterations; i++) {
- var res = stringParser.parse(addr, instructionHex);
- var fieldValueString = res.get().get(AsmFieldData.FIELDS).get("registerd");
- var fieldValue = Integer.parseInt(fieldValueString, 2);
- acc1 += fieldValue;
- }
- SpecsStrings.printTime("String parsing", start1);
- System.out.println("String result: " + acc1);
-
- // Long based
- var astRule = new InstructionFormatParser().parse(rule);
- var longParser = Asm32bitParser.build(0, astRule);
-
- var start2 = System.nanoTime();
- var acc2 = 0l;
- for (int i = 0; i < iterations; i++) {
- var res = longParser.parse(instructionLong);
- var fieldValue = res[1];
- acc2 += fieldValue;
- }
- SpecsStrings.printTime("Long parsing", start2);
- System.out.println("Long result: " + acc2);
-
- }
-
- public RuleNode parse(String instructionFormatRule) {
- String currentRule = instructionFormatRule;
-
- var root = newNode(RuleNode.class);
-
- while (!currentRule.isEmpty()) {
- // Ignore underscore
- if (currentRule.startsWith("_")) {
- currentRule = currentRule.substring(1);
- continue;
- }
-
- // If 0 or 1, create constant rule
- if (currentRule.startsWith("0") || currentRule.startsWith("1")) {
- String constString = currentRule.substring(0, 1);
- currentRule = currentRule.substring(1);
-
- // Check if has ()
- var result = extractAmount(currentRule, instructionFormatRule);
- if (result != null) {
- constString = SpecsStrings.buildLine(constString, result.amount());
- currentRule = result.currentString();
- }
-
- var constant = newNode(ConstantNode.class);
- constant.set(InstructionFormatNode.NUM_BITS, constString.length());
- constant.set(ConstantNode.LITERAL, constString);
- root.addChild(constant);
- continue;
- }
-
- // If x, create ignore rule
- if (currentRule.startsWith("x")) {
- int amount = 1;
- currentRule = currentRule.substring(1);
-
- // Check if has ()
- var result = extractAmount(currentRule, instructionFormatRule);
- if (result != null) {
- amount = result.amount();
- currentRule = result.currentString();
- }
-
- var ignore = newNode(IgnoreNode.class);
- ignore.set(InstructionFormatNode.NUM_BITS, amount);
- root.addChild(ignore);
- continue;
- }
-
- // Otherwise, interpret as a field with ()
- int startIndex = currentRule.indexOf('(');
- if (startIndex == -1) {
- throw new RuntimeException("Expected field name to have () associated: " + instructionFormatRule);
- }
-
- String fieldName = currentRule.substring(0, startIndex);
- currentRule = currentRule.substring(startIndex);
- var result = extractAmount(currentRule, instructionFormatRule);
-
- var field = newNode(FieldNode.class);
- field.set(InstructionFormatNode.NUM_BITS, result.amount());
- field.set(FieldNode.FIELD, fieldName);
- root.addChild(field);
-
- currentRule = result.currentString();
- }
-
- // Rules could be optimized - e.g., fuse constant rules together
- // System.out.println("RULES: " + rules);
- // return rules;
-
- // Fuse rules that are next to each other
- collapseConstantNodes(root);
- collapseIgnoreNodes(root);
-
- return root;
- }
-
- private void collapseConstantNodes(RuleNode root) {
- // Collapse sequential ConstantNodes
-
- var newChildren = new ArrayList();
-
- ConstantNode currentConstant = null;
- for (var child : root.getChildren()) {
-
- if (!(child instanceof ConstantNode)) {
- // If current constant not null, store it
- if (currentConstant != null) {
- newChildren.add(currentConstant);
- currentConstant = null;
- }
-
- // Just add node
- newChildren.add(child);
- continue;
- }
-
- // Is constant node
- var constant = (ConstantNode) child;
- var numBits = constant.get(InstructionFormatNode.NUM_BITS);
- var literal = constant.get(ConstantNode.LITERAL);
-
- if (currentConstant == null) {
- currentConstant = newNode(ConstantNode.class);
- } else {
- numBits = currentConstant.get(InstructionFormatNode.NUM_BITS) + numBits;
- literal = currentConstant.get(ConstantNode.LITERAL) + literal;
- }
-
- currentConstant.set(InstructionFormatNode.NUM_BITS, numBits);
- currentConstant.set(ConstantNode.LITERAL, literal);
- }
-
- // If current constant not null, store it
- if (currentConstant != null) {
- newChildren.add(currentConstant);
- currentConstant = null;
- }
-
- // Set children
- root.setChildren(newChildren);
-
- }
-
- private void collapseIgnoreNodes(RuleNode root) {
- // Collapse sequential IgnoreNodes
-
- var newChildren = new ArrayList();
-
- IgnoreNode currentIgnore = null;
- for (var child : root.getChildren()) {
-
- if (!(child instanceof IgnoreNode)) {
- // If current ignore not null, store it
- if (currentIgnore != null) {
- newChildren.add(currentIgnore);
- currentIgnore = null;
- }
-
- // Just add node
- newChildren.add(child);
- continue;
- }
-
- // Is ignore node
- var ignore = (IgnoreNode) child;
- var numBits = ignore.get(InstructionFormatNode.NUM_BITS);
-
- if (currentIgnore == null) {
- currentIgnore = newNode(IgnoreNode.class);
- } else {
- numBits = currentIgnore.get(InstructionFormatNode.NUM_BITS) + numBits;
- }
-
- currentIgnore.set(InstructionFormatNode.NUM_BITS, numBits);
- }
-
- // If current ignore not null, store it
- if (currentIgnore != null) {
- newChildren.add(currentIgnore);
- currentIgnore = null;
- }
-
- // Set children
- root.setChildren(newChildren);
-
- }
-
- private static ExtractResult extractAmount(String currentRule, String fullRule) {
- if (!currentRule.startsWith("(")) {
- return null;
- }
-
- int endIndex = currentRule.indexOf(')');
- if (endIndex == -1) {
- throw new RuntimeException("Unbalanced parenthesis on rule: " + fullRule);
- }
-
- int amount = Integer.parseInt(currentRule.substring(1, endIndex));
- String updatedCurrentRule = currentRule.substring(endIndex + 1);
-
- return new ExtractResult(updatedCurrentRule, amount);
- }
-
- private DataStore newDataStore(Class nodeClass) {
- return DataStore.newInstance(StoreDefinitions.fromInterface(nodeClass), true);
- }
-
- private T newNode(Class nodeClass) {
- var data = newDataStore(nodeClass);
-
- try {
- return nodeClass.getConstructor(DataStore.class, Collection.class).newInstance(data, null);
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | NoSuchMethodException | SecurityException e) {
- throw new RuntimeException("Could not create node", e);
- }
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/Isa32bitParser.java b/AsmParser/src/pt/up/fe/specs/asmparser/Isa32bitParser.java
deleted file mode 100644
index 24c9fcf9..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/Isa32bitParser.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package pt.up.fe.specs.asmparser;
-
-import com.google.gson.Gson;
-import pt.up.fe.specs.asmparser.ast.FieldNode;
-import pt.up.fe.specs.asmparser.ast.RuleNode;
-import pt.up.fe.specs.asmparser.parser32bit.Asm32bitParser;
-import pt.up.fe.specs.util.SpecsIo;
-
-import java.util.*;
-
-public class Isa32bitParser {
-
- public static void main(String[] args) {
- var isaParser = newInstance(SpecsIo.getResource(() -> "pt/up/fe/specs/binarytranslation/asm/parsing/asm_test.json"));
-
- //"0110_xx_registerd(5)_1000_opcode(1)_0_imm(15)"
- // 31, 1, 10925
- var decoded = isaParser.parse(Long.parseLong("01100011111100010010101010101101", 2));
- System.out.println(Arrays.toString(decoded));
- }
-
-
- private final List parsers;
- private final Map fieldsMap;
-
- private Isa32bitParser(List parsers, Map fieldsMap) {
- this.parsers = parsers;
- this.fieldsMap = fieldsMap;
- }
-
-
- public static Isa32bitParser newInstance(String jsonContents) {
- var isa = new Gson().fromJson(jsonContents, Map.class);
-
- //var fields = new LinkedHashSet<>((List) isa.get("fields"));
-
- // Maps a field to an index
- var fieldsMap = new HashMap();
-
- // Index 0 is id of format
- var fieldId = 1;
- for (var field : (List) isa.get("fields")) {
- fieldsMap.put(field, fieldId);
- fieldId++;
- }
-
-// System.out.println("FIELDS MAP: " + fieldsMap);
-
- int id = 0;
- var parsers = new ArrayList();
- for (var format : (List) isa.get("formats")) {
-
- // Parse format
- var rule = new InstructionFormatParser().parse(format);
-
- // Verify rule
- verify(rule, format, fieldsMap.keySet());
-
- // Create parser
- var parser = Asm32bitParser.build(id, rule, fieldsMap);
- parsers.add(parser);
- id++;
- }
-
-
- return new Isa32bitParser(parsers, fieldsMap);
- }
-
- private static void verify(RuleNode rule, String format, Set fields) {
- // Go to all fields, check they are declared
- var invalidField = rule.getDescendants(FieldNode.class).stream()
- .filter(node -> !fields.contains(node.getField()))
- .findFirst()
- .orElse(null);
-
-
- if (invalidField != null) {
- throw new RuntimeException("Found undeclared field '" + invalidField.getField() + "' in format rule '" + format + "'");
- }
-
- }
-
- public Map getFieldsMap() {
- return fieldsMap;
- }
-
- public int[] parse(long instruction) {
- // Iterate over all parsers, looking for one that accepts the instruction
- for (var parser : parsers) {
- var decoded = parser.parse(instruction);
-
- // Could not decode, skip
- if (decoded == null) {
- continue;
- }
-
- // Decoded, return
- return decoded;
- }
-
- throw new RuntimeException("Could not decode instruction 0x" + Long.toString(instruction, 16));
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/ast/ConstantNode.java b/AsmParser/src/pt/up/fe/specs/asmparser/ast/ConstantNode.java
deleted file mode 100644
index 3435bde2..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/ast/ConstantNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.ast;
-
-import java.util.Collection;
-
-import org.suikasoft.jOptions.Datakey.DataKey;
-import org.suikasoft.jOptions.Datakey.KeyFactory;
-import org.suikasoft.jOptions.Interfaces.DataStore;
-
-public class ConstantNode extends InstructionFormatNode {
-
- public static final DataKey LITERAL = KeyFactory.string("literal");
-
- public ConstantNode(DataStore data, Collection children) {
- super(data, children);
- }
-
- public int getLiteralAsInt() {
- return Integer.parseInt(get(LITERAL), 2);
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/ast/FieldNode.java b/AsmParser/src/pt/up/fe/specs/asmparser/ast/FieldNode.java
deleted file mode 100644
index b76810be..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/ast/FieldNode.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.ast;
-
-import java.util.Collection;
-
-import org.suikasoft.jOptions.Datakey.DataKey;
-import org.suikasoft.jOptions.Datakey.KeyFactory;
-import org.suikasoft.jOptions.Interfaces.DataStore;
-
-public class FieldNode extends InstructionFormatNode {
-
- public static final DataKey FIELD = KeyFactory.string("field");
-
- public FieldNode(DataStore data, Collection children) {
- super(data, children);
- }
-
- public String getField() {
- return get(FIELD);
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/ast/IgnoreNode.java b/AsmParser/src/pt/up/fe/specs/asmparser/ast/IgnoreNode.java
deleted file mode 100644
index 4d57032f..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/ast/IgnoreNode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.ast;
-
-import java.util.Collection;
-
-import org.suikasoft.jOptions.Interfaces.DataStore;
-
-public class IgnoreNode extends InstructionFormatNode {
-
- public IgnoreNode(DataStore data, Collection children) {
- super(data, children);
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/ast/InstructionFormatNode.java b/AsmParser/src/pt/up/fe/specs/asmparser/ast/InstructionFormatNode.java
deleted file mode 100644
index 724fe048..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/ast/InstructionFormatNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.ast;
-
-import java.util.Collection;
-
-import org.suikasoft.jOptions.Datakey.DataKey;
-import org.suikasoft.jOptions.Datakey.KeyFactory;
-import org.suikasoft.jOptions.Interfaces.DataStore;
-import org.suikasoft.jOptions.treenode.DataNode;
-
-public class InstructionFormatNode extends DataNode {
-
- public static final DataKey NUM_BITS = KeyFactory.integer("numBits", -1);
-
- public InstructionFormatNode(DataStore data, Collection children) {
- super(data, children);
- }
-
- @Override
- protected Class getBaseClass() {
- return InstructionFormatNode.class;
- }
-
- public int getNumBits() {
- return get(NUM_BITS);
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/ast/RuleNode.java b/AsmParser/src/pt/up/fe/specs/asmparser/ast/RuleNode.java
deleted file mode 100644
index 42a536cb..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/ast/RuleNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.ast;
-
-import java.util.Collection;
-
-import org.suikasoft.jOptions.Interfaces.DataStore;
-
-public class RuleNode extends InstructionFormatNode {
-
- public RuleNode(DataStore data, Collection children) {
- super(data, children);
- }
-
- /**
- *
- * @return the total number of bits covered by this rule
- */
- public int getTotalBits() {
- return getChildren().stream()
- .mapToInt(n -> n.get(InstructionFormatNode.NUM_BITS))
- .sum();
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/Asm32bitParser.java b/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/Asm32bitParser.java
deleted file mode 100644
index fd88e1bf..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/Asm32bitParser.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.parser32bit;
-
-import pt.up.fe.specs.asmparser.ast.*;
-import pt.up.fe.specs.asmparser.parser32bit.rules.Asm32bitConstantRule;
-import pt.up.fe.specs.asmparser.parser32bit.rules.Asm32bitFieldRule;
-import pt.up.fe.specs.asmparser.parser32bit.rules.Asm32bitIgnoreRule;
-import pt.up.fe.specs.asmparser.parser32bit.rules.Asm32bitRule;
-import pt.up.fe.specs.util.exceptions.NotImplementedException;
-
-import java.util.List;
-import java.util.Map;
-
-public class Asm32bitParser {
-
- private final int id;
- private final List rules;
- private final Map fieldsMap;
-
- private final int numFields;
- private final int[] fieldIndexes;
-
- private Asm32bitParser(int id, List rules, Map fieldsMap) {
- this.id = id;
- this.rules = rules;
- this.fieldsMap = fieldsMap;
- this.fieldIndexes = buildFieldsIndexes(rules, fieldsMap);
- this.numFields = fieldIndexes.length;
- }
-
- private int[] buildFieldsIndexes(List rules, Map fieldsMap) {
- var fieldRules = rules.stream()
- .filter(rule -> rule instanceof Asm32bitFieldRule)
- .map(Asm32bitFieldRule.class::cast)
- .toList();
-
- var numFields = fieldsMap != null ? fieldsMap.size() : fieldRules.size();
-
- var fieldIndexes = new int[numFields];
-
- // If no map, just fill with indexes from 1 to N
- if (fieldsMap == null) {
- for (int i = 0; i < numFields; i++) {
- fieldIndexes[i] = i + 1;
- }
- } else {
- // Iterate over all rules with fields, store the corresponding index
- for (int i = 0; i < fieldRules.size(); i++) {
- fieldIndexes[i] = fieldsMap.get(fieldRules.get(i).getField());
- }
- }
-
- return fieldIndexes;
- }
-
- public int[] parse(long instruction) {
-
- // First element contains instruction format id
- int[] decoded = new int[1 + numFields];
- decoded[0] = id;
-
- //int fieldIndex = 1;
- int fieldIndex = 0;
- int startIndex = 0;
-
- // Iterate over all rules
- for (var rule : rules) {
- var res = rule.parse(instruction, startIndex);
-
- // If res null, parsing failed
- if (res == null) {
- return null;
- }
-
- // If rule extracts a value, store it
- if (rule instanceof Asm32bitFieldRule) {
- decoded[fieldIndexes[fieldIndex]] = res.value();
- fieldIndex++;
- }
-
- // Update start index
- startIndex = res.nextIndex();
- }
-
- return decoded;
- }
-
- public static Asm32bitParser build(int id, RuleNode rule) {
- return build(id, rule, null);
- }
-
- public static Asm32bitParser build(int id, RuleNode rule, Map fieldsMap) {
- // Check if total bits is 32
- var totalBits = rule.getTotalBits();
- if (totalBits != 32) {
- throw new RuntimeException("Given rule represents " + totalBits + " bits, only 32 bits are supported.");
- }
-
- var rules = rule.getChildren().stream()
- .map(Asm32bitParser::convert)
- .toList();
-
- return new Asm32bitParser(id, rules, fieldsMap);
- }
-
- private static Asm32bitRule convert(InstructionFormatNode node) {
- if (node instanceof ConstantNode constantNode) {
- return new Asm32bitConstantRule(constantNode.getLiteralAsInt(), constantNode.getNumBits());
- }
-
- if (node instanceof IgnoreNode) {
- return new Asm32bitIgnoreRule(node.getNumBits());
- }
-
- if (node instanceof FieldNode fieldNode) {
- return new Asm32bitFieldRule(fieldNode.getField(), fieldNode.getNumBits());
- }
-
- throw new NotImplementedException(node.getClass());
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/Asm32bitResult.java b/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/Asm32bitResult.java
deleted file mode 100644
index 469550a4..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/Asm32bitResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.parser32bit;
-
-public record Asm32bitResult(int nextIndex, int value) {
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitConstantRule.java b/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitConstantRule.java
deleted file mode 100644
index abba6b7c..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitConstantRule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.parser32bit.rules;
-
-import pt.up.fe.specs.asmparser.parser32bit.Asm32bitResult;
-import pt.up.fe.specs.util.SpecsBits;
-
-public class Asm32bitConstantRule implements Asm32bitRule {
-
- private final long literal;
- private final int numBits;
- private final long mask;
-
- public Asm32bitConstantRule(long literal, int numBits) {
- // System.out.println("Const literal: " + literal);
- this.literal = literal;
- this.numBits = numBits;
- this.mask = SpecsBits.mask(-1, numBits);
- // System.out.println("Num bits: " + numBits + "; Mask: " + Long.toBinaryString(mask));
- }
-
- @Override
- public Asm32bitResult parse(long asm, int startIndex) {
-
- // Shift instruction the 32 bits, except the startIndex and num bits
- var shiftAmount = 32 - numBits - startIndex;
-
- // System.out.println("ORIGINAL: " + Long.toBinaryString(asm));
- var asmShifted = asm >> shiftAmount;
- // System.out.println("SHIFTED: " + Long.toBinaryString(asmShifted));
-
- var asmFiltered = asmShifted & mask;
-
- // System.out.println("FILTERED: " + Long.toBinaryString(asmFiltered));
-
- // System.out.println("LITERAL: " + Long.toBinaryString(literal));
-
- // System.out.println("SAME? " + (literal == asmFiltered));
-
- if (literal != asmFiltered) {
- return null;
- }
-
- // Passed rule
- return new Asm32bitResult(startIndex + numBits, 0);
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitFieldRule.java b/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitFieldRule.java
deleted file mode 100644
index 53e1c8c4..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitFieldRule.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.parser32bit.rules;
-
-import pt.up.fe.specs.asmparser.parser32bit.Asm32bitResult;
-import pt.up.fe.specs.util.SpecsBits;
-
-public class Asm32bitFieldRule implements Asm32bitRule {
-
- private final String field;
- private final int numBits;
- private final long mask;
-
- public Asm32bitFieldRule(String field, int numBits) {
- this.field = field;
- this.numBits = numBits;
- this.mask = SpecsBits.mask(-1, numBits);
- }
-
- public String getField() {
- return field;
- }
-
- @Override
- public Asm32bitResult parse(long asm, int startIndex) {
-
- // Shift instruction the 32 bits, except the startIndex and num bits
- var shiftAmount = 32 - numBits - startIndex;
-
- var asmShifted = asm >> shiftAmount;
-
- var asmFiltered = asmShifted & mask;
-
- // Passed rule
- return new Asm32bitResult(startIndex + numBits, (int) asmFiltered);
- }
-
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitIgnoreRule.java b/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitIgnoreRule.java
deleted file mode 100644
index 31a609b9..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitIgnoreRule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.parser32bit.rules;
-
-import pt.up.fe.specs.asmparser.parser32bit.Asm32bitResult;
-
-public class Asm32bitIgnoreRule implements Asm32bitRule {
-
- private final int numBits;
-
- public Asm32bitIgnoreRule(int numBits) {
- this.numBits = numBits;
- }
-
- @Override
- public Asm32bitResult parse(long asm, int startIndex) {
-
- // Just ignore bits
- return new Asm32bitResult(startIndex + numBits, 0);
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitRule.java b/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitRule.java
deleted file mode 100644
index 8ed8c5de..00000000
--- a/AsmParser/src/pt/up/fe/specs/asmparser/parser32bit/rules/Asm32bitRule.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.asmparser.parser32bit.rules;
-
-import pt.up.fe.specs.asmparser.parser32bit.Asm32bitResult;
-
-public interface Asm32bitRule {
-
- Asm32bitResult parse(long asm, int startIndex);
-
-// default boolean hasValue() {
-// return false;
-// }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AIsaParser.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AIsaParser.java
deleted file mode 100644
index f4436ac3..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AIsaParser.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- *
- * @author Nuno
- *
- */
-public abstract class AIsaParser implements IsaParser {
-
- private final List instructionParsers;
- private final Set allowedFields;
-
- public AIsaParser(List instructionParsers, Set allowedFields) {
- this.instructionParsers = instructionParsers;
- this.allowedFields = allowedFields;
- }
-
- public AIsaParser(List instructionParsers) {
- this(instructionParsers, null);
- }
-
- protected AsmFieldData doparse(String addr, String instruction) {
- // Iterate over all parsers
- for (var parser : instructionParsers) {
- var instData = parser.parse(addr, instruction).orElse(null);
-
- // Parser not successful, try next one
- if (instData == null) {
- continue;
- }
-
- // If allowed fields set, test parsed fields
- if (allowedFields != null) {
- var fields = instData.get(AsmFieldData.FIELDS);
-
- if (!allowedFields.containsAll(fields.keySet())) {
- Set undefinedKeys = new HashSet<>(fields.keySet());
- undefinedKeys.removeAll(allowedFields);
-
- throw new RuntimeException(
- "Found undefined fields: " + undefinedKeys + "\nAllowed fields: " + allowedFields);
- }
-
- }
-
- return instData;
- }
-
- throw new RuntimeException("Could not parse instruction: " + instruction);
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmField.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmField.java
deleted file mode 100644
index 5bf4fb61..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmField.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-public interface AsmField {
-
- /*
- *
- */
- public String getFieldName();
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldData.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldData.java
deleted file mode 100644
index 2fc42a14..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldData.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Objects;
-
-import org.suikasoft.jOptions.DataStore.ADataClass;
-import org.suikasoft.jOptions.Datakey.DataKey;
-import org.suikasoft.jOptions.Datakey.KeyFactory;
-
-/**
- * Raw field data as extracted by an {@link IsaParser}
- *
- * @author NunoPaulino
- *
- */
-public class AsmFieldData extends ADataClass {
-
- /*
- * Addr of this instruction
- */
- public static final DataKey ADDR = KeyFactory.object("addr", Number.class);
-
- /*
- * This datakey only holds the instruction type (i.e., binary instruction format as specified in the parsers)
- */
- public static final DataKey TYPE = KeyFactory.object("type", AsmFieldType.class);
-
- /*
- * This map contains the field names specified in the parsers, and their values
- */
- public static final DataKey> FIELDS = KeyFactory.generic("fields",
- (Map) new LinkedHashMap());
-
- /*
- * Constructor
- */
- public AsmFieldData(Number addr, AsmFieldType type, Map fields) {
- set(ADDR, addr);
- set(TYPE, type);
- set(FIELDS, fields);
- }
-
- /*
- *
- */
- public Number getAddr() {
- return this.get(ADDR);
- }
-
- /*
- * Get type of instruction as defined by parsers, and in implementations of AsmInstructionType
- */
- public AsmFieldType getType() {
- return this.get(TYPE);
- }
-
- /*
- * Get all fields
- */
- public Map getFields() {
- return this.get(FIELDS);
- }
-
- /*
- * Reduces all fields with prefix name "opcode" to a single sequence of bits
- */
- public int getReducedOpcode() {
- String tmp = "";
- var map1 = this.get(FIELDS);
- var keys1 = map1.keySet();
-
- for (String key : keys1) {
- if (key.contains("opcode")) {
- tmp = tmp + map1.get(key);
- }
- }
-
- if (tmp.isEmpty())
- return 0;
-
- return Integer.parseInt(tmp, 2);
- }
-
- public int getFieldAsBinaryInteger(String fieldName) {
- var valueString = get(AsmFieldData.FIELDS).get(fieldName);
- Objects.requireNonNull(valueString, () -> "No value found for field " + fieldName);
- return Integer.parseInt(valueString, 2);
- }
-
- /*
- * Gets a list of integers which represent the operands in the fields
- * This manner of field parsing, maintains the operand order as parsed
- * in the AsmFields
- *
- * (Must be implemented by children)
- */
- /*
- public List getOperands(RegisterDump registers) { // TODO: pass RegisterDump here, so that the
- // List in the Instruction
- // class has the value of the register
- throw new NotImplementedException("getOperands()");
- }
- // TODO: find out a way to make this class abstract!
- */
- /*
- * Get target of branch if instruction is branch
- *
- * (Must be implemented by children)
- */
- /*
- public Number getBranchTarget(RegisterDump dump) {
- throw new NotImplementedException("getBranchTarget()");
- }
- // TODO: find out a way to make this class abstract!
- */
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldType.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldType.java
deleted file mode 100644
index 5b062dbf..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-/**
- * Represents the general type of a particular assembly instruction.
- *
- * @author JoaoBispo
- *
- */
-public interface AsmFieldType {
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmParser.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmParser.java
deleted file mode 100644
index d64146f8..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmParser.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-import java.util.Optional;
-
-/**
- *
- * @author Nuno
- *
- */
-public interface AsmParser {
-
- /**
- * Receives a string with the assembly instruction, if the given instruction respects the format, returns the parsed
- * data, otherwise returns an empty Optional.
- *
- * @param binaryString
- * @return
- */
- Optional parse(String addr, String asmInstruction);
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/Dummy.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/Dummy.java
deleted file mode 100644
index d0fb4554..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/Dummy.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-public class Dummy {
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/IsaParser.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/IsaParser.java
deleted file mode 100644
index 8a3e6778..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/IsaParser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-public interface IsaParser {
-
- /**
- * Parses an instruction in String format, or throws exception if it could not be parsed.
- *
- * @param instruction
- * @return
- */
- AsmFieldData parse(String addr, String instruction);
-
- default AsmFieldData parse(String instruction) {
- return this.parse("0", instruction);
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/BinaryAsmInstructionParser.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/BinaryAsmInstructionParser.java
deleted file mode 100644
index 8bfe0f2a..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/BinaryAsmInstructionParser.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Predicate;
-
-import pt.up.fe.specs.binarytranslation.asm.parsing.AsmFieldData;
-import pt.up.fe.specs.binarytranslation.asm.parsing.AsmFieldType;
-import pt.up.fe.specs.binarytranslation.asm.parsing.AsmParser;
-import pt.up.fe.specs.util.SpecsStrings;
-import pt.up.fe.specs.util.stringparser.StringParser;
-
-/**
- * Parses a binary string representing an instruction, according to a given rule in String format.
- *
- *
- * Parsing rules:
- * - 0, 1 and x match a 0, 1 and both 0 and 1;
- * - FIELD(NUM_BITS) will capture NUM_BITS and store them with the key FIELD;
- * - 0, 1 and x can also have () to specify a number of bits to match (e.g., 0(11));
- * - Underscores can be used to separate components (e.g., 0_Rd(10)_x(11)_SHIFT_AMOUNT(3));
- *
- * @author JoaoBispo
- *
- */
-public class BinaryAsmInstructionParser implements AsmParser {
-
- private final AsmFieldType type;
- private final List rules;
- private final Predicate> predicate;
-
- public BinaryAsmInstructionParser(AsmFieldType type, String rule,
- Predicate> predicate) {
-
- this(type, parseBinaryAsmRule(rule), predicate);
- }
-
- private BinaryAsmInstructionParser(AsmFieldType type, List rules,
- Predicate> predicate) {
-
- this.type = type;
- this.rules = rules;
- this.predicate = predicate;
- }
-
- private static List parseBinaryAsmRule(String rule) {
- String currentRule = rule;
-
- List rules = new ArrayList<>();
- while (!currentRule.isEmpty()) {
- // Ignore underscore
- if (currentRule.startsWith("_")) {
- currentRule = currentRule.substring(1);
- continue;
- }
-
- // If 0 or 1, create constant rule
- if (currentRule.startsWith("0") || currentRule.startsWith("1")) {
- String constString = currentRule.substring(0, 1);
- currentRule = currentRule.substring(1);
-
- // Check if has ()
- var result = extractAmount(currentRule, rule);
- if (result != null) {
- constString = SpecsStrings.buildLine(constString, result.getAmount());
- currentRule = result.getCurrentString();
- }
-
- rules.add(new ConstantRule(constString));
- continue;
- }
-
- // If x, create ignore rule
- if (currentRule.startsWith("x")) {
- int amount = 1;
- currentRule = currentRule.substring(1);
-
- // Check if has ()
- var result = extractAmount(currentRule, rule);
- if (result != null) {
- amount = result.getAmount();
- currentRule = result.getCurrentString();
- }
-
- rules.add(new IgnoreRule(amount));
- continue;
- }
-
- // Otherwise, interpret as a field with ()
- int startIndex = currentRule.indexOf('(');
- if (startIndex == -1) {
- throw new RuntimeException("Expected field name to have () associated: " + rule);
- }
-
- String fieldName = currentRule.substring(0, startIndex);
- currentRule = currentRule.substring(startIndex);
- var result = extractAmount(currentRule, rule);
-
- rules.add(new FieldRule(fieldName, result.getAmount()));
- currentRule = result.getCurrentString();
- }
-
- // Rules could be optimized - e.g., fuse constant rules together
- // System.out.println("RULES: " + rules);
- return rules;
- }
-
- private static ExtractResult extractAmount(String currentRule, String fullRule) {
- if (!currentRule.startsWith("(")) {
- return null;
- }
-
- int endIndex = currentRule.indexOf(')');
- if (endIndex == -1) {
- throw new RuntimeException("Unbalanced parenthesis on rule: " + fullRule);
- }
-
- int amount = Integer.parseInt(currentRule.substring(1, endIndex));
- String updatedCurrentRule = currentRule.substring(endIndex + 1);
-
- return new ExtractResult(updatedCurrentRule, amount);
- }
-
- static class ExtractResult {
- private final String currentString;
- private final int amount;
-
- public ExtractResult(String currentString, int amount) {
- this.currentString = currentString;
- this.amount = amount;
- }
-
- public int getAmount() {
- return amount;
- }
-
- public String getCurrentString() {
- return currentString;
- }
-
- }
-
- @Override
- public Optional parse(String addr, String asmInstruction) {
-
- long aux = Long.parseLong(asmInstruction, 16);
- var binaryString = Long.toBinaryString(aux);
- binaryString = SpecsStrings.padLeft(binaryString, 32, '0');
-
- var currentString = new StringParser(binaryString);
- Map fields = new LinkedHashMap<>();
-
- for (var rule : rules) {
- boolean success = rule.apply(currentString, fields);
-
- if (!success) {
- return Optional.empty();
- }
- }
-
- // All rules applied successfully, check if string was completely consume
- if (!currentString.isEmpty()) {
- throw new RuntimeException("All rules where successfully applied, but instruction '" + asmInstruction
- + "' was not completely consumed: '" + currentString + "'");
- }
-
- // If predicate is defined, check if it passes
- if (predicate != null && !predicate.test(fields)) {
- return Optional.empty();
- }
-
- return Optional.of(new AsmFieldData(Long.parseLong(addr, 16), type, fields)); // TODO: return "fields" as
- // optional??
- }
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/BinaryAsmRule.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/BinaryAsmRule.java
deleted file mode 100644
index 75df5896..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/BinaryAsmRule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser;
-
-import java.util.Map;
-
-import pt.up.fe.specs.util.stringparser.StringParser;
-
-public interface BinaryAsmRule {
-
- /**
- * Applies a parsing rule to the current string being parsed.
- *
- * @param currentString
- * @param fields
- * @return true if parsing was successful, false otherwise
- */
- boolean apply(StringParser currentString, Map fields);
-
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/ConstantRule.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/ConstantRule.java
deleted file mode 100644
index 1ff3887b..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/ConstantRule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser;
-
-import java.util.Map;
-
-import pt.up.fe.specs.util.SpecsStrings;
-import pt.up.fe.specs.util.stringparser.StringParser;
-import pt.up.fe.specs.util.stringparser.StringParsers;
-
-public class ConstantRule implements BinaryAsmRule {
-
- private final String string;
-
- public ConstantRule(String string) {
- this.string = string;
- }
-
- public ConstantRule(char c, int numChars) {
- this(SpecsStrings.buildLine(Character.toString(c), numChars));
- }
-
- @Override
- public boolean apply(StringParser currentString, Map fields) {
- return currentString.apply(StringParsers::checkStringStarts, string).isPresent();
- }
-
- @Override
- public String toString() {
- return "Constant " + string;
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/FieldRule.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/FieldRule.java
deleted file mode 100644
index 8b008efc..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/FieldRule.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser;
-
-import java.util.Map;
-
-import pt.up.fe.specs.util.SpecsLogs;
-import pt.up.fe.specs.util.stringparser.StringParser;
-
-public class FieldRule implements BinaryAsmRule {
-
- private final String field;
- private final int size;
-
- public FieldRule(String field, int size) {
- this.field = field;
- this.size = size;
- }
-
- @Override
- public boolean apply(StringParser currentString, Map fields) {
- // Check if current string is at least the correct size
-
- var fieldValue = currentString.substringTry(size).orElse(null);
- if (fieldValue == null) {
- return false;
- }
-
- // Add field value
- var previousValue = fields.put(field, fieldValue);
- if (previousValue != null) {
- SpecsLogs.warn("Duplicated value for field '" + field + "': " + previousValue);
- }
-
- return true;
- }
-
- @Override
- public String toString() {
- return "Field " + field + "(" + size + ")";
- }
-}
diff --git a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/IgnoreRule.java b/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/IgnoreRule.java
deleted file mode 100644
index df03a2ea..00000000
--- a/AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/binaryasmparser/IgnoreRule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2019 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser;
-
-import java.util.Map;
-
-import pt.up.fe.specs.util.stringparser.StringParser;
-
-public class IgnoreRule implements BinaryAsmRule {
-
- private final int numChars;
-
- public IgnoreRule(int numChars) {
- this.numChars = numChars;
- }
-
- @Override
- public boolean apply(StringParser currentString, Map fields) {
- return currentString.substringTry(numChars).isPresent();
- }
-
- @Override
- public String toString() {
- return "Ignore " + numChars;
- }
-}
diff --git a/AsmParser/test/pt/up/fe/specs/binarytranslation/asm/parsing/MicroBlazeAsmTest.java b/AsmParser/test/pt/up/fe/specs/binarytranslation/asm/parsing/MicroBlazeAsmTest.java
deleted file mode 100644
index b273bd40..00000000
--- a/AsmParser/test/pt/up/fe/specs/binarytranslation/asm/parsing/MicroBlazeAsmTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright 2024 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.binarytranslation.asm.parsing;
-
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import pt.up.fe.specs.binarytranslation.asm.parsing.binaryasmparser.BinaryAsmInstructionParser;
-
-public class MicroBlazeAsmTest {
-
- enum MicroBlazeAsmField implements AsmFieldType {
- INST1,
- INST2;
- }
-
- @Test
- public void test1() {
-
- var parsers = new ArrayList();
-
- parsers.add(new BinaryAsmInstructionParser(MicroBlazeAsmField.INST1,
- "100101_registerd(5)_1000_opcodea(1)_0_imm(15)", null));
-
- parsers.add(new BinaryAsmInstructionParser(MicroBlazeAsmField.INST2,
- "100101_0_opcodea(1)_000_registera(5)_11_registers(14)", null));
-
- // var insts = List.of("10010100001100000000000000000001");
- var insts = List.of("94300001");
-
- for (var inst : insts) {
-
- boolean isSuccess = false;
-
- for (var parser : parsers) {
- var parsed = parser.parse("0", inst);
-
- if (parsed.isEmpty()) {
- continue;
- }
-
- System.out.println("Parsing success: " + parsed.get());
- isSuccess = true;
- break;
- }
-
- if (!isSuccess) {
- fail("Could not parse " + inst);
- }
- }
-
- /*
- newInstance(MSR, ),
- newInstance(MFS, "100101_registerd(5)_0_opcodea(1)_00010_registers(14)"),
- newInstance(MTS, "100101_0_opcodea(1)_000_registera(5)_11_registers(14)"),
- */
- }
-
- @Test
- public void testFromJson() {
-
- }
-
-}
diff --git a/AsmParser/test/pt/up/fe/specs/binarytranslation/asm/parsing/asm_test.json b/AsmParser/test/pt/up/fe/specs/binarytranslation/asm/parsing/asm_test.json
deleted file mode 100644
index 001cc69c..00000000
--- a/AsmParser/test/pt/up/fe/specs/binarytranslation/asm/parsing/asm_test.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "fields": [
- "registerd",
- "registera",
- "opcode",
- "imm"
- ],
- "formats": [
- "100101_0_opcode(1)_000_registerd(5)_11_registera(14)",
- "0110_xx_registerd(5)_1000_opcode(1)_0_imm(15)"
- ]
-}
\ No newline at end of file
diff --git a/CommonsCompressPlus/build.gradle b/CommonsCompressPlus/build.gradle
deleted file mode 100644
index 8170ad96..00000000
--- a/CommonsCompressPlus/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-plugins {
- id 'distribution'
- id 'java'
-}
-
-java {
- withSourcesJar()
-
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
-}
-
-// Repositories providers
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation ':SpecsUtils'
-
- implementation 'org.apache.commons:commons-compress:1.27.1'
-}
-
-// Project sources
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
diff --git a/CommonsCompressPlus/settings.gradle b/CommonsCompressPlus/settings.gradle
deleted file mode 100644
index 15d5a0e8..00000000
--- a/CommonsCompressPlus/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = 'CommonsCompressPlus'
-
-includeBuild("../SpecsUtils")
diff --git a/CommonsCompressPlus/src/pt/up/fe/specs/compress/ZipFormat.java b/CommonsCompressPlus/src/pt/up/fe/specs/compress/ZipFormat.java
deleted file mode 100644
index 7f2db5c5..00000000
--- a/CommonsCompressPlus/src/pt/up/fe/specs/compress/ZipFormat.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright 2017 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.compress;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Optional;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
-
-import pt.up.fe.specs.util.SpecsIo;
-import pt.up.fe.specs.util.enums.EnumHelperWithValue;
-import pt.up.fe.specs.util.lazy.Lazy;
-import pt.up.fe.specs.util.providers.StringProvider;
-
-/**
- * Enum representing supported compression formats for file output.
- *
- * Provides methods to create compressors for ZIP and GZ formats and to retrieve formats by extension.
- */
-public enum ZipFormat implements StringProvider {
-
- /** ZIP file format. */
- ZIP("zip"),
- /** GZ (GZip) file format. */
- GZ("gz");
-
- private static final Lazy> ENUM_HELPER = EnumHelperWithValue.newLazyHelperWithValue(ZipFormat.class);
-
- private final String extension;
-
- /**
- * Creates a new ZipFormat with the given file extension.
- *
- * @param extension the file extension for the format
- */
- private ZipFormat(String extension) {
- this.extension = extension;
- }
-
- /**
- * Returns an Optional containing the ZipFormat corresponding to the given extension, if available.
- *
- * @param extension the file extension
- * @return an Optional with the matching ZipFormat, or empty if not found
- */
- public static Optional fromExtension(String extension) {
- return ENUM_HELPER.get().fromValueTry(extension);
- }
-
- /**
- * Returns the string representation (file extension) of this format.
- *
- * @return the file extension
- */
- @Override
- public String getString() {
- return extension;
- }
-
- /**
- * Creates a new file compressor OutputStream for the given filename and output stream, according to this format.
- *
- * @param filename the name of the file to compress (used for ZIP entries)
- * @param outputStream the output stream to wrap
- * @return a new OutputStream for the compressed file
- * @throws RuntimeException if the compressor cannot be created
- */
- public OutputStream newFileCompressor(String filename, OutputStream outputStream) {
- switch (this) {
- case ZIP:
- // Create zip stream
- ZipOutputStream zipStream = new ZipOutputStream(outputStream);
- // Create zip entry
- try {
- zipStream.putNextEntry(new ZipEntry(filename));
- return zipStream;
- } catch (IOException e) {
- SpecsIo.closeStreamAfterError(zipStream);
- throw new RuntimeException("Could not add entry '" + filename + "' to zip file", e);
- }
- case GZ:
- try {
- return new GzipCompressorOutputStream(outputStream);
- } catch (IOException e) {
- throw new RuntimeException("Could not create GZip compressor", e);
- }
- default:
- throw new RuntimeException("Format not supported yet: " + this);
- }
- }
-
-}
diff --git a/CommonsLangPlus/src/pt/up/fe/specs/lang/ApacheStrings.java b/CommonsLangPlus/src/pt/up/fe/specs/lang/ApacheStrings.java
deleted file mode 100644
index 3619082d..00000000
--- a/CommonsLangPlus/src/pt/up/fe/specs/lang/ApacheStrings.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright 2017 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.lang;
-
-import org.apache.commons.text.StringEscapeUtils;
-
-/**
- * Utility class for Apache Commons Text string operations.
- */
-public class ApacheStrings {
-
- /**
- * Escapes HTML entities in the given string using Apache Commons Text.
- *
- * @param html the input HTML string
- * @return the escaped HTML string
- */
- public static String escapeHtml(String html) {
- return StringEscapeUtils.escapeHtml4(html);
- }
-}
diff --git a/CommonsLangPlus/test/pt/up/fe/specs/lang/ApacheStringsTest.java b/CommonsLangPlus/test/pt/up/fe/specs/lang/ApacheStringsTest.java
deleted file mode 100644
index 48eb6059..00000000
--- a/CommonsLangPlus/test/pt/up/fe/specs/lang/ApacheStringsTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package pt.up.fe.specs.lang;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.NullAndEmptySource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Unit tests for {@link ApacheStrings} utility class.
- *
- * Tests HTML escaping functionality using Apache Commons Text integration.
- *
- * @author Generated Tests
- */
-class ApacheStringsTest {
-
- @Test
- void testEscapeHtml_SimpleText() {
- // Given
- String input = "Hello World";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo("Hello World");
- }
-
- @Test
- void testEscapeHtml_BasicHtmlEntities() {
- // Given
- String input = "";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo("<script>alert('XSS');</script>");
- }
-
- @ParameterizedTest
- @CsvSource({
- "'&', '&'",
- "'<', '<'",
- "'>', '>'",
- "'\"', '"'"
- })
- void testEscapeHtml_SpecialCharacters(String input, String expected) {
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo(expected);
- }
-
- @Test
- void testEscapeHtml_SingleQuote() {
- // Given
- String input = "'";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then - Single quote is NOT escaped by default in HTML4
- assertThat(result).isEqualTo("'");
- }
-
- @Test
- void testEscapeHtml_ComplexHtmlStructure() {
- // Given
- String input = "
Hello & \"goodbye\"
";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo(
- "<div class="container"><p>Hello & "goodbye"</p></div>");
- }
-
- @Test
- void testEscapeHtml_AlreadyEscapedEntities() {
- // Given
- String input = "<script>";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo("<script>");
- }
-
- @ParameterizedTest
- @NullAndEmptySource
- void testEscapeHtml_NullAndEmpty(String input) {
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo(input);
- }
-
- @Test
- void testEscapeHtml_UnicodeCharacters() {
- // Given
- String input = "Hello 世界 & café";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then - Unicode characters like é are escaped as entities in HTML4
- assertThat(result).isEqualTo("Hello 世界 & café");
- }
-
- @ParameterizedTest
- @ValueSource(strings = {
- "",
- "",
- ""
- })
- void testEscapeHtml_XSSPrevention(String input) {
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then - should escape angle brackets and quotes
- assertThat(result).doesNotContain("<");
- assertThat(result).doesNotContain(">");
- assertThat(result).contains("<");
- assertThat(result).contains(">");
- if (input.contains("\"")) {
- assertThat(result).contains(""");
- }
- }
-
- @Test
- void testEscapeHtml_OnclickAttribute() {
- // Given
- String input = "onclick=\"alert('click')\"";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then - should escape quotes but not single quotes
- assertThat(result).isEqualTo("onclick="alert('click')"");
- assertThat(result).doesNotContain("\"");
- assertThat(result).contains(""");
- }
-
- @Test
- void testEscapeHtml_LargeString() {
- // Given
- StringBuilder inputBuilder = new StringBuilder();
- for (int i = 0; i < 1000; i++) {
- inputBuilder.append("
Content ").append(i).append(" & \"test\"
");
- }
- String input = inputBuilder.toString();
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isNotNull();
- assertThat(result).isNotEmpty();
- assertThat(result).doesNotContain("
");
- assertThat(result).contains("<div>");
- assertThat(result).contains("&");
- assertThat(result).contains(""");
- }
-
- @Test
- void testEscapeHtml_NumbersAndWhitespace() {
- // Given
- String input = " 123 < 456 > 789 ";
-
- // When
- String result = ApacheStrings.escapeHtml(input);
-
- // Then
- assertThat(result).isEqualTo(" 123 < 456 > 789 ");
- }
-}
diff --git a/GearmanPlus/build.gradle b/GearmanPlus/build.gradle
deleted file mode 100644
index 7d8d913f..00000000
--- a/GearmanPlus/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-plugins {
- id 'distribution'
- id 'java'
-}
-
-java {
- withSourcesJar()
-
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
-}
-
-// Repositories providers
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation ':SpecsUtils'
-
- implementation 'com.google.code.gson:gson:2.12.1'
- implementation 'org.gearman:gearman-java:0.6'
-}
-
-// Project sources
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
diff --git a/GearmanPlus/settings.gradle b/GearmanPlus/settings.gradle
deleted file mode 100644
index c8f58583..00000000
--- a/GearmanPlus/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = 'GearmanPlus'
-
-includeBuild("../SpecsUtils")
diff --git a/GearmanPlus/src/pt/up/fe/specs/gearman/GearmanUtils.java b/GearmanPlus/src/pt/up/fe/specs/gearman/GearmanUtils.java
deleted file mode 100644
index 6142536d..00000000
--- a/GearmanPlus/src/pt/up/fe/specs/gearman/GearmanUtils.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Copyright 2016 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.gearman;
-
-import java.io.IOException;
-
-import org.gearman.Gearman;
-import org.gearman.GearmanServer;
-
-import pt.up.fe.specs.util.SpecsLogs;
-
-/**
- * Utility methods for creating and managing Gearman servers.
- */
-public class GearmanUtils {
-
- /**
- * Creates a Gearman server on the default port (4730) or connects to a remote server if an address is provided.
- *
- * @param gearman the Gearman instance
- * @param args if not empty, the first element is used as the server address
- * @return a GearmanServer instance
- * @throws RuntimeException if the server cannot be started or connected
- */
- public static GearmanServer newServer(final Gearman gearman, String[] args) {
- return newServer(gearman, 4730, args);
- }
-
- /**
- * Creates a Gearman server on the specified port or connects to a remote server if an address is provided.
- *
- * @param gearman the Gearman instance
- * @param port the port to use
- * @param args if not empty, the first element is used as the server address
- * @return a GearmanServer instance
- * @throws RuntimeException if the server cannot be started or connected
- */
- public static GearmanServer newServer(final Gearman gearman, int port, String[] args) {
- try {
- if (args.length > 0) {
- String addr = args[0];
- SpecsLogs.msgInfo("Connecting to Gearman Server on " + addr + ":" + port);
- return gearman.createGearmanServer(addr, port);
- }
- SpecsLogs.msgInfo("Gearman Server listening on port " + port);
- return gearman.startGearmanServer(port);
- } catch (IOException e) {
- throw new RuntimeException("Exception while trying to start Gearman Server:\n", e);
- }
- }
-
-}
diff --git a/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/GenericSpecsWorker.java b/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/GenericSpecsWorker.java
deleted file mode 100644
index 208234ce..00000000
--- a/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/GenericSpecsWorker.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright 2016 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.gearman.specsworker;
-
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-
-import org.gearman.GearmanFunction;
-import org.gearman.GearmanFunctionCallback;
-
-import com.google.gson.GsonBuilder;
-
-/**
- * Generic Gearman worker that delegates work to a provided function and builds error output using a function.
- *
- * This worker allows dynamic delegation of Gearman jobs to a user-supplied {@link GearmanFunction} and custom error output
- * formatting using a {@link Function}.
- */
-public class GenericSpecsWorker extends SpecsWorker {
-
- private final GearmanFunction function;
- private final Function outputBuilder;
-
- private final String workerName;
-
- /**
- * Constructs a new GenericSpecsWorker.
- *
- * @param workerName the name of the worker
- * @param function the Gearman function to delegate work to
- * @param outputBuilder a function to build error output objects from error messages
- * @param timeout the timeout value
- * @param timeUnit the time unit for the timeout
- */
- public GenericSpecsWorker(String workerName, GearmanFunction function, Function outputBuilder,
- long timeout,
- TimeUnit timeUnit) {
- super(timeout, timeUnit);
- this.workerName = workerName;
- this.function = function;
- this.outputBuilder = outputBuilder;
- }
-
- /**
- * Returns the name of this worker.
- *
- * @return the worker name
- */
- @Override
- public String getWorkerName() {
- return workerName;
- }
-
- /**
- * Setup hook called before work execution. Default implementation does nothing.
- */
- @Override
- public void setUp() {
- // No setup required by default
- }
-
- /**
- * Teardown hook called after work execution. Default implementation does nothing.
- */
- @Override
- public void tearDown() {
- // No teardown required by default
- }
-
- /**
- * Delegates the work to the provided Gearman function.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- * @return the result of the delegated function
- * @throws Exception if the delegated function throws an exception
- */
- @Override
- public byte[] workInternal(String function, byte[] data, GearmanFunctionCallback callback) throws Exception {
- return this.function.work(function, data, callback);
- }
-
- /**
- * Builds the error output using the provided outputBuilder function and serializes it as JSON.
- *
- * @param message the error message
- * @return the error output as JSON bytes
- */
- @Override
- protected byte[] getErrorOutput(String message) {
- return new GsonBuilder().create().toJson(outputBuilder.apply(message)).getBytes();
- }
-
-}
diff --git a/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/JsonSpecsWorker.java b/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/JsonSpecsWorker.java
deleted file mode 100644
index f7dee337..00000000
--- a/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/JsonSpecsWorker.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Copyright 2016 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.gearman.specsworker;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.concurrent.TimeUnit;
-
-import org.gearman.GearmanFunctionCallback;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import pt.up.fe.specs.util.SpecsLogs;
-
-/**
- * Abstract Gearman worker that handles JSON input/output using Gson.
- *
- * @param the input type
- * @param the output type
- */
-public abstract class JsonSpecsWorker extends SpecsWorker {
-
- private final Gson gson;
- private final Class inputClass;
-
- /**
- * Constructs a JsonSpecsWorker with the given input class and timeout settings.
- *
- * @param inputClass the class of the input type
- * @param timeout the timeout duration
- * @param timeUnit the time unit for the timeout
- */
- public JsonSpecsWorker(Class inputClass, long timeout, TimeUnit timeUnit) {
- super(timeout, timeUnit);
- this.inputClass = inputClass;
- this.gson = new GsonBuilder().create();
- }
-
- /**
- * Handles the work by deserializing input, invoking the worker, and serializing the result as JSON.
- *
- * @param function the function name
- * @param data the input data as bytes
- * @param callback the Gearman callback
- * @return the result as JSON bytes
- * @throws Exception if processing fails
- */
- @Override
- public byte[] workInternal(String function, byte[] data, GearmanFunctionCallback callback) throws Exception {
- I parsedData = gson.fromJson(new String(data), inputClass);
- O result = workInternal(function, parsedData, callback);
- // Print time-stamp
- var time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- SpecsLogs.info("Finished job '" + this.getClass().getName() + "' at " + time);
- return gson.toJson(result).getBytes();
- }
-
- /**
- * Performs the actual work using the deserialized input.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- * @return the result
- */
- public abstract O workInternal(String function, I data, GearmanFunctionCallback callback);
-
- /**
- * Returns the error output as JSON bytes.
- *
- * @param message the error message
- * @return the error output as JSON bytes
- */
- @Override
- protected byte[] getErrorOutput(String message) {
- return gson.toJson(getTypedErrorOutput(message)).getBytes();
- }
-
- /**
- * Returns a typed error output object for the given message.
- *
- * @param message the error message
- * @return the error output object
- */
- protected abstract O getTypedErrorOutput(String message);
-
-}
diff --git a/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/SpecsWorker.java b/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/SpecsWorker.java
deleted file mode 100644
index 345fc663..00000000
--- a/GearmanPlus/src/pt/up/fe/specs/gearman/specsworker/SpecsWorker.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- * Copyright 2013 SPeCS Research Group.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.gearman.specsworker;
-
-import java.io.File;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.gearman.GearmanFunction;
-import org.gearman.GearmanFunctionCallback;
-
-import pt.up.fe.specs.util.SpecsIo;
-import pt.up.fe.specs.util.SpecsLogs;
-import pt.up.fe.specs.util.SpecsStrings;
-
-/**
- * Abstract base class for Gearman workers with timeout, setup/teardown, and error handling support.
- *
- * Provides a framework for running Gearman jobs with configurable timeouts, setup/teardown hooks, and error reporting.
- * Subclasses should implement {@link #workInternal(String, byte[], GearmanFunctionCallback)} and
- * {@link #getErrorOutput(String)} for custom job logic and error output.
- *
- * @author Joao Bispo
- */
-public abstract class SpecsWorker implements GearmanFunction {
-
- private final long timeout;
- private final TimeUnit timeUnit;
-
- /**
- * Constructs a SpecsWorker with the given timeout and time unit.
- *
- * @param timeout the timeout value for job execution
- * @param timeUnit the time unit for the timeout
- */
- public SpecsWorker(long timeout, TimeUnit timeUnit) {
- this.timeout = timeout;
- this.timeUnit = timeUnit;
- }
-
- /**
- * Returns the timeout value for job execution.
- *
- * @return the timeout value
- */
- public long getTimeout() {
- return timeout;
- }
-
- /**
- * Returns the time unit for the timeout value.
- *
- * @return the time unit
- */
- public TimeUnit getTimeUnit() {
- return timeUnit;
- }
-
- /**
- * Returns the name of this worker. By default, returns the simple class name.
- *
- * @return the worker name
- */
- public String getWorkerName() {
- return getClass().getSimpleName();
- }
-
- /**
- * Executes the Gearman job, calling setup and teardown hooks.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- * @return the result of the job
- * @throws Exception if job execution fails
- */
- @Override
- public byte[] work(String function, byte[] data, GearmanFunctionCallback callback)
- throws Exception {
- setUp();
- byte[] result = execute(function, data, callback);
- tearDown();
- return result;
- }
-
- /**
- * Executes the job with timeout and error handling, writing input/output to files if outputDir is set.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- * @return the result of the job
- * @throws InterruptedException if execution is interrupted
- * @throws ExecutionException if execution fails
- */
- private byte[] execute(String function, byte[] data, GearmanFunctionCallback callback)
- throws InterruptedException, ExecutionException {
- File outputDir = getOutputDir();
- if (outputDir != null) {
- SpecsIo.write(new File(outputDir, "input_data.json"), new String(data));
- }
- byte[] result = executeInternal(function, data, callback);
- if (outputDir != null) {
- SpecsIo.write(new File(outputDir, "output_data.json"), new String(result));
- }
- return result;
- }
-
- /**
- * Executes the job in a separate thread, enforcing the timeout and handling exceptions.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- * @return the result of the job
- */
- public byte[] executeInternal(String function, byte[] data, GearmanFunctionCallback callback) {
- ExecutorService executor = Executors.newSingleThreadExecutor();
- TaskV2 task = new TaskV2(this, function, data, callback);
- Future future = executor.submit(task);
- byte[] result = null;
- try {
- String name = getWorkerName();
- String id = callback != null ? new String(callback.getJobHandle()) : "";
- SpecsLogs.msgInfo("[SpecsWorker] Starting '" + name + "' (" + id + " -> "
- + SpecsIo.getWorkingDir().getAbsolutePath() + ")");
- long workStart = System.nanoTime();
- result = future.get(timeout, timeUnit);
- long workEnd = System.nanoTime();
- SpecsLogs.msgInfo("[SpecsWorker] Finished '" + getWorkerName() + "', "
- + SpecsStrings.parseTime(workEnd - workStart) + " (id " + id + ")");
- } catch (TimeoutException e) {
- SpecsLogs.warn("[SpecsWorker] Timeout during worker execution", e);
- future.cancel(true);
- SpecsLogs.msgInfo("Worker [" + Thread.currentThread().getName() + "]: putting thread/task to sleep... ");
- task.interrupt();
- result = getErrorOutput(getTimeoutMessage());
- } catch (Exception e) {
- SpecsLogs.warn("[SpecsWorker] Exception during worker execution", e);
- future.cancel(true);
- task.interrupt();
- result = getErrorOutput(e.getMessage());
- }
- executor.shutdownNow();
- return result;
- }
-
- /**
- * Returns a timeout message for error reporting.
- *
- * @return the timeout message
- */
- private String getTimeoutMessage() {
- return "Terminated task after exceeding the maximum alloted time of " + getTimeout()
- + SpecsStrings.getTimeUnitSymbol(getTimeUnit());
- }
-
- /**
- * Setup hook called before job execution. Default implementation does nothing.
- */
- public void setUp() {
- // No setup required by default
- }
-
- /**
- * Teardown hook called after job execution. Default implementation does nothing.
- */
- public void tearDown() {
- // No teardown required by default
- }
-
- /**
- * Performs the actual work for the Gearman job. Must be implemented by subclasses.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- * @return the result of the job
- * @throws Exception if job execution fails
- */
- public abstract byte[] workInternal(String function, byte[] data,
- GearmanFunctionCallback callback) throws Exception;
-
- /**
- * Returns the error output for a given error message. Must be implemented by subclasses.
- *
- * @param message the error message
- * @return the error output as bytes
- */
- protected abstract byte[] getErrorOutput(String message);
-
- /**
- * Task for executing a Gearman job in a separate thread.
- */
- class Task implements Callable {
- private final String function;
- private final byte[] data;
- private final GearmanFunctionCallback callback;
-
- /**
- * Constructs a Task for the given function, data, and callback.
- *
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- */
- public Task(String function, byte[] data, GearmanFunctionCallback callback) {
- this.function = function;
- this.data = data;
- this.callback = callback;
- }
-
- /**
- * Calls the workInternal method to perform the job.
- *
- * @return the result of the job
- * @throws Exception if job execution fails
- */
- @Override
- public byte[] call() throws Exception {
- return workInternal(function, data, callback);
- }
- }
-
- /**
- * TaskV2 for executing a Gearman job in a separate thread, with thread interruption support.
- */
- static class TaskV2 implements Callable {
- private final SpecsWorker worker;
- private final String function;
- private final byte[] data;
- private final GearmanFunctionCallback callback;
- private Thread taskThread = null;
-
- /**
- * Constructs a TaskV2 for the given worker, function, data, and callback.
- *
- * @param worker the SpecsWorker instance
- * @param function the function name
- * @param data the input data
- * @param callback the Gearman callback
- */
- public TaskV2(SpecsWorker worker, String function, byte[] data, GearmanFunctionCallback callback) {
- this.worker = worker;
- this.function = function;
- this.data = data;
- this.callback = callback;
- }
-
- /**
- * Calls the worker's workInternal method to perform the job, tracking the thread for interruption.
- *
- * @return the result of the job
- * @throws Exception if job execution fails
- */
- @Override
- public byte[] call() throws Exception {
- taskThread = Thread.currentThread();
- SpecsLogs.msgInfo("Running task in thread " + taskThread.getName());
- byte[] result = worker.workInternal(function, data, callback);
- SpecsLogs.msgInfo("Finished task in thread " + taskThread.getName());
- taskThread = null;
- return result;
- }
-
- /**
- * Returns the SpecsWorker associated with this task.
- *
- * @return the SpecsWorker instance
- */
- public SpecsWorker getWorker() {
- return worker;
- }
-
- /**
- * Interrupts the running thread for this task, waiting 2 seconds for cleanup.
- *
- * If the thread is still alive after interruption, logs a warning.
- */
- public void interrupt() {
- if (taskThread == null) {
- SpecsLogs.msgInfo("Task.sleep(): No thread set, returning");
- return;
- }
- SpecsLogs.msgInfo("Interrupting task in thread " + taskThread.getName() + ", waiting 2 seconds");
- taskThread.interrupt();
- try {
- Thread.sleep(2_000);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt(); // set interrupt flag
- SpecsLogs.warn("Thread was interrupted:\n", e);
- }
-
- // If thread is still alive, kill it forcefully
- if (taskThread.isAlive()) {
- SpecsLogs.msgInfo("Forcefully stopping the thread " + taskThread.getName());
- taskThread.stop();
- // Stopping two times due to experiment described here:
- // https://stackoverflow.com/questions/24855182/interrupt-java-thread-running-nashorn-script#
- taskThread.stop();
- } else {
- SpecsLogs.msgInfo("Thread " + taskThread.getName() + " died gracefully");
- }
- }
- }
-
- /**
- * Returns the output directory for input/output debug files. Default is null (no output).
- *
- * @return the output directory, or null if not set
- */
- public File getOutputDir() {
- return null;
- }
-}
diff --git a/GearmanPlus/src/pt/up/fe/specs/gearman/utils/GearmanSecurityManager.java b/GearmanPlus/src/pt/up/fe/specs/gearman/utils/GearmanSecurityManager.java
deleted file mode 100644
index fe3abd1a..00000000
--- a/GearmanPlus/src/pt/up/fe/specs/gearman/utils/GearmanSecurityManager.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2016 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package pt.up.fe.specs.gearman.utils;
-
-import java.security.Permission;
-
-/**
- * Security manager for Gearman workers that blocks System.exit() calls and allows all other permissions.
- *
- * This class is intended to prevent accidental JVM termination by capturing calls to System.exit().
- * All other permission checks are allowed.
- */
-public class GearmanSecurityManager extends SecurityManager {
-
- /**
- * Allows all permissions (no restrictions).
- */
- @Override
- public void checkPermission(Permission perm) {
- // allow anything.
- }
-
- /**
- * Allows all permissions (no restrictions).
- */
- @Override
- public void checkPermission(Permission perm, Object context) {
- // allow anything.
- }
-
- /**
- * Throws a SecurityException when System.exit() is called, preventing JVM termination.
- *
- * @param status the exit status
- * @throws SecurityException always
- */
- @Override
- public void checkExit(int status) {
- super.checkExit(status);
- throw new SecurityException("Captured call to System.exit(" + status + ")");
- }
-
-}
diff --git a/GitlabPlus/.gitignore b/GitlabPlus/.gitignore
deleted file mode 100644
index 71a5c569..00000000
--- a/GitlabPlus/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-_token
-debug
diff --git a/GitlabPlus/build.gradle b/GitlabPlus/build.gradle
deleted file mode 100644
index 2cc3f338..00000000
--- a/GitlabPlus/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-plugins {
- id 'distribution'
- id 'java'
-}
-
-java {
- withSourcesJar()
-
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
-}
-
-// Repositories providers
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation ':GsonPlus'
- implementation ':SpecsUtils'
-
- implementation 'com.google.code.gson:gson:2.4'
-}
-
-// Project sources
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
diff --git a/GitlabPlus/settings.gradle b/GitlabPlus/settings.gradle
deleted file mode 100644
index ef760736..00000000
--- a/GitlabPlus/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-rootProject.name = 'GitlabPlus'
-
-includeBuild("../GsonPlus")
-includeBuild("../SpecsUtils")
diff --git a/GitlabPlus/src/pt/up/fe/specs/gitlab/GitlabPlus.java b/GitlabPlus/src/pt/up/fe/specs/gitlab/GitlabPlus.java
deleted file mode 100644
index 9eff8c7a..00000000
--- a/GitlabPlus/src/pt/up/fe/specs/gitlab/GitlabPlus.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package pt.up.fe.specs.gitlab;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import pt.up.fe.specs.util.SpecsIo;
-import pt.up.fe.specs.util.SpecsSystem;
-import pt.up.fe.specs.util.lazy.LazyString;
-
-/**
- * Copyright 2023 SPeCS.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-public class GitlabPlus {
-
- private static final String TOKEN_FILE_NAME = "_token";
-
- private static final LazyString token = new LazyString(() -> SpecsIo.read(TOKEN_FILE_NAME).trim());
- private static boolean debug = SpecsSystem.isDebug();
-
- public static Optional addUserToProject(String projectId, String username, Role role)
- throws URISyntaxException, IOException, InterruptedException {
-
- return addUserToProjectFromId(projectId, getUserId(username), role);
- }
-
- public static Optional addUserToProjectFromId(String projectId, String userId, Role role)
- throws URISyntaxException, IOException, InterruptedException {
-
- Map requiredData = new HashMap<>();
- requiredData.put("user_id", userId);
- requiredData.put("access_level", role.toString());
- String dataString = new GsonBuilder().setPrettyPrinting().create().toJson(requiredData);
-
- var request = HttpRequest.newBuilder()
- .uri(new URI("https://git.fe.up.pt/api/v4/projects/" + projectId + "/members"))
- .header("PRIVATE-TOKEN", token.toString())
- .header("Content-Type", "application/json")
- .POST(HttpRequest.BodyPublishers.ofString(dataString))
- .build();
-
- HttpClient client = HttpClient.newHttpClient();
- var response = client.send(request, BodyHandlers.ofString());
-
- debugPrint(request, response);
-
- if (response.statusCode() != 201) {
-
- return Optional.empty();
- }
-
- return Optional.of(getIdFromObject(response));
- }
-
- private static void debugPrint(HttpRequest request, HttpResponse response) {
-
- if (debug) {
- System.out.println(request);
- System.out.println(response);
- System.out.println(response.body());
- }
- }
-
- // TODO: change signature to include required arguments and optional as map
- public static Optional createRepository(Map data)
- throws URISyntaxException, IOException, InterruptedException {
-
- String dataString = new GsonBuilder().setPrettyPrinting().create().toJson(data);
-
- var request = HttpRequest.newBuilder()
- .uri(new URI("https://git.fe.up.pt/api/v4/projects/"))
- .header("PRIVATE-TOKEN", token.toString())
- .header("Content-Type", "application/json")
- .POST(HttpRequest.BodyPublishers.ofString(dataString))
- .build();
-
- HttpClient client = HttpClient.newHttpClient();
- var response = client.send(request, BodyHandlers.ofString());
-
- if (response.statusCode() != 201) {
-
- return Optional.empty();
- }
-
- return Optional.of(getIdFromObject(response));
- }
-
- /**
- * Gets the user ID from the username. For instance, username pmsp returns ID 1387.
- *
- * @param username
- * the username used to access git.fe.up.pt, e.g., pmsp or up123456789
- * @return a string containing the ID
- *
- * @throws URISyntaxException
- * @throws IOException
- * @throws InterruptedException
- */
- public static String getUserId(String username) throws URISyntaxException, IOException, InterruptedException {
-
- var request = HttpRequest.newBuilder()
- .uri(new URI("https://git.fe.up.pt/api/v4/users?username=" + username))
- .header("PRIVATE-TOKEN", token.toString())
- .GET()
- .build();
-
- HttpClient client = HttpClient.newHttpClient();
- var response = client.send(request, BodyHandlers.ofString());
-
- if (response.statusCode() != 200) {
-
- throw new RuntimeException("Failed to get user ID from username");
- }
-
- return getIdFromArray(response, 0, true);
- }
-
- /**
- * Returns the string representation an ID coming from a response object.
- *
- * @param response
- * @return
- */
- private static String getIdFromObject(HttpResponse response) {
-
- Map map = new Gson().fromJson(response.body(), Map.class);
-
- return getId(map);
- }
-
- /**
- * Returns the string representation an ID coming from a response array.
- *
- * @param response
- * @param position
- * @param throwOnMultiple
- * @return
- */
- private static String getIdFromArray(HttpResponse response, int position, boolean throwOnMultiple) {
-
- List