diff --git a/jmlparser-jml-pretty/pom.xml b/jmlparser-jml-pretty/pom.xml
deleted file mode 100644
index 35a4cb6e60..0000000000
--- a/jmlparser-jml-pretty/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- 4.0.0
-
-
- io.github.jmltoolkit
- jmlparser-parent
- 3.25.8-SNAPSHOT
-
- jmlparser-jml-pretty
-
-
-
- com.google.googlejavaformat
- google-java-format
- 1.16.0
-
-
-
\ No newline at end of file
diff --git a/jmlparser-jml-tools/pom.xml b/jmlparser-jml-tools/pom.xml
deleted file mode 100644
index 269f795c62..0000000000
--- a/jmlparser-jml-tools/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
- 4.0.0
-
- jmlparser-parent
- io.github.jmltoolkit
- 3.25.8-SNAPSHOT
-
-
- jmlparser-jml-tools
- jmlparser-jml-tools
-
-
- UTF-8
- 1.4.6
-
-
-
-
- com.google.code.gson
- gson
- 2.9.1
-
-
-
- io.github.jmltoolkit
- jmlparser-core
- ${project.version}
-
-
- io.github.jmltoolkit
- jmlparser-symbol-solver-core
- ${project.version}
-
-
- ch.qos.logback
- logback-classic
- ${logback_version}
-
-
-
- com.beust
- jcommander
- 1.82
-
-
- org.projectlombok
- lombok
- 1.18.30
- compile
-
-
-
- com.google.truth
- truth
- test
-
-
- org.yaml
- snakeyaml
- 2.0
- test
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
- org.junit.jupiter
- junit-jupiter-params
- test
-
-
- org.hamcrest
- hamcrest-library
- 2.2
- test
-
-
- org.assertj
- assertj-core
- 3.20.2
- test
-
-
- com.squareup.okhttp3
- okhttp
- 4.9.1
- test
-
-
- org.mockito
- mockito-inline
- test
-
-
-
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/LineColumnIndex.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/LineColumnIndex.java
deleted file mode 100644
index 717779779b..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/LineColumnIndex.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.jmlparser;
-
-import com.github.javaparser.Position;
-import com.github.javaparser.Range;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * The index is 1-based. The first character also begins in line 1 and column 1.
- *
- * @author Alexander Weigl
- * @version 1 (18.10.22)
- */
-public class LineColumnIndex {
- private final String content;
- int[] lineOffsets;
-
- public LineColumnIndex(@NotNull String content) {
- this.content = content;
- lineOffsets = new int[1 + (int) content.chars().filter(it -> it == '\n').count()];
- int cur = 1;
- final var chars = content.toCharArray();
- for (int i = 0; i < chars.length; i++) {
- if (chars[i] == '\n')
- lineOffsets[cur++] = i + 1;
- }
- }
-
- public String substring(Range range) {
- return substring(range.begin, range.end);
- }
-
- private String substring(Position begin, Position end) {
- return substring(begin.line, begin.column, end.line, end.column);
- }
-
- public String substring(int beginLine, int beginColumn, int endLine, int endColumn) {
- var a = positionToOffset(beginLine, beginColumn);
- var b = positionToOffset(endLine, endColumn);
- return content.substring(a, b + 1);
- }
-
- public int positionToOffset(Position p) {
- return positionToOffset(p.line, p.column);
- }
-
- public int positionToOffset(int line, int column) {
- return lineOffsets[line - 1] + column - 1;
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/Main.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/Main.java
deleted file mode 100644
index f8b0189b34..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/Main.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.github.jmlparser;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.github.javaparser.JavaParser;
-import com.github.javaparser.ParseResult;
-import com.github.javaparser.ParserConfiguration;
-import com.github.javaparser.Problem;
-import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.Node;
-import com.github.jmlparser.jml2java.J2JCommand;
-import com.github.jmlparser.lint.JmlLintingConfig;
-import com.github.jmlparser.lint.JmlLintingFacade;
-import com.github.jmlparser.lint.LintCommand;
-import com.github.jmlparser.lint.LintProblem;
-import com.github.jmlparser.pp.PrettyPrintCommand;
-import com.github.jmlparser.stat.StatCommand;
-import com.github.jmlparser.wd.WdCommand;
-import com.github.jmlparser.xpath.XPathCommand;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/31/21)
- */
-public class Main {
- private static final Args args = new Args();
-
- public static void main(String[] argv) {
- final var j2j = new J2JCommand();
- final var lint = new LintCommand();
- final var pp = new PrettyPrintCommand();
- final var stat = new StatCommand();
- final var xpath = new XPathCommand();
- final var wd = new WdCommand();
- var jc = JCommander.newBuilder()
- .addCommand(j2j)
- .addCommand(lint)
- .addCommand(pp)
- .addCommand(stat)
- .addCommand(xpath)
- .addCommand(wd)
- .addObject(args)
- .build();
- jc.parse(argv);
-
- ParserConfiguration config = createParserConfiguration(args);
- //Collection nodes = parse(args.files, config);
-
- String parsedCmdStr = jc.getParsedCommand();
- if (parsedCmdStr == null) {
- System.err.println("Invalid command: " + parsedCmdStr);
- jc.usage();
- } else {
- switch (parsedCmdStr) {
- case "pp":
- pp.run();
- break;
- case "wd":
- wd.run();
- break;
- default:
- System.err.println("Invalid command: " + parsedCmdStr);
- jc.usage();
- }
- }
- }
-
- private static void lint(Collection nodes) {
- JmlLintingConfig lconfig = createLinterConfiguration(args);
- var problems = new JmlLintingFacade(lconfig).lint(nodes);
- for (var problem : problems) {
- report(problem);
- }
- }
-
- private static JmlLintingConfig createLinterConfiguration(Args args) {
- return new JmlLintingConfig();
- }
-
- public static Collection parse(List files, ParserConfiguration config) {
- List expanded = new ArrayList<>(files.size() * 10);
- for (String file : files) {
- File f = new File(file);
- if (f.isDirectory()) {
- expandDirectory(expanded, f);
- } else {
- expanded.add(f);
- }
- }
-
- return expanded.parallelStream()
- .map(it -> parse(it, config))
- .map(Main::reportOnError)
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
- }
-
- private static CompilationUnit reportOnError(ParseResult it) {
- final Optional result = it.getResult();
- if (it.isSuccessful() && result.isPresent()) {
- return result.get();
- }
- for (Problem problem : it.getProblems()) {
- report(problem);
- }
- return null;
- }
-
- private static void report(Problem problem) {
- System.out.println(problem.toString());
- }
-
- private static void report(LintProblem problem) {
- System.out.println(problem.toString());
- }
-
- private static void expandDirectory(Collection target, File dir) {
- File[] files = dir.listFiles();
- if (files != null) {
- for (File file : files) {
- if (file.isDirectory()) {
- expandDirectory(target, file);
- } else {
- if (file.getName().endsWith(".java")) {
- target.add(file);
- }
- }
- }
- }
- }
-
- private static ParseResult
- parse(File file, ParserConfiguration configuration) {
- JavaParser p = new JavaParser(configuration);
- try {
- return p.parse(file);
- } catch (FileNotFoundException e) {
- report(new Problem("File not found", null, e));
- return null;
- }
- }
-
- private static ParserConfiguration createParserConfiguration(Args args) {
- ParserConfiguration config = new ParserConfiguration();
- config.getJmlKeys().add(new ArrayList<>(args.activeJmlKeys));
- config.setProcessJml(!args.disableJml);
- return config;
- }
-
- static class Args {
- @Parameter(names = {"--jml-keys"})
- private List activeJmlKeys = new ArrayList<>();
-
-
- @Parameter(names = {"-verbose"}, description = "Level of verbosity")
- private Integer verbose = 1;
-
- @Parameter(names = {"--disable-jml"})
- private boolean disableJml = false;
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/J2JCommand.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/J2JCommand.java
deleted file mode 100644
index 3b10f5716e..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/J2JCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.jmlparser.jml2java;
-
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.Parameters;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Alexander Weigl
- * @version 1 (09.04.23)
- */
-@Parameters(commandNames = {"jml2java"},
- commandDescription = "Submit usage for a given customer and subscription, accepts one usage item")
-public class J2JCommand {
- @Parameter(names = {"-o", "--output"}, description = "Output folder of the Java Files")
- private File outputFolder = new File("out");
-
- @Parameter(names = {"--jbmc"}, description = "JBMC mode")
- private boolean jjbmcMode = false;
- @Parameter(description = "FILES")
- private List files = new ArrayList<>();
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/Jml2JavaFacade.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/Jml2JavaFacade.java
deleted file mode 100644
index 998695007a..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/Jml2JavaFacade.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.github.jmlparser.jml2java;
-
-import com.github.javaparser.ast.Jmlish;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.BinaryExpr;
-import com.github.javaparser.ast.expr.Expression;
-import com.github.javaparser.ast.jml.clauses.JmlContract;
-import com.github.javaparser.ast.stmt.BlockStmt;
-import com.github.javaparser.ast.stmt.ForStmt;
-import com.github.javaparser.utils.Pair;
-
-import java.util.Stack;
-
-/**
- * Transformation of JML expressions into equivalent Java code.
- *
- * @author Alexander Weigl
- * @version 1 (04.10.22)
- */
-public class Jml2JavaFacade {
- public static Pair translate(Expression expression) {
- Jml2JavaTranslator j2jt = new Jml2JavaTranslator();
- BlockStmt result = new BlockStmt();
- var e = j2jt.accept(expression, result);
- return new Pair<>(result, e);
- }
-
- public static BlockStmt embeddLoopInvariant(ForStmt stmt) {
- return null;
- }
-
- public static boolean containsJmlExpression(Expression expression) {
- Stack search = new Stack<>();
- search.add(expression);
-
- while (!search.isEmpty()) {
- Expression e = search.pop();
- if (e instanceof Jmlish) {
- return true;
- }
-
- if (e instanceof BinaryExpr be) {
- if (be.getOperator() == BinaryExpr.Operator.IMPLICATION)
- return true;
- if (be.getOperator() == BinaryExpr.Operator.RIMPLICATION)
- return true;
- if (be.getOperator() == BinaryExpr.Operator.EQUIVALENCE)
- return true;
- if (be.getOperator() == BinaryExpr.Operator.SUB_LOCK)
- return true;
- if (be.getOperator() == BinaryExpr.Operator.SUB_LOCKE)
- return true;
- if (be.getOperator() == BinaryExpr.Operator.SUBTYPE)
- return true;
- if (be.getOperator() == BinaryExpr.Operator.RANGE)
- return true;
- }
-
- for (Node childNode : e.getChildNodes()) {
- if (childNode instanceof Expression ex)
- search.add(ex);
- }
- }
- return false;
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/Jml2JavaTranslator.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/Jml2JavaTranslator.java
deleted file mode 100644
index 7e3c4951bc..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/Jml2JavaTranslator.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package com.github.jmlparser.jml2java;
-
-import com.github.javaparser.ast.Modifier;
-import com.github.javaparser.ast.body.VariableDeclarator;
-import com.github.javaparser.ast.expr.*;
-import com.github.javaparser.ast.jml.expr.JmlLetExpr;
-import com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr;
-import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr;
-import com.github.javaparser.ast.stmt.*;
-import com.github.javaparser.ast.type.PrimitiveType;
-import com.github.javaparser.ast.type.VarType;
-import com.github.javaparser.ast.visitor.GenericVisitorAdapter;
-import com.github.jmlparser.utils.JMLUtils;
-import com.github.jmlparser.utils.Pattern;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author Alexander Weigl
- * @version 1 (04.10.22)
- */
-public class Jml2JavaTranslator {
- private final AtomicInteger counter = new AtomicInteger();
-
- public Expression accept(Expression e, BlockStmt arg) {
- if (Jml2JavaFacade.containsJmlExpression(e)) {
- return e.accept(new Jml2JavaVisitor(), arg);
- }
- return e; // createAssignmentAndAdd(e, arg);
- }
-
- private Expression createAssignmentAndAdd(Expression e, BlockStmt arg) {
- arg.addAndGetStatement(createAssignmentFor(e));
- return new NameExpr(getTargetForAssignment());
- }
-
- private Statement createAssignmentFor(Expression e) {
- var decl = new VariableDeclarationExpr(
- new VariableDeclarator(new VarType(),
- newTargetForAssignment(), e));
- decl.addModifier(Modifier.DefaultKeyword.FINAL);
- return new ExpressionStmt(decl);
- }
-
- private SimpleName getTargetForAssignment() {
- return new SimpleName("_gen_" + counter.get());
- }
-
- private SimpleName newTargetForAssignment() {
- counter.getAndIncrement();
- return getTargetForAssignment();
- }
-
- public Expression findPredicate(JmlQuantifiedExpr n) {
- return n.getExpressions().get(n.getExpressions().size() - 1);
- }
-
- public static Expression findBound(JmlQuantifiedExpr n) {
- if (n.getExpressions().size() == 2)
- return n.getExpressions().get(0);
- else if (n.getExpressions().size() == 1)
- if (n.getExpressions().get(0) instanceof BinaryExpr be)
- return be.getLeft();
- throw new IllegalArgumentException("Could not determine bound.");
-
- }
-
- public static Expression findLowerBound(JmlQuantifiedExpr n, String variable) {
- if (n.getExpressions().size() == 3) return n.getExpressions().get(0);
-
- var e = findBound(n);
-
- if (e instanceof JmlMultiCompareExpr mc) {
- if (mc.getExpressions().size() == 3 &&
- mc.getExpressions().get(1) instanceof NameExpr v &&
- v.getNameAsString().equals(variable)) {
- if (mc.getOperators().get(0) == BinaryExpr.Operator.LESS_EQUALS)
- return mc.getExpressions().get(0);
- if (mc.getOperators().get(0) == BinaryExpr.Operator.LESS)
- return new BinaryExpr(mc.getExpressions().get(0), new IntegerLiteralExpr(1), BinaryExpr.Operator.PLUS);
- throw new IllegalStateException();
- }
- }
-
- Expression ph = new NameExpr("_");
- {
- var be = new BinaryExpr(new NameExpr(variable), ph, BinaryExpr.Operator.GREATER_EQUALS);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return (Expression) result.get("min");
- }
-
- {
- var be = new BinaryExpr(new NameExpr(variable), ph, BinaryExpr.Operator.GREATER);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return new BinaryExpr((Expression) result.get("min"), new IntegerLiteralExpr(1), BinaryExpr.Operator.PLUS);
- }
-
- {
- var be = new BinaryExpr(ph, new NameExpr(variable), BinaryExpr.Operator.LESS_EQUALS);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return (Expression) result.get("min");
- }
-
- {
- var be = new BinaryExpr(ph, new NameExpr(variable), BinaryExpr.Operator.LESS);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return new BinaryExpr((Expression) result.get("min"), new IntegerLiteralExpr(1), BinaryExpr.Operator.PLUS);
- }
-
- return null;
- }
-
- public Expression findUpperBound(JmlQuantifiedExpr n, String variable) {
- if (n.getExpressions().size() == 3) return n.getExpressions().get(1);
-
- var e = findBound(n);
-
- if (e instanceof JmlMultiCompareExpr mc) {
- if (mc.getExpressions().size() == 3 &&
- mc.getExpressions().get(1) instanceof NameExpr v &&
- v.getNameAsString().equals(variable)) {
- if (mc.getOperators().get(0) == BinaryExpr.Operator.LESS_EQUALS)
- return mc.getExpressions().get(0);
- if (mc.getOperators().get(0) == BinaryExpr.Operator.LESS)
- return new BinaryExpr(mc.getExpressions().get(0), new IntegerLiteralExpr(1), BinaryExpr.Operator.PLUS);
- throw new IllegalStateException();
- }
- }
-
- Expression ph = new NameExpr("_");
- {
- var be = new BinaryExpr(new NameExpr(variable), ph, BinaryExpr.Operator.GREATER_EQUALS);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return (Expression) result.get("min");
- }
-
- {
- var be = new BinaryExpr(new NameExpr(variable), ph, BinaryExpr.Operator.GREATER);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return new BinaryExpr((Expression) result.get("min"), new IntegerLiteralExpr(1), BinaryExpr.Operator.PLUS);
- }
-
- {
- var be = new BinaryExpr(ph, new NameExpr(variable), BinaryExpr.Operator.LESS_EQUALS);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return (Expression) result.get("min");
- }
-
- {
- var be = new BinaryExpr(ph, new NameExpr(variable), BinaryExpr.Operator.LESS);
- var pattern = new Pattern<>(be);
- pattern.addPlaceholder(ph, "min");
- var result = pattern.find(n);
- if (result != null)
- return new BinaryExpr((Expression) result.get("min"), new IntegerLiteralExpr(1), BinaryExpr.Operator.PLUS);
- }
-
- return null;
- }
-
- private final class Jml2JavaVisitor extends GenericVisitorAdapter {
- @Override
- public Expression visit(JmlQuantifiedExpr n, BlockStmt arg) {
- if (n.getBinder() == JmlQuantifiedExpr.JmlDefaultBinder.FORALL)
- return visitForall(n, arg);
- if (n.getBinder() == JmlQuantifiedExpr.JmlDefaultBinder.EXISTS)
- return visitExists(n, arg);
-
- throw new IllegalArgumentException("Unsupport quantifier " + n.getBinder());
- }
-
- private Expression visitForall(JmlQuantifiedExpr n, BlockStmt arg) {
- assert n.getVariables().size() == 1;
- var rvalue = newSymbol("result_");
- var highVar = newSymbol("high_");
- var predVar = newSymbol("pred_");
-
- arg.addAndGetStatement(
- new ExpressionStmt(new VariableDeclarationExpr(
- new VariableDeclarator(
- new PrimitiveType(PrimitiveType.Primitive.BOOLEAN),
- rvalue, new BooleanLiteralExpr(true)))));
-
- var variable = n.getVariables().get(0);
- var lowCode = Jml2JavaFacade.translate(findLowerBound(n, variable.getNameAsString()));
- arg.addAndGetStatement(
- new ExpressionStmt(new VariableDeclarationExpr(
- new VariableDeclarator(
- variable.getType().clone(), variable.getNameAsString()))));
- lowCode.a.addAndGetStatement(
- new ExpressionStmt(
- new AssignExpr(
- new NameExpr(variable.getNameAsString()), lowCode.b,
- AssignExpr.Operator.ASSIGN)));
- arg.addAndGetStatement(lowCode.a);
-
- var highCode = Jml2JavaFacade.translate(findUpperBound(n, variable.getNameAsString()));
- arg.addAndGetStatement(
- new ExpressionStmt(new VariableDeclarationExpr(
- new VariableDeclarator(
- variable.getType().clone(), highVar))));
- highCode.a.addAndGetStatement(
- new ExpressionStmt(
- new AssignExpr(
- new NameExpr(highVar), highCode.b,
- AssignExpr.Operator.ASSIGN)));
- arg.addAndGetStatement(highCode.a.clone());
-
- var predCode = Jml2JavaFacade.translate(findPredicate(n));
-
- WhileStmt whileStmt = arg.addAndGetStatement(new WhileStmt());
- var lessThanExpr = new BinaryExpr(new NameExpr(variable.getNameAsString()),
- new NameExpr(highVar), BinaryExpr.Operator.LESS);
- whileStmt.setCondition(
- new BinaryExpr(lessThanExpr, new NameExpr(rvalue), BinaryExpr.Operator.AND));
- var body = new BlockStmt();
-
- body.addAndGetStatement(
- new ExpressionStmt(new VariableDeclarationExpr(
- new VariableDeclarator(new PrimitiveType(PrimitiveType.Primitive.BOOLEAN), predVar))));
- predCode.a.addAndGetStatement(
- new ExpressionStmt(
- new AssignExpr(
- new NameExpr(predVar), predCode.b,
- AssignExpr.Operator.ASSIGN)));
- body.addAndGetStatement(predCode.a);
-
- final var assignPred = new ExpressionStmt(new AssignExpr(new NameExpr(rvalue),
- new BooleanLiteralExpr(true), AssignExpr.Operator.ASSIGN));
- body.addAndGetStatement(
- new IfStmt(new NameExpr(predVar), assignPred, null));
- body.addAndGetStatement(highCode.a.clone());
-
- whileStmt.setBody(body);
- return new NameExpr(rvalue);
- }
-
- private String newSymbol(String prefix) {
- return prefix + counter.getAndIncrement();
- }
-
- private Expression visitExists(JmlQuantifiedExpr n, BlockStmt arg) {
- return new UnaryExpr(visitForall(n, arg), UnaryExpr.Operator.LOGICAL_COMPLEMENT);
- }
-
-
- @Override
- public Expression visit(JmlLetExpr n, BlockStmt arg) {
- var inner = new BlockStmt();
- SimpleName target = newTargetForAssignment();
- var type = n.getBody().calculateResolvedType();
- arg.addAndGetStatement(
- new ExpressionStmt(new VariableDeclarationExpr(JMLUtils.resolvedType2Type(type),
- target.asString())));
- inner.addAndGetStatement(new ExpressionStmt(n.getVariables()));
- var e = accept(n.getBody(), inner);
- arg.addAndGetStatement(inner);
- inner.addAndGetStatement(new AssignExpr(new NameExpr(target.asString()), e, AssignExpr.Operator.ASSIGN));
- return new NameExpr(target.asString());
- }
-
- @Override
- public Expression visit(BinaryExpr n, BlockStmt arg) {
- var left = accept(n.getLeft(), arg);
- var right = accept(n.getRight(), arg);
- switch (n.getOperator()) {
- case IMPLICATION:
- return new BinaryExpr(
- new UnaryExpr(new EnclosedExpr(left), UnaryExpr.Operator.LOGICAL_COMPLEMENT),
- right,
- BinaryExpr.Operator.OR);
- case RIMPLICATION:
- return
- new BinaryExpr(
- left,
- new UnaryExpr(new EnclosedExpr(right), UnaryExpr.Operator.LOGICAL_COMPLEMENT),
- BinaryExpr.Operator.OR);
- case EQUIVALENCE:
- return new BinaryExpr(left, right, BinaryExpr.Operator.EQUALS);
- case SUBTYPE:
- case SUB_LOCK:
- case SUB_LOCKE:
- throw new IllegalArgumentException("Unsupported operators.");
- default:
- return createAssignmentAndAdd(
- new BinaryExpr(left, right, n.getOperator()),
- arg);
- }
- }
-
- @Override
- public Expression visit(ArrayAccessExpr n, BlockStmt arg) {
- return super.visit(n, arg);
- }
-
- @Override
- public Expression visit(ArrayCreationExpr n, BlockStmt arg) {
- return super.visit(n, arg);
- }
-
- @Override
- public Expression visit(ArrayInitializerExpr n, BlockStmt arg) {
- return super.visit(n, arg);
- }
-
- @Override
- public Expression visit(AssignExpr n, BlockStmt arg) {
- return super.visit(n, arg);
- }
-
-
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/package-info.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/package-info.java
deleted file mode 100644
index 52ea90b598..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/jml2java/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Transformation of JML expressions into equivalent Java code.
- *
- * @author Alexander Weigl
- * @version 1 (04.10.22)
- * @see com.github.jmlparser.jml2java.Jml2JavaTranslator
- */
-package com.github.jmlparser.jml2java;
\ No newline at end of file
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/JmlLintingConfig.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/JmlLintingConfig.java
deleted file mode 100644
index 4fbd216bed..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/JmlLintingConfig.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.jmlparser.lint;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-@Data
-public class JmlLintingConfig {
- private boolean checkNameClashes = true;
- private boolean checkMissingNames = true;
-
- public JmlLintingConfig() {
- }
-
- public boolean isDisabled(LintRule lintRule) {
- return false;
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/JmlLintingFacade.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/JmlLintingFacade.java
deleted file mode 100644
index 3c719e9b3e..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/JmlLintingFacade.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.jmlparser.lint;
-
-import com.github.javaparser.ast.Node;
-import com.github.jmlparser.lint.sarif.*;
-import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.Exception;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public class JmlLintingFacade {
- private static final Logger LOGGER = LoggerFactory.getLogger(JmlLintingFacade.class);
- private static final String VERSION = JmlLintingFacade.class.getPackage().getImplementationVersion();
- private static final String NAME = "JML-lint";
-
- @Getter
- private final List linters;
- private final JmlLintingConfig config;
-
- public JmlLintingFacade(JmlLintingConfig config) {
- linters = getLinter(config);
- this.config = config;
- }
-
- private Tool getSarifTool() {
- return new Tool(
- new ToolComponent().withVersion(VERSION).withName(NAME)
- .withShortDescription(new MultiformatMessageString().withText("Linting for the Java Modeling Language")),
- linters.stream().map(it -> new ToolComponent().withFullName(it.getClass().getName())).collect(Collectors.toSet()),
- new PropertyBag()
- );
- }
-
-
- private static List getLinter(JmlLintingConfig config) {
- ServiceLoader loader = ServiceLoader.load(LintRule.class);
- List validators = new ArrayList<>(64);
- for (LintRule lintRule : loader) {
- if (!config.isDisabled(lintRule)) {
- validators.add(lintRule);
- }
- }
- return validators;
- }
-
- public void lint(LintProblemReporter reporter, Collection nodes) {
- for (Node it : nodes) {
- for (LintRule linter : linters) {
- try {
- linter.accept(it, reporter, config);
- } catch (Exception e) {
- LOGGER.error("Error in linter: {}", linter.getClass().getName(), e);
- }
- }
- }
- }
-
- public Collection lint(@NotNull Collection nodes) {
- var problems = new ArrayList(1024);
- Consumer collector = problems::add;
- lint(new LintProblemReporter(collector), nodes);
- problems.sort(Comparator.comparing(it -> it.location().toRange().get().begin));
- return problems;
- }
-
- public SarifSchema asSarif(Collection problems) throws URISyntaxException {
- List results = problems.stream().map(this::asSarif).toList();
- List runs = List.of(new Run().withTool(getSarifTool()).withResults(results));
- return new SarifSchema(
- new URI("http://json.schemastore.org/sarif-2.1.0-rtm.4"),
- "2.1.0",
- runs, Set.of(), new PropertyBag());
- }
-
- private Result asSarif(LintProblem it) {
- return new Result().withRuleId(it.ruleId()).withKind(it.category()).withLevel(it.level())
- .withLocations(List.of(new Location())).withMessage(new Message().withText(it.message()));
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintCommand.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintCommand.java
deleted file mode 100644
index 59421b72d9..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintCommand.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.jmlparser.lint;
-
-import com.beust.jcommander.Parameters;
-
-/**
- * @author Alexander Weigl
- * @version 1 (09.04.23)
- */
-@Parameters(commandNames = {"lint"},
- commandDescription = "Submit usage for a given customer and subscription, accepts one usage item")
-public class LintCommand {
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintProblem.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintProblem.java
deleted file mode 100644
index fdfa7f08c3..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintProblem.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.github.jmlparser.lint;
-
-import com.github.javaparser.TokenRange;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.22)
- */
-public record LintProblem(
- @NotNull
- String level,
- @NotNull
- String message,
- @Nullable
- TokenRange location,
- @Nullable
- Throwable cause,
- @Nullable
- String category,
- @NotNull
- String ruleId) {
-
- public LintProblem(@NotNull String level, @NotNull String message, @Nullable TokenRange location, @NotNull String ruleId) {
- this(level, message, location, null, null, ruleId);
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintProblemReporter.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintProblemReporter.java
deleted file mode 100644
index c4c7f28ad8..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintProblemReporter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.jmlparser.lint;
-
-import com.github.javaparser.TokenRange;
-import com.github.javaparser.ast.nodeTypes.NodeWithTokenRange;
-
-import java.util.function.Consumer;
-
-import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.22)
- */
-public class LintProblemReporter {
- private final Consumer problemConsumer;
-
- public LintProblemReporter(Consumer problemConsumer) {
- this.problemConsumer = problemConsumer;
- }
-
- public void warn(NodeWithTokenRange node, String category, String ruleId, String message, Object... args) {
- report(LintRule.WARN, node.getTokenRange().orElse(null), category, ruleId, message, args);
- }
-
- public void hint(NodeWithTokenRange node, String category, String ruleId, String message, Object... args) {
- report(LintRule.HINT, node.getTokenRange().orElse(null), category, ruleId, message, args);
- }
-
- public void error(NodeWithTokenRange node, String category, String ruleId, String message, Object... args) {
- report(LintRule.ERROR, node.getTokenRange().orElse(null), category, ruleId, message, args);
- }
-
- public void report(String level, TokenRange range, String category, String ruleId, String message, Object... args) {
- problemConsumer.accept(new LintProblem(level, f(message, args), range, null, category, ruleId));
- }
-
- public void report(LintProblem lintProblem) {
- problemConsumer.accept(lintProblem);
- }
-}
-
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintRule.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintRule.java
deleted file mode 100644
index 7637747a89..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintRule.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.jmlparser.lint;
-
-import com.github.javaparser.ast.Node;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public interface LintRule {
- String HINT = "HINT";
- String WARN = "WARN";
- String ERROR = "ERROR";
-
- void accept(Node node, LintProblemReporter problemReporter, JmlLintingConfig config);
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintRuleVisitor.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintRuleVisitor.java
deleted file mode 100644
index fe297064ce..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/LintRuleVisitor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.jmlparser.lint;
-
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.22)
- */
-public abstract class LintRuleVisitor extends VoidVisitorAdapter implements LintRule {
- /**
- * A validator that uses a visitor for validation.
- * This class is the visitor too.
- * Implement the "visit" methods you want to use for validation.
- */
- @Override
- public void accept(Node node, LintProblemReporter problemReporter, JmlLintingConfig config) {
- reset();
- node.accept(this, problemReporter);
- }
-
- protected void reset() {
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/AllowedJmlClauses.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/AllowedJmlClauses.java
deleted file mode 100644
index bccddf2b0a..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/AllowedJmlClauses.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.NodeList;
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.jml.NodeWithContracts;
-import com.github.javaparser.ast.jml.clauses.JmlClause;
-import com.github.javaparser.ast.jml.clauses.JmlClauseKind;
-import com.github.javaparser.ast.jml.clauses.JmlContract;
-import com.github.javaparser.ast.stmt.*;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-import static com.github.javaparser.ast.jml.clauses.JmlClauseKind.*;
-
-/**
- * @author Alexander Weigl
- * @version 1 (13.10.22)
- */
-public class AllowedJmlClauses extends LintRuleVisitor {
- public static final EnumSet METHOD_CONTRACT_CLAUSES = EnumSet.of(
- ENSURES,
- ENSURES_FREE,
- ENSURES_REDUNDANTLY,
- REQUIRES,
- REQUIRES_FREE,
- REQUIRES_REDUNDANTLY,
- DECREASES,
- MODIFIES,
- MODIFIABLE,
- ASSIGNABLE,
- ACCESSIBLE,
- PRE,
- POST,
- PRE_REDUNDANTLY,
- POST_REDUNDANTLY,
- DECREASING,
- DECREASES_REDUNDANTLY,
- MEASURED_BY,
- OLD,
- FORALL,
- SIGNALS,
- SIGNALS_REDUNDANTLY,
- SIGNALS_ONLY,
- WHEN,
- WORKING_SPACE,
- WORKING_SPACE_REDUNDANTLY,
- CAPTURES,
- CAPTURES_REDUNDANTLY,
- ASSIGNABLE_REDUNDANTLY,
- MODIFIABLE_REDUNDANTLY,
- MODIFIES_REDUNDANTLY,
- CALLABLE,
- CALLABLE_REDUNDANTLY,
- DIVERGES,
- DIVERGES_REDUNDANTLY,
- DURATION,
- DURATION_REDUNDANTLY
- );
-
- private EnumSet LOOP_INVARIANT_CLAUSES = EnumSet.of(
- DECREASES,
- MODIFIES,
- MODIFIABLE,
- ASSIGNABLE,
- ACCESSIBLE,
- MAINTAINING,
- MAINTAINING_REDUNDANTLY,
- DECREASING,
- DECREASES_REDUNDANTLY,
- LOOP_INVARIANT,
- LOOP_INVARIANT_FREE,
- LOOP_INVARIANT_REDUNDANTLY
- );
-
- private EnumSet LOOP_CONTRACT_CLAUSES = EnumSet.of(
- ENSURES,
- ENSURES_FREE,
- ENSURES_REDUNDANTLY,
- REQUIRES,
- REQUIRES_FREE,
- REQUIRES_REDUNDANTLY,
- DECREASES,
- MODIFIES,
- MODIFIABLE,
- ASSIGNABLE,
- ACCESSIBLE,
- PRE,
- POST,
- PRE_REDUNDANTLY,
- POST_REDUNDANTLY,
- MAINTAINING,
- MAINTAINING_REDUNDANTLY,
- DECREASING,
- DECREASES_REDUNDANTLY,
- LOOP_INVARIANT,
- LOOP_INVARIANT_FREE,
- LOOP_INVARIANT_REDUNDANTLY,
- MEASURED_BY,
- RETURNS,
- RETURNS_REDUNDANTLY,
- BREAKS,
- BREAKS_REDUNDANTLY,
- CONTINUES,
- CONTINUES_REDUNDANTLY,
- OLD,
- FORALL,
- SIGNALS,
- SIGNALS_REDUNDANTLY,
- SIGNALS_ONLY,
- WHEN,
- WORKING_SPACE,
- WORKING_SPACE_REDUNDANTLY,
- CAPTURES,
- CAPTURES_REDUNDANTLY,
- INITIALLY,
- INVARIANT_REDUNDANTLY,
- INVARIANT,
- ASSIGNABLE_REDUNDANTLY,
- MODIFIABLE_REDUNDANTLY,
- MODIFIES_REDUNDANTLY,
- CALLABLE,
- CALLABLE_REDUNDANTLY,
- DIVERGES,
- DIVERGES_REDUNDANTLY,
- DURATION,
- DURATION_REDUNDANTLY
- );
-
- private EnumSet BLOCK_CONTRACT_CLAUSES = EnumSet.of(
- ENSURES,
- ENSURES_FREE,
- ENSURES_REDUNDANTLY,
- REQUIRES,
- REQUIRES_FREE,
- REQUIRES_REDUNDANTLY,
- DECREASES,
- MODIFIES,
- MODIFIABLE,
- ASSIGNABLE,
- ACCESSIBLE,
- PRE,
- POST,
- PRE_REDUNDANTLY,
- POST_REDUNDANTLY,
- MAINTAINING,
- MAINTAINING_REDUNDANTLY,
- DECREASING,
- DECREASES_REDUNDANTLY,
- LOOP_INVARIANT,
- LOOP_INVARIANT_FREE,
- LOOP_INVARIANT_REDUNDANTLY,
- MEASURED_BY,
- RETURNS,
- RETURNS_REDUNDANTLY,
- BREAKS,
- BREAKS_REDUNDANTLY,
- CONTINUES,
- CONTINUES_REDUNDANTLY,
- OLD,
- FORALL,
- SIGNALS,
- SIGNALS_REDUNDANTLY,
- SIGNALS_ONLY,
- WHEN,
- WORKING_SPACE,
- WORKING_SPACE_REDUNDANTLY,
- CAPTURES,
- CAPTURES_REDUNDANTLY,
- INITIALLY,
- INVARIANT_REDUNDANTLY,
- INVARIANT,
- ASSIGNABLE_REDUNDANTLY,
- MODIFIABLE_REDUNDANTLY,
- MODIFIES_REDUNDANTLY,
- CALLABLE,
- CALLABLE_REDUNDANTLY,
- DIVERGES,
- DIVERGES_REDUNDANTLY,
- DURATION,
- DURATION_REDUNDANTLY
- );
-
- private Set currentlyAllowed = new HashSet<>();
-
- @Override
- public void visit(JmlContract n, LintProblemReporter arg) {
- Optional a = n.findAncestor(NodeWithContracts.class);
- if (a.isPresent()) {
- var owner = a.get();
- if (owner instanceof ForEachStmt
- || owner instanceof ForStmt
- || owner instanceof WhileStmt
- || owner instanceof DoStmt) {
- if (n.getType() == JmlContract.Type.LOOP_INV)
- checkClauses(arg, n.getClauses(), LOOP_INVARIANT_CLAUSES, "loop_invariant");
- else
- checkClauses(arg, n.getClauses(), LOOP_CONTRACT_CLAUSES, "loop");
- } else if (owner instanceof MethodDeclaration) {
- checkClauses(arg, n.getClauses(), METHOD_CONTRACT_CLAUSES, "method");
- } else if (owner instanceof BlockStmt) {
- checkClauses(arg, n.getClauses(), BLOCK_CONTRACT_CLAUSES, "block");
- }
- }
- }
-
- private void checkClauses(LintProblemReporter arg, NodeList clauses,
- EnumSet allowed, String type) {
- for (JmlClause clause : clauses) {
- if (!allowed.contains(clause.getKind())) {
- arg.warn(clause, "", "", "%s clause not allowed in a %s contract", clause.getKind(), type);
- }
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/AssignableValidator.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/AssignableValidator.java
deleted file mode 100644
index 1c3c6782a9..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/AssignableValidator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.body.FieldDeclaration;
-import com.github.javaparser.ast.expr.Expression;
-import com.github.javaparser.ast.jml.clauses.JmlClauseKind;
-import com.github.javaparser.ast.jml.clauses.JmlMultiExprClause;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public class AssignableValidator extends LintRuleVisitor {
- @Override
- public void visit(JmlMultiExprClause n, LintProblemReporter arg) {
- if (n.getKind() == JmlClauseKind.ASSIGNABLE ||
- n.getKind() == JmlClauseKind.ASSIGNABLE_REDUNDANTLY) {
- checkFinalFieldsInAssignableClause(n, arg);
- }
- }
-
- private void checkFinalFieldsInAssignableClause(JmlMultiExprClause n, LintProblemReporter arg) {
- for (Expression e : n.getExpression()) {
- if (e.isNameExpr()) {
- if (e.asNameExpr().getNameAsString().equals("this")) {
- arg.error(e, "", "", "This reference is not re-assignable!");
- continue;
- }
- var value = e.asNameExpr().resolve();
- if (value.isEnumConstant()) {
- arg.error(e, "", "", "Enum constants are not re-assignable!");
- } else if (value.isField()) {
- var ast = value.asField().toAst();
- if (ast.isPresent() && ast.get() instanceof FieldDeclaration f && f.isFinal()) {
- arg.error(e, "", "", "This variable is final, so cannot be assigned");
- }
- }
- } else if (e.isArrayAccessExpr()) {
- //TODO weigl check for array-ness of name expr
- var rtype = e.asArrayAccessExpr().getName().calculateResolvedType();
- if (!rtype.isArray()) {
- arg.error(e, "", "", "Array access to non-array. Calculated type is %s", rtype.describe());
- }
- } else {
- arg.error(e, "", "", "Strange expression type found: %s", e.getMetaModel().getTypeName());
- }
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/ContextSensitiveForbiddenFunctionsValidator.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/ContextSensitiveForbiddenFunctionsValidator.java
deleted file mode 100644
index 6496aec6fb..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/ContextSensitiveForbiddenFunctionsValidator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.jml.clauses.JmlClause;
-import com.github.javaparser.ast.jml.clauses.JmlClauseKind;
-import com.github.javaparser.ast.jml.clauses.JmlContract;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public class ContextSensitiveForbiddenFunctionsValidator extends LintRuleVisitor {
- public static final String MULTIPLE_SIGNALS_ONLY = "Use a single signals_only clause to avoid confusion";
- public static final String NOT_SPECIFIED_REDUNDANT = "This clause containing \\not_specified is redundant because you already specified it";
- public static final String BACKSLASH_RESULT_NOT_ALLOWED = "You can only use \\result in an ensures clause";
- public static final String OLD_EXPR_NOT_ALLOWED = "You can only use an \\old() expressions in ensures and signals clauses, assert and assume statements, and in loop invariants";
- private int signalsOnlyCounter;
-
- @Override
- public void visit(JmlContract n, LintProblemReporter arg) {
- signalsOnlyCounter = 0;
- reportMultipleSignalsOnlyClauses(n, arg);
- }
-
- private void reportMultipleSignalsOnlyClauses(JmlContract n, LintProblemReporter arg) {
- for (JmlClause clause : n.getClauses()) {
- if (clause.getKind() == JmlClauseKind.SIGNALS_ONLY)
- signalsOnlyCounter++;
-
- if (signalsOnlyCounter > 1) {
- arg.warn(clause, "", "", MULTIPLE_SIGNALS_ONLY);
- }
- }
-
- for (JmlContract subContract : n.getSubContracts()) {
- reportMultipleSignalsOnlyClauses(subContract, arg);
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JavaContainsJmlConstruct.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JavaContainsJmlConstruct.java
deleted file mode 100644
index 71de888f11..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JavaContainsJmlConstruct.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.Jmlish;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.jml.body.JmlBodyDeclaration;
-import com.github.javaparser.ast.jml.stmt.JmlStatement;
-import com.github.javaparser.ast.validator.ProblemReporter;
-import com.github.javaparser.ast.validator.Validator;
-
-import java.util.function.Predicate;
-
-/**
- * @author Alexander Weigl
- * @version 1 (19.02.22)
- */
-public class JavaContainsJmlConstruct implements Validator {
- @Override
- public void accept(Node node, ProblemReporter problemReporter) {
- accept(node, false, problemReporter);
- }
-
- private void accept(Node current, Boolean inJml, ProblemReporter problemReporter) {
- Predicate openJml = (Node it) ->
- it instanceof JmlBodyDeclaration ||
- it instanceof JmlStatement;
-
- if (!inJml && (current instanceof Jmlish) && !openJml.test(current)) {
- problemReporter.report(current, "Jml construct used in Java part");
- return;
- }
-
- for (Node it : current.getChildNodes()) {
- accept(it, inJml || openJml.test(current), problemReporter);
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JmlJavaNameClashes.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JmlJavaNameClashes.java
deleted file mode 100644
index 6256c53e90..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JmlJavaNameClashes.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-/**
- * @author Alexander Weigl
- * @version 1 (19.02.22)
- */
-public class JmlJavaNameClashes {
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JmlNameClashWithJava.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JmlNameClashWithJava.java
deleted file mode 100644
index f215e18478..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/JmlNameClashWithJava.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.jml.clauses.JmlForallClause;
-import com.github.javaparser.ast.jml.clauses.JmlSignalsClause;
-import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause;
-import com.github.javaparser.jml.JmlUtility;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRule;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public class JmlNameClashWithJava extends LintRuleVisitor {
- public static final LintProblemMeta NOT_AN_EXCEPTION_CLASS
- = new LintProblemMeta("JML-1", "This is not an exception class", LintRule.ERROR);
-
- @Override
- public void visit(JmlSignalsClause n, LintProblemReporter arg) {
- var rtype = n.getParameter().getType().resolve();
- var exception = JmlUtility.resolveException(n);
- if (exception.isAssignableBy(rtype)) {
- arg.report(NOT_AN_EXCEPTION_CLASS.create(n));
- }
- super.visit(n, arg);
- }
-
-
- public static final String PUT_IN_THROWS_CLAUSE = "This exception (or a superclass or subclass of it) should be mentioned in the throws clause of this method";
-
- public static final String CLASS_REFERENCE_NOT_FOUND = "This class could not be resolved, did you forget to import it?";
-
-
- @Override
- public void visit(JmlForallClause n, LintProblemReporter arg) {
- super.visit(n, arg);
- }
-
- public static final String NOT_A_TYPE_NAME = "This is not the name of a primitive type or a class";
- public static final String NO_ARRAY = "This is not an array";
-
-
- @Override
- public void visit(JmlSimpleExprClause n, LintProblemReporter arg) {
- super.visit(n, arg);
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/LintProblemMeta.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/LintProblemMeta.java
deleted file mode 100644
index 0ab6b4b613..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/LintProblemMeta.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.nodeTypes.NodeWithTokenRange;
-import com.github.jmlparser.lint.LintProblem;
-
-/**
- * @author Alexander Weigl
- * @version 1 (21.10.22)
- */
-public record LintProblemMeta(String id, String message, String level) {
-
- public LintProblem create(NodeWithTokenRange n) {
- return new LintProblem(level(), message(), n.getTokenRange().orElse(null), null, id, "");
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/LocationSetValidator.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/LocationSetValidator.java
deleted file mode 100644
index 858d28cac3..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/LocationSetValidator.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public class LocationSetValidator extends LintRuleVisitor {
- public static final String ASSIGNABLE_ARRAY_ONLY = "You can only use '[*]' on arrays";
- public static final String ASSIGNABLE_CLASS_ONLY = "You can only use '.*' on classes and interfaces";
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/MethodBodyHasNoContract.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/MethodBodyHasNoContract.java
deleted file mode 100644
index c547a04d20..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/MethodBodyHasNoContract.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.validator.ProblemReporter;
-import com.github.javaparser.ast.validator.VisitorValidator;
-
-public class MethodBodyHasNoContract extends VisitorValidator {
- @Override
- public void visit(MethodDeclaration n, ProblemReporter arg) {
- if (n.getBody().isPresent() && n.getBody().get().getContracts().isPresent()
- && !n.getBody().get().getContracts().get().isEmpty()
- ) {
- arg.report(n, "Body of method has a block contract.");
- }
- super.visit(n, arg);
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/OverridingLocalNamesInGhost.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/OverridingLocalNamesInGhost.java
deleted file mode 100644
index 5b3aead037..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/OverridingLocalNamesInGhost.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.body.VariableDeclarator;
-import com.github.javaparser.ast.expr.VariableDeclarationExpr;
-import com.github.javaparser.ast.jml.stmt.JmlGhostStmt;
-import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (14.10.22)
- */
-public class OverridingLocalNamesInGhost extends LintRuleVisitor {
- private boolean inGhost;
-
- @Override
- protected void reset() {
- inGhost = false;
- }
-
- @Override
- public void visit(JmlGhostStmt n, LintProblemReporter arg) {
- inGhost = true;
- super.visit(n, arg);
- inGhost = false;
- }
-
- @Override
- public void visit(VariableDeclarationExpr n, LintProblemReporter arg) {
- if (inGhost) {
- JmlGhostStmt s = n.findAncestor(JmlGhostStmt.class).get();
- for (VariableDeclarator variable : n.getVariables()) {
- var name = variable.getNameAsExpression();
- name.setParentNode(s);
- var value = s.getSymbolResolver().resolveDeclaration(name, ResolvedValueDeclaration.class);
- name.setParentNode(null);
- if (value != null) {
- arg.error(variable, "", "", "Variable %s already declared in Java.", variable.getNameAsString());
- }
- }
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/PurityValidator.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/PurityValidator.java
deleted file mode 100644
index 632319e8ac..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/PurityValidator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.Modifier;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.AssignExpr;
-import com.github.javaparser.ast.expr.MethodCallExpr;
-import com.github.javaparser.ast.expr.UnaryExpr;
-import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration;
-import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause;
-import com.github.javaparser.ast.jml.stmt.JmlExpressionStmt;
-import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
-import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (12/29/21)
- */
-public class PurityValidator extends LintRuleVisitor {
- public static final String METHOD_NOT_PURE = "JML expressions should be pure and this method might not be pure";
- public static final String ASSIGNMENT_NOT_PURE = "JML expressions should be pure and assignments are not pure";
-
- @Override
- public void visit(JmlSimpleExprClause n, LintProblemReporter arg) {
- final var r = new PurityVisitor();
- n.getExpression().accept(r, null);
- if (r.reason != null) {
- arg.error(r.reason, "", "", "Expression in JML clause must be pure." + r.text);
- }
- }
-
-
- @Override
- public void visit(JmlClassExprDeclaration n, LintProblemReporter arg) {
- final var r = new PurityVisitor();
- n.getInvariant().accept(r, null);
- if (r.reason != null) {
- arg.error(r.reason, "", "", "Expression in JML invariant clause must be pure." + r.text);
- }
- }
-
- @Override
- public void visit(JmlExpressionStmt n, LintProblemReporter arg) {
- final var r = new PurityVisitor();
- n.getExpression().accept(r, null);
- if (r.reason != null) {
- arg.error(r.reason, "", "", "Expression in JML statements must be pure." + r.text);
- }
- }
-
-
- private static class PurityVisitor extends VoidVisitorAdapter {
- private Node reason;
- private String text;
-
- @Override
- public void visit(AssignExpr n, Void arg) {
- reason = n;
- }
-
- @Override
- public void visit(UnaryExpr n, Void arg) {
- switch (n.getOperator()) {
- case POSTFIX_DECREMENT:
- case POSTFIX_INCREMENT:
- reason = n;
- text = "Postfix de-/increment operator found.";
- break;
- case PREFIX_INCREMENT:
- case PREFIX_DECREMENT:
- reason = n;
- text = "Prefix de-/increment operator found";
- break;
- default:
- n.getExpression().accept(this, arg);
- break;
- }
- }
-
- @Override
- public void visit(MethodCallExpr n, Void arg) {
- var r = n.resolve().toAst();
- if (r.isPresent() && r.get() instanceof NodeWithModifiers mods
- && (mods.hasModifier(Modifier.DefaultKeyword.JML_PURE)
- || mods.hasModifier(Modifier.DefaultKeyword.JML_STRICTLY_PURE))) {
- super.visit(n, arg);
- } else {
- reason = n;
- text = METHOD_NOT_PURE;
- }
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/ResultVarCheck.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/ResultVarCheck.java
deleted file mode 100644
index 36b0de5468..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/rules/ResultVarCheck.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.jmlparser.lint.rules;
-
-import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.expr.NameExpr;
-import com.github.javaparser.ast.jml.clauses.JmlClauseKind;
-import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause;
-import com.github.jmlparser.lint.LintProblemReporter;
-import com.github.jmlparser.lint.LintRuleVisitor;
-
-/**
- * @author Alexander Weigl
- * @version 1 (14.10.22)
- */
-public class ResultVarCheck extends LintRuleVisitor {
- public static final String NO_METHOD_RESULT = "Cannot use \\result here, as this method / constructor does not return anything";
- private boolean inMethodWithNonVoidReturnType = false;
- private boolean inPostCondition = false;
-
- @Override
- protected void reset() {
- inPostCondition = false;
- }
-
- @Override
- public void visit(MethodDeclaration n, LintProblemReporter arg) {
- inMethodWithNonVoidReturnType = !n.getType().isVoidType();
- n.getContracts().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
- inMethodWithNonVoidReturnType = false;
- n.getBody().ifPresent(l -> l.accept(this, arg));
- }
-
- @Override
- public void visit(JmlSimpleExprClause n, LintProblemReporter arg) {
- inPostCondition = n.getKind() == JmlClauseKind.ENSURES
- || n.getKind() == JmlClauseKind.ENSURES_FREE
- || n.getKind() == JmlClauseKind.ENSURES_REDUNDANTLY
- || n.getKind() == JmlClauseKind.POST
- || n.getKind() == JmlClauseKind.POST_REDUNDANTLY;
- super.visit(n, arg);
- inPostCondition = false;
- }
-
- @Override
- public void visit(NameExpr n, LintProblemReporter arg) {
- if (n.getNameAsString().equals("\\result")) {
- if (!inPostCondition)
- arg.error(n, "", "", "Use of \\result in non-post-conditional clause.");
- if (!inMethodWithNonVoidReturnType)
- arg.error(n, "", "", NO_METHOD_RESULT);
- }
- }
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Address.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Address.java
deleted file mode 100644
index e83bb51826..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Address.java
+++ /dev/null
@@ -1,379 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * A physical or virtual address, or a range of addresses, in an 'addressable region' (memory or a binary file).
- */
-@Generated("jsonschema2pojo")
-public class Address {
-
- /**
- * The address expressed as a byte offset from the start of the addressable region.
- */
- @SerializedName("absoluteAddress")
- @Expose
- private int absoluteAddress = -1;
- /**
- * The address expressed as a byte offset from the absolute address of the top-most parent object.
- */
- @SerializedName("relativeAddress")
- @Expose
- private int relativeAddress;
- /**
- * The number of bytes in this range of addresses.
- */
- @SerializedName("length")
- @Expose
- private int length;
- /**
- * An open-ended string that identifies the address kind. 'data', 'function', 'header','instruction', 'module', 'page', 'section', 'segment', 'stack', 'stackFrame', 'table' are well-known values.
- */
- @SerializedName("kind")
- @Expose
- private String kind;
- /**
- * A name that is associated with the address, e.g., '.text'.
- */
- @SerializedName("name")
- @Expose
- private String name;
- /**
- * A human-readable fully qualified name that is associated with the address.
- */
- @SerializedName("fullyQualifiedName")
- @Expose
- private String fullyQualifiedName;
- /**
- * The byte offset of this address from the absolute or relative address of the parent object.
- */
- @SerializedName("offsetFromParent")
- @Expose
- private int offsetFromParent;
- /**
- * The index within run.addresses of the cached object for this address.
- */
- @SerializedName("index")
- @Expose
- private int index = -1;
- /**
- * The index within run.addresses of the parent object.
- */
- @SerializedName("parentIndex")
- @Expose
- private int parentIndex = -1;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public Address() {
- }
-
- /**
- * @param offsetFromParent
- * @param parentIndex
- * @param relativeAddress
- * @param kind
- * @param length
- * @param name
- * @param index
- * @param fullyQualifiedName
- * @param properties
- * @param absoluteAddress
- */
- public Address(int absoluteAddress, int relativeAddress, int length, String kind, String name, String fullyQualifiedName, int offsetFromParent, int index, int parentIndex, PropertyBag properties) {
- super();
- this.absoluteAddress = absoluteAddress;
- this.relativeAddress = relativeAddress;
- this.length = length;
- this.kind = kind;
- this.name = name;
- this.fullyQualifiedName = fullyQualifiedName;
- this.offsetFromParent = offsetFromParent;
- this.index = index;
- this.parentIndex = parentIndex;
- this.properties = properties;
- }
-
- /**
- * The address expressed as a byte offset from the start of the addressable region.
- */
- public int getAbsoluteAddress() {
- return absoluteAddress;
- }
-
- /**
- * The address expressed as a byte offset from the start of the addressable region.
- */
- public void setAbsoluteAddress(int absoluteAddress) {
- this.absoluteAddress = absoluteAddress;
- }
-
- public Address withAbsoluteAddress(int absoluteAddress) {
- this.absoluteAddress = absoluteAddress;
- return this;
- }
-
- /**
- * The address expressed as a byte offset from the absolute address of the top-most parent object.
- */
- public int getRelativeAddress() {
- return relativeAddress;
- }
-
- /**
- * The address expressed as a byte offset from the absolute address of the top-most parent object.
- */
- public void setRelativeAddress(int relativeAddress) {
- this.relativeAddress = relativeAddress;
- }
-
- public Address withRelativeAddress(int relativeAddress) {
- this.relativeAddress = relativeAddress;
- return this;
- }
-
- /**
- * The number of bytes in this range of addresses.
- */
- public int getLength() {
- return length;
- }
-
- /**
- * The number of bytes in this range of addresses.
- */
- public void setLength(int length) {
- this.length = length;
- }
-
- public Address withLength(int length) {
- this.length = length;
- return this;
- }
-
- /**
- * An open-ended string that identifies the address kind. 'data', 'function', 'header','instruction', 'module', 'page', 'section', 'segment', 'stack', 'stackFrame', 'table' are well-known values.
- */
- public String getKind() {
- return kind;
- }
-
- /**
- * An open-ended string that identifies the address kind. 'data', 'function', 'header','instruction', 'module', 'page', 'section', 'segment', 'stack', 'stackFrame', 'table' are well-known values.
- */
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public Address withKind(String kind) {
- this.kind = kind;
- return this;
- }
-
- /**
- * A name that is associated with the address, e.g., '.text'.
- */
- public String getName() {
- return name;
- }
-
- /**
- * A name that is associated with the address, e.g., '.text'.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- public Address withName(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * A human-readable fully qualified name that is associated with the address.
- */
- public String getFullyQualifiedName() {
- return fullyQualifiedName;
- }
-
- /**
- * A human-readable fully qualified name that is associated with the address.
- */
- public void setFullyQualifiedName(String fullyQualifiedName) {
- this.fullyQualifiedName = fullyQualifiedName;
- }
-
- public Address withFullyQualifiedName(String fullyQualifiedName) {
- this.fullyQualifiedName = fullyQualifiedName;
- return this;
- }
-
- /**
- * The byte offset of this address from the absolute or relative address of the parent object.
- */
- public int getOffsetFromParent() {
- return offsetFromParent;
- }
-
- /**
- * The byte offset of this address from the absolute or relative address of the parent object.
- */
- public void setOffsetFromParent(int offsetFromParent) {
- this.offsetFromParent = offsetFromParent;
- }
-
- public Address withOffsetFromParent(int offsetFromParent) {
- this.offsetFromParent = offsetFromParent;
- return this;
- }
-
- /**
- * The index within run.addresses of the cached object for this address.
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * The index within run.addresses of the cached object for this address.
- */
- public void setIndex(int index) {
- this.index = index;
- }
-
- public Address withIndex(int index) {
- this.index = index;
- return this;
- }
-
- /**
- * The index within run.addresses of the parent object.
- */
- public int getParentIndex() {
- return parentIndex;
- }
-
- /**
- * The index within run.addresses of the parent object.
- */
- public void setParentIndex(int parentIndex) {
- this.parentIndex = parentIndex;
- }
-
- public Address withParentIndex(int parentIndex) {
- this.parentIndex = parentIndex;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public Address withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(Address.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("absoluteAddress");
- sb.append('=');
- sb.append(this.absoluteAddress);
- sb.append(',');
- sb.append("relativeAddress");
- sb.append('=');
- sb.append(this.relativeAddress);
- sb.append(',');
- sb.append("length");
- sb.append('=');
- sb.append(this.length);
- sb.append(',');
- sb.append("kind");
- sb.append('=');
- sb.append(((this.kind == null) ? "" : this.kind));
- sb.append(',');
- sb.append("name");
- sb.append('=');
- sb.append(((this.name == null) ? "" : this.name));
- sb.append(',');
- sb.append("fullyQualifiedName");
- sb.append('=');
- sb.append(((this.fullyQualifiedName == null) ? "" : this.fullyQualifiedName));
- sb.append(',');
- sb.append("offsetFromParent");
- sb.append('=');
- sb.append(this.offsetFromParent);
- sb.append(',');
- sb.append("index");
- sb.append('=');
- sb.append(this.index);
- sb.append(',');
- sb.append("parentIndex");
- sb.append('=');
- sb.append(this.parentIndex);
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + this.offsetFromParent);
- result = ((result * 31) + this.parentIndex);
- result = ((result * 31) + this.relativeAddress);
- result = ((result * 31) + ((this.kind == null) ? 0 : this.kind.hashCode()));
- result = ((result * 31) + this.length);
- result = ((result * 31) + ((this.name == null) ? 0 : this.name.hashCode()));
- result = ((result * 31) + this.index);
- result = ((result * 31) + ((this.fullyQualifiedName == null) ? 0 : this.fullyQualifiedName.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + this.absoluteAddress);
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof Address) == false) {
- return false;
- }
- Address rhs = ((Address) other);
- return ((((((((((this.offsetFromParent == rhs.offsetFromParent) && (this.parentIndex == rhs.parentIndex)) && (this.relativeAddress == rhs.relativeAddress)) && ((this.kind == rhs.kind) || ((this.kind != null) && this.kind.equals(rhs.kind)))) && (this.length == rhs.length)) && ((this.name == rhs.name) || ((this.name != null) && this.name.equals(rhs.name)))) && (this.index == rhs.index)) && ((this.fullyQualifiedName == rhs.fullyQualifiedName) || ((this.fullyQualifiedName != null) && this.fullyQualifiedName.equals(rhs.fullyQualifiedName)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && (this.absoluteAddress == rhs.absoluteAddress));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Artifact.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Artifact.java
deleted file mode 100644
index ed9f206cb7..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Artifact.java
+++ /dev/null
@@ -1,478 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * A single artifact. In some cases, this artifact might be nested within another artifact.
- */
-@Generated("jsonschema2pojo")
-public class Artifact {
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- @SerializedName("description")
- @Expose
- private Message description;
- /**
- * Specifies the location of an artifact.
- */
- @SerializedName("location")
- @Expose
- private ArtifactLocation location;
- /**
- * Identifies the index of the immediate parent of the artifact, if this artifact is nested.
- */
- @SerializedName("parentIndex")
- @Expose
- private int parentIndex = -1;
- /**
- * The offset in bytes of the artifact within its containing artifact.
- */
- @SerializedName("offset")
- @Expose
- private int offset;
- /**
- * The length of the artifact in bytes.
- */
- @SerializedName("length")
- @Expose
- private int length = -1;
- /**
- * The role or roles played by the artifact in the analysis.
- */
- @SerializedName("roles")
- @Expose
- private Set roles = new LinkedHashSet();
- /**
- * The MIME type (RFC 2045) of the artifact.
- */
- @SerializedName("mimeType")
- @Expose
- private String mimeType;
- /**
- * Represents the contents of an artifact.
- */
- @SerializedName("contents")
- @Expose
- private ArtifactContent contents;
- /**
- * Specifies the encoding for an artifact object that refers to a text file.
- */
- @SerializedName("encoding")
- @Expose
- private String encoding;
- /**
- * Specifies the source language for any artifact object that refers to a text file that contains source code.
- */
- @SerializedName("sourceLanguage")
- @Expose
- private String sourceLanguage;
- /**
- * A dictionary, each of whose keys is the name of a hash function and each of whose values is the hashed value of the artifact produced by the specified hash function.
- */
- @SerializedName("hashes")
- @Expose
- private Hashes hashes;
- /**
- * The Coordinated Universal Time (UTC) date and time at which the artifact was most recently modified. See "Date/time properties" in the SARIF spec for the required format.
- */
- @SerializedName("lastModifiedTimeUtc")
- @Expose
- private Date lastModifiedTimeUtc;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public Artifact() {
- }
-
- /**
- * @param parentIndex
- * @param offset
- * @param roles
- * @param lastModifiedTimeUtc
- * @param length
- * @param description
- * @param mimeType
- * @param encoding
- * @param contents
- * @param hashes
- * @param location
- * @param sourceLanguage
- * @param properties
- */
- public Artifact(Message description, ArtifactLocation location, int parentIndex, int offset, int length, Set roles, String mimeType, ArtifactContent contents, String encoding, String sourceLanguage, Hashes hashes, Date lastModifiedTimeUtc, PropertyBag properties) {
- super();
- this.description = description;
- this.location = location;
- this.parentIndex = parentIndex;
- this.offset = offset;
- this.length = length;
- this.roles = roles;
- this.mimeType = mimeType;
- this.contents = contents;
- this.encoding = encoding;
- this.sourceLanguage = sourceLanguage;
- this.hashes = hashes;
- this.lastModifiedTimeUtc = lastModifiedTimeUtc;
- this.properties = properties;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public Message getDescription() {
- return description;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public void setDescription(Message description) {
- this.description = description;
- }
-
- public Artifact withDescription(Message description) {
- this.description = description;
- return this;
- }
-
- /**
- * Specifies the location of an artifact.
- */
- public ArtifactLocation getLocation() {
- return location;
- }
-
- /**
- * Specifies the location of an artifact.
- */
- public void setLocation(ArtifactLocation location) {
- this.location = location;
- }
-
- public Artifact withLocation(ArtifactLocation location) {
- this.location = location;
- return this;
- }
-
- /**
- * Identifies the index of the immediate parent of the artifact, if this artifact is nested.
- */
- public int getParentIndex() {
- return parentIndex;
- }
-
- /**
- * Identifies the index of the immediate parent of the artifact, if this artifact is nested.
- */
- public void setParentIndex(int parentIndex) {
- this.parentIndex = parentIndex;
- }
-
- public Artifact withParentIndex(int parentIndex) {
- this.parentIndex = parentIndex;
- return this;
- }
-
- /**
- * The offset in bytes of the artifact within its containing artifact.
- */
- public int getOffset() {
- return offset;
- }
-
- /**
- * The offset in bytes of the artifact within its containing artifact.
- */
- public void setOffset(int offset) {
- this.offset = offset;
- }
-
- public Artifact withOffset(int offset) {
- this.offset = offset;
- return this;
- }
-
- /**
- * The length of the artifact in bytes.
- */
- public int getLength() {
- return length;
- }
-
- /**
- * The length of the artifact in bytes.
- */
- public void setLength(int length) {
- this.length = length;
- }
-
- public Artifact withLength(int length) {
- this.length = length;
- return this;
- }
-
- /**
- * The role or roles played by the artifact in the analysis.
- */
- public Set getRoles() {
- return roles;
- }
-
- /**
- * The role or roles played by the artifact in the analysis.
- */
- public void setRoles(Set roles) {
- this.roles = roles;
- }
-
- public Artifact withRoles(Set roles) {
- this.roles = roles;
- return this;
- }
-
- /**
- * The MIME type (RFC 2045) of the artifact.
- */
- public String getMimeType() {
- return mimeType;
- }
-
- /**
- * The MIME type (RFC 2045) of the artifact.
- */
- public void setMimeType(String mimeType) {
- this.mimeType = mimeType;
- }
-
- public Artifact withMimeType(String mimeType) {
- this.mimeType = mimeType;
- return this;
- }
-
- /**
- * Represents the contents of an artifact.
- */
- public ArtifactContent getContents() {
- return contents;
- }
-
- /**
- * Represents the contents of an artifact.
- */
- public void setContents(ArtifactContent contents) {
- this.contents = contents;
- }
-
- public Artifact withContents(ArtifactContent contents) {
- this.contents = contents;
- return this;
- }
-
- /**
- * Specifies the encoding for an artifact object that refers to a text file.
- */
- public String getEncoding() {
- return encoding;
- }
-
- /**
- * Specifies the encoding for an artifact object that refers to a text file.
- */
- public void setEncoding(String encoding) {
- this.encoding = encoding;
- }
-
- public Artifact withEncoding(String encoding) {
- this.encoding = encoding;
- return this;
- }
-
- /**
- * Specifies the source language for any artifact object that refers to a text file that contains source code.
- */
- public String getSourceLanguage() {
- return sourceLanguage;
- }
-
- /**
- * Specifies the source language for any artifact object that refers to a text file that contains source code.
- */
- public void setSourceLanguage(String sourceLanguage) {
- this.sourceLanguage = sourceLanguage;
- }
-
- public Artifact withSourceLanguage(String sourceLanguage) {
- this.sourceLanguage = sourceLanguage;
- return this;
- }
-
- /**
- * A dictionary, each of whose keys is the name of a hash function and each of whose values is the hashed value of the artifact produced by the specified hash function.
- */
- public Hashes getHashes() {
- return hashes;
- }
-
- /**
- * A dictionary, each of whose keys is the name of a hash function and each of whose values is the hashed value of the artifact produced by the specified hash function.
- */
- public void setHashes(Hashes hashes) {
- this.hashes = hashes;
- }
-
- public Artifact withHashes(Hashes hashes) {
- this.hashes = hashes;
- return this;
- }
-
- /**
- * The Coordinated Universal Time (UTC) date and time at which the artifact was most recently modified. See "Date/time properties" in the SARIF spec for the required format.
- */
- public Date getLastModifiedTimeUtc() {
- return lastModifiedTimeUtc;
- }
-
- /**
- * The Coordinated Universal Time (UTC) date and time at which the artifact was most recently modified. See "Date/time properties" in the SARIF spec for the required format.
- */
- public void setLastModifiedTimeUtc(Date lastModifiedTimeUtc) {
- this.lastModifiedTimeUtc = lastModifiedTimeUtc;
- }
-
- public Artifact withLastModifiedTimeUtc(Date lastModifiedTimeUtc) {
- this.lastModifiedTimeUtc = lastModifiedTimeUtc;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public Artifact withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(Artifact.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("description");
- sb.append('=');
- sb.append(((this.description == null) ? "" : this.description));
- sb.append(',');
- sb.append("location");
- sb.append('=');
- sb.append(((this.location == null) ? "" : this.location));
- sb.append(',');
- sb.append("parentIndex");
- sb.append('=');
- sb.append(this.parentIndex);
- sb.append(',');
- sb.append("offset");
- sb.append('=');
- sb.append(this.offset);
- sb.append(',');
- sb.append("length");
- sb.append('=');
- sb.append(this.length);
- sb.append(',');
- sb.append("roles");
- sb.append('=');
- sb.append(((this.roles == null) ? "" : this.roles));
- sb.append(',');
- sb.append("mimeType");
- sb.append('=');
- sb.append(((this.mimeType == null) ? "" : this.mimeType));
- sb.append(',');
- sb.append("contents");
- sb.append('=');
- sb.append(((this.contents == null) ? "" : this.contents));
- sb.append(',');
- sb.append("encoding");
- sb.append('=');
- sb.append(((this.encoding == null) ? "" : this.encoding));
- sb.append(',');
- sb.append("sourceLanguage");
- sb.append('=');
- sb.append(((this.sourceLanguage == null) ? "" : this.sourceLanguage));
- sb.append(',');
- sb.append("hashes");
- sb.append('=');
- sb.append(((this.hashes == null) ? "" : this.hashes));
- sb.append(',');
- sb.append("lastModifiedTimeUtc");
- sb.append('=');
- sb.append(((this.lastModifiedTimeUtc == null) ? "" : this.lastModifiedTimeUtc));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + this.parentIndex);
- result = ((result * 31) + this.offset);
- result = ((result * 31) + ((this.roles == null) ? 0 : this.roles.hashCode()));
- result = ((result * 31) + ((this.lastModifiedTimeUtc == null) ? 0 : this.lastModifiedTimeUtc.hashCode()));
- result = ((result * 31) + this.length);
- result = ((result * 31) + ((this.description == null) ? 0 : this.description.hashCode()));
- result = ((result * 31) + ((this.mimeType == null) ? 0 : this.mimeType.hashCode()));
- result = ((result * 31) + ((this.encoding == null) ? 0 : this.encoding.hashCode()));
- result = ((result * 31) + ((this.contents == null) ? 0 : this.contents.hashCode()));
- result = ((result * 31) + ((this.hashes == null) ? 0 : this.hashes.hashCode()));
- result = ((result * 31) + ((this.location == null) ? 0 : this.location.hashCode()));
- result = ((result * 31) + ((this.sourceLanguage == null) ? 0 : this.sourceLanguage.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof Artifact) == false) {
- return false;
- }
- Artifact rhs = ((Artifact) other);
- return (((((((((((((this.parentIndex == rhs.parentIndex) && (this.offset == rhs.offset)) && ((this.roles == rhs.roles) || ((this.roles != null) && this.roles.equals(rhs.roles)))) && ((this.lastModifiedTimeUtc == rhs.lastModifiedTimeUtc) || ((this.lastModifiedTimeUtc != null) && this.lastModifiedTimeUtc.equals(rhs.lastModifiedTimeUtc)))) && (this.length == rhs.length)) && ((this.description == rhs.description) || ((this.description != null) && this.description.equals(rhs.description)))) && ((this.mimeType == rhs.mimeType) || ((this.mimeType != null) && this.mimeType.equals(rhs.mimeType)))) && ((this.encoding == rhs.encoding) || ((this.encoding != null) && this.encoding.equals(rhs.encoding)))) && ((this.contents == rhs.contents) || ((this.contents != null) && this.contents.equals(rhs.contents)))) && ((this.hashes == rhs.hashes) || ((this.hashes != null) && this.hashes.equals(rhs.hashes)))) && ((this.location == rhs.location) || ((this.location != null) && this.location.equals(rhs.location)))) && ((this.sourceLanguage == rhs.sourceLanguage) || ((this.sourceLanguage != null) && this.sourceLanguage.equals(rhs.sourceLanguage)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactChange.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactChange.java
deleted file mode 100644
index bd8806c1f1..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactChange.java
+++ /dev/null
@@ -1,163 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * A change to a single artifact.
- */
-@Generated("jsonschema2pojo")
-public class ArtifactChange {
-
- /**
- * Specifies the location of an artifact.
- * (Required)
- */
- @SerializedName("artifactLocation")
- @Expose
- private ArtifactLocation artifactLocation;
- /**
- * An array of replacement objects, each of which represents the replacement of a single region in a single artifact specified by 'artifactLocation'.
- * (Required)
- */
- @SerializedName("replacements")
- @Expose
- private List replacements = new ArrayList();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public ArtifactChange() {
- }
-
- /**
- * @param replacements
- * @param artifactLocation
- * @param properties
- */
- public ArtifactChange(ArtifactLocation artifactLocation, List replacements, PropertyBag properties) {
- super();
- this.artifactLocation = artifactLocation;
- this.replacements = replacements;
- this.properties = properties;
- }
-
- /**
- * Specifies the location of an artifact.
- * (Required)
- */
- public ArtifactLocation getArtifactLocation() {
- return artifactLocation;
- }
-
- /**
- * Specifies the location of an artifact.
- * (Required)
- */
- public void setArtifactLocation(ArtifactLocation artifactLocation) {
- this.artifactLocation = artifactLocation;
- }
-
- public ArtifactChange withArtifactLocation(ArtifactLocation artifactLocation) {
- this.artifactLocation = artifactLocation;
- return this;
- }
-
- /**
- * An array of replacement objects, each of which represents the replacement of a single region in a single artifact specified by 'artifactLocation'.
- * (Required)
- */
- public List getReplacements() {
- return replacements;
- }
-
- /**
- * An array of replacement objects, each of which represents the replacement of a single region in a single artifact specified by 'artifactLocation'.
- * (Required)
- */
- public void setReplacements(List replacements) {
- this.replacements = replacements;
- }
-
- public ArtifactChange withReplacements(List replacements) {
- this.replacements = replacements;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public ArtifactChange withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(ArtifactChange.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("artifactLocation");
- sb.append('=');
- sb.append(((this.artifactLocation == null) ? "" : this.artifactLocation));
- sb.append(',');
- sb.append("replacements");
- sb.append('=');
- sb.append(((this.replacements == null) ? "" : this.replacements));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.artifactLocation == null) ? 0 : this.artifactLocation.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + ((this.replacements == null) ? 0 : this.replacements.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof ArtifactChange) == false) {
- return false;
- }
- ArtifactChange rhs = ((ArtifactChange) other);
- return ((((this.artifactLocation == rhs.artifactLocation) || ((this.artifactLocation != null) && this.artifactLocation.equals(rhs.artifactLocation))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && ((this.replacements == rhs.replacements) || ((this.replacements != null) && this.replacements.equals(rhs.replacements))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactContent.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactContent.java
deleted file mode 100644
index a48a7435bd..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactContent.java
+++ /dev/null
@@ -1,187 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Represents the contents of an artifact.
- */
-@Generated("jsonschema2pojo")
-public class ArtifactContent {
-
- /**
- * UTF-8-encoded content from a text artifact.
- */
- @SerializedName("text")
- @Expose
- private String text;
- /**
- * MIME Base64-encoded content from a binary artifact, or from a text artifact in its original encoding.
- */
- @SerializedName("binary")
- @Expose
- private String binary;
- /**
- * A message string or message format string rendered in multiple formats.
- */
- @SerializedName("rendered")
- @Expose
- private MultiformatMessageString rendered;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public ArtifactContent() {
- }
-
- /**
- * @param rendered
- * @param binary
- * @param text
- * @param properties
- */
- public ArtifactContent(String text, String binary, MultiformatMessageString rendered, PropertyBag properties) {
- super();
- this.text = text;
- this.binary = binary;
- this.rendered = rendered;
- this.properties = properties;
- }
-
- /**
- * UTF-8-encoded content from a text artifact.
- */
- public String getText() {
- return text;
- }
-
- /**
- * UTF-8-encoded content from a text artifact.
- */
- public void setText(String text) {
- this.text = text;
- }
-
- public ArtifactContent withText(String text) {
- this.text = text;
- return this;
- }
-
- /**
- * MIME Base64-encoded content from a binary artifact, or from a text artifact in its original encoding.
- */
- public String getBinary() {
- return binary;
- }
-
- /**
- * MIME Base64-encoded content from a binary artifact, or from a text artifact in its original encoding.
- */
- public void setBinary(String binary) {
- this.binary = binary;
- }
-
- public ArtifactContent withBinary(String binary) {
- this.binary = binary;
- return this;
- }
-
- /**
- * A message string or message format string rendered in multiple formats.
- */
- public MultiformatMessageString getRendered() {
- return rendered;
- }
-
- /**
- * A message string or message format string rendered in multiple formats.
- */
- public void setRendered(MultiformatMessageString rendered) {
- this.rendered = rendered;
- }
-
- public ArtifactContent withRendered(MultiformatMessageString rendered) {
- this.rendered = rendered;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public ArtifactContent withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(ArtifactContent.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("text");
- sb.append('=');
- sb.append(((this.text == null) ? "" : this.text));
- sb.append(',');
- sb.append("binary");
- sb.append('=');
- sb.append(((this.binary == null) ? "" : this.binary));
- sb.append(',');
- sb.append("rendered");
- sb.append('=');
- sb.append(((this.rendered == null) ? "" : this.rendered));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.text == null) ? 0 : this.text.hashCode()));
- result = ((result * 31) + ((this.rendered == null) ? 0 : this.rendered.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + ((this.binary == null) ? 0 : this.binary.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof ArtifactContent) == false) {
- return false;
- }
- ArtifactContent rhs = ((ArtifactContent) other);
- return (((((this.text == rhs.text) || ((this.text != null) && this.text.equals(rhs.text))) && ((this.rendered == rhs.rendered) || ((this.rendered != null) && this.rendered.equals(rhs.rendered)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && ((this.binary == rhs.binary) || ((this.binary != null) && this.binary.equals(rhs.binary))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactLocation.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactLocation.java
deleted file mode 100644
index e58b5e6cfc..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ArtifactLocation.java
+++ /dev/null
@@ -1,219 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Specifies the location of an artifact.
- */
-@Generated("jsonschema2pojo")
-public class ArtifactLocation {
-
- /**
- * A string containing a valid relative or absolute URI.
- */
- @SerializedName("uri")
- @Expose
- private String uri;
- /**
- * A string which indirectly specifies the absolute URI with respect to which a relative URI in the "uri" property is interpreted.
- */
- @SerializedName("uriBaseId")
- @Expose
- private String uriBaseId;
- /**
- * The index within the run artifacts array of the artifact object associated with the artifact location.
- */
- @SerializedName("index")
- @Expose
- private int index = -1;
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- @SerializedName("description")
- @Expose
- private Message description;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public ArtifactLocation() {
- }
-
- /**
- * @param index
- * @param description
- * @param uri
- * @param properties
- * @param uriBaseId
- */
- public ArtifactLocation(String uri, String uriBaseId, int index, Message description, PropertyBag properties) {
- super();
- this.uri = uri;
- this.uriBaseId = uriBaseId;
- this.index = index;
- this.description = description;
- this.properties = properties;
- }
-
- /**
- * A string containing a valid relative or absolute URI.
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * A string containing a valid relative or absolute URI.
- */
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- public ArtifactLocation withUri(String uri) {
- this.uri = uri;
- return this;
- }
-
- /**
- * A string which indirectly specifies the absolute URI with respect to which a relative URI in the "uri" property is interpreted.
- */
- public String getUriBaseId() {
- return uriBaseId;
- }
-
- /**
- * A string which indirectly specifies the absolute URI with respect to which a relative URI in the "uri" property is interpreted.
- */
- public void setUriBaseId(String uriBaseId) {
- this.uriBaseId = uriBaseId;
- }
-
- public ArtifactLocation withUriBaseId(String uriBaseId) {
- this.uriBaseId = uriBaseId;
- return this;
- }
-
- /**
- * The index within the run artifacts array of the artifact object associated with the artifact location.
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * The index within the run artifacts array of the artifact object associated with the artifact location.
- */
- public void setIndex(int index) {
- this.index = index;
- }
-
- public ArtifactLocation withIndex(int index) {
- this.index = index;
- return this;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public Message getDescription() {
- return description;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public void setDescription(Message description) {
- this.description = description;
- }
-
- public ArtifactLocation withDescription(Message description) {
- this.description = description;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public ArtifactLocation withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(ArtifactLocation.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("uri");
- sb.append('=');
- sb.append(((this.uri == null) ? "" : this.uri));
- sb.append(',');
- sb.append("uriBaseId");
- sb.append('=');
- sb.append(((this.uriBaseId == null) ? "" : this.uriBaseId));
- sb.append(',');
- sb.append("index");
- sb.append('=');
- sb.append(this.index);
- sb.append(',');
- sb.append("description");
- sb.append('=');
- sb.append(((this.description == null) ? "" : this.description));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + this.index);
- result = ((result * 31) + ((this.description == null) ? 0 : this.description.hashCode()));
- result = ((result * 31) + ((this.uri == null) ? 0 : this.uri.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + ((this.uriBaseId == null) ? 0 : this.uriBaseId.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof ArtifactLocation) == false) {
- return false;
- }
- ArtifactLocation rhs = ((ArtifactLocation) other);
- return (((((this.index == rhs.index) && ((this.description == rhs.description) || ((this.description != null) && this.description.equals(rhs.description)))) && ((this.uri == rhs.uri) || ((this.uri != null) && this.uri.equals(rhs.uri)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && ((this.uriBaseId == rhs.uriBaseId) || ((this.uriBaseId != null) && this.uriBaseId.equals(rhs.uriBaseId))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Attachment.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Attachment.java
deleted file mode 100644
index d809d0d4a8..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Attachment.java
+++ /dev/null
@@ -1,224 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * An artifact relevant to a result.
- */
-@Generated("jsonschema2pojo")
-public class Attachment {
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- @SerializedName("description")
- @Expose
- private Message description;
- /**
- * Specifies the location of an artifact.
- * (Required)
- */
- @SerializedName("artifactLocation")
- @Expose
- private ArtifactLocation artifactLocation;
- /**
- * An array of regions of interest within the attachment.
- */
- @SerializedName("regions")
- @Expose
- private Set regions = new LinkedHashSet();
- /**
- * An array of rectangles specifying areas of interest within the image.
- */
- @SerializedName("rectangles")
- @Expose
- private Set rectangles = new LinkedHashSet();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public Attachment() {
- }
-
- /**
- * @param regions
- * @param rectangles
- * @param description
- * @param artifactLocation
- * @param properties
- */
- public Attachment(Message description, ArtifactLocation artifactLocation, Set regions, Set rectangles, PropertyBag properties) {
- super();
- this.description = description;
- this.artifactLocation = artifactLocation;
- this.regions = regions;
- this.rectangles = rectangles;
- this.properties = properties;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public Message getDescription() {
- return description;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public void setDescription(Message description) {
- this.description = description;
- }
-
- public Attachment withDescription(Message description) {
- this.description = description;
- return this;
- }
-
- /**
- * Specifies the location of an artifact.
- * (Required)
- */
- public ArtifactLocation getArtifactLocation() {
- return artifactLocation;
- }
-
- /**
- * Specifies the location of an artifact.
- * (Required)
- */
- public void setArtifactLocation(ArtifactLocation artifactLocation) {
- this.artifactLocation = artifactLocation;
- }
-
- public Attachment withArtifactLocation(ArtifactLocation artifactLocation) {
- this.artifactLocation = artifactLocation;
- return this;
- }
-
- /**
- * An array of regions of interest within the attachment.
- */
- public Set getRegions() {
- return regions;
- }
-
- /**
- * An array of regions of interest within the attachment.
- */
- public void setRegions(Set regions) {
- this.regions = regions;
- }
-
- public Attachment withRegions(Set regions) {
- this.regions = regions;
- return this;
- }
-
- /**
- * An array of rectangles specifying areas of interest within the image.
- */
- public Set getRectangles() {
- return rectangles;
- }
-
- /**
- * An array of rectangles specifying areas of interest within the image.
- */
- public void setRectangles(Set rectangles) {
- this.rectangles = rectangles;
- }
-
- public Attachment withRectangles(Set rectangles) {
- this.rectangles = rectangles;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public Attachment withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(Attachment.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("description");
- sb.append('=');
- sb.append(((this.description == null) ? "" : this.description));
- sb.append(',');
- sb.append("artifactLocation");
- sb.append('=');
- sb.append(((this.artifactLocation == null) ? "" : this.artifactLocation));
- sb.append(',');
- sb.append("regions");
- sb.append('=');
- sb.append(((this.regions == null) ? "" : this.regions));
- sb.append(',');
- sb.append("rectangles");
- sb.append('=');
- sb.append(((this.rectangles == null) ? "" : this.rectangles));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.description == null) ? 0 : this.description.hashCode()));
- result = ((result * 31) + ((this.regions == null) ? 0 : this.regions.hashCode()));
- result = ((result * 31) + ((this.rectangles == null) ? 0 : this.rectangles.hashCode()));
- result = ((result * 31) + ((this.artifactLocation == null) ? 0 : this.artifactLocation.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof Attachment) == false) {
- return false;
- }
- Attachment rhs = ((Attachment) other);
- return ((((((this.description == rhs.description) || ((this.description != null) && this.description.equals(rhs.description))) && ((this.regions == rhs.regions) || ((this.regions != null) && this.regions.equals(rhs.regions)))) && ((this.rectangles == rhs.rectangles) || ((this.rectangles != null) && this.rectangles.equals(rhs.rectangles)))) && ((this.artifactLocation == rhs.artifactLocation) || ((this.artifactLocation != null) && this.artifactLocation.equals(rhs.artifactLocation)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/CodeFlow.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/CodeFlow.java
deleted file mode 100644
index 802ecce57d..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/CodeFlow.java
+++ /dev/null
@@ -1,160 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * A set of threadFlows which together describe a pattern of code execution relevant to detecting a result.
- */
-@Generated("jsonschema2pojo")
-public class CodeFlow {
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- @SerializedName("message")
- @Expose
- private Message message;
- /**
- * An array of one or more unique threadFlow objects, each of which describes the progress of a program through a thread of execution.
- * (Required)
- */
- @SerializedName("threadFlows")
- @Expose
- private List threadFlows = new ArrayList();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public CodeFlow() {
- }
-
- /**
- * @param message
- * @param threadFlows
- * @param properties
- */
- public CodeFlow(Message message, List threadFlows, PropertyBag properties) {
- super();
- this.message = message;
- this.threadFlows = threadFlows;
- this.properties = properties;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public Message getMessage() {
- return message;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public void setMessage(Message message) {
- this.message = message;
- }
-
- public CodeFlow withMessage(Message message) {
- this.message = message;
- return this;
- }
-
- /**
- * An array of one or more unique threadFlow objects, each of which describes the progress of a program through a thread of execution.
- * (Required)
- */
- public List getThreadFlows() {
- return threadFlows;
- }
-
- /**
- * An array of one or more unique threadFlow objects, each of which describes the progress of a program through a thread of execution.
- * (Required)
- */
- public void setThreadFlows(List threadFlows) {
- this.threadFlows = threadFlows;
- }
-
- public CodeFlow withThreadFlows(List threadFlows) {
- this.threadFlows = threadFlows;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public CodeFlow withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(CodeFlow.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("message");
- sb.append('=');
- sb.append(((this.message == null) ? "" : this.message));
- sb.append(',');
- sb.append("threadFlows");
- sb.append('=');
- sb.append(((this.threadFlows == null) ? "" : this.threadFlows));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.message == null) ? 0 : this.message.hashCode()));
- result = ((result * 31) + ((this.threadFlows == null) ? 0 : this.threadFlows.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof CodeFlow) == false) {
- return false;
- }
- CodeFlow rhs = ((CodeFlow) other);
- return ((((this.message == rhs.message) || ((this.message != null) && this.message.equals(rhs.message))) && ((this.threadFlows == rhs.threadFlows) || ((this.threadFlows != null) && this.threadFlows.equals(rhs.threadFlows)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ConfigurationOverride.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ConfigurationOverride.java
deleted file mode 100644
index 5a155dea61..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ConfigurationOverride.java
+++ /dev/null
@@ -1,161 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Information about how a specific rule or notification was reconfigured at runtime.
- */
-@Generated("jsonschema2pojo")
-public class ConfigurationOverride {
-
- /**
- * Information about a rule or notification that can be configured at runtime.
- * (Required)
- */
- @SerializedName("configuration")
- @Expose
- private ReportingConfiguration configuration;
- /**
- * Information about how to locate a relevant reporting descriptor.
- * (Required)
- */
- @SerializedName("descriptor")
- @Expose
- private ReportingDescriptorReference descriptor;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public ConfigurationOverride() {
- }
-
- /**
- * @param configuration
- * @param descriptor
- * @param properties
- */
- public ConfigurationOverride(ReportingConfiguration configuration, ReportingDescriptorReference descriptor, PropertyBag properties) {
- super();
- this.configuration = configuration;
- this.descriptor = descriptor;
- this.properties = properties;
- }
-
- /**
- * Information about a rule or notification that can be configured at runtime.
- * (Required)
- */
- public ReportingConfiguration getConfiguration() {
- return configuration;
- }
-
- /**
- * Information about a rule or notification that can be configured at runtime.
- * (Required)
- */
- public void setConfiguration(ReportingConfiguration configuration) {
- this.configuration = configuration;
- }
-
- public ConfigurationOverride withConfiguration(ReportingConfiguration configuration) {
- this.configuration = configuration;
- return this;
- }
-
- /**
- * Information about how to locate a relevant reporting descriptor.
- * (Required)
- */
- public ReportingDescriptorReference getDescriptor() {
- return descriptor;
- }
-
- /**
- * Information about how to locate a relevant reporting descriptor.
- * (Required)
- */
- public void setDescriptor(ReportingDescriptorReference descriptor) {
- this.descriptor = descriptor;
- }
-
- public ConfigurationOverride withDescriptor(ReportingDescriptorReference descriptor) {
- this.descriptor = descriptor;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public ConfigurationOverride withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(ConfigurationOverride.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("configuration");
- sb.append('=');
- sb.append(((this.configuration == null) ? "" : this.configuration));
- sb.append(',');
- sb.append("descriptor");
- sb.append('=');
- sb.append(((this.descriptor == null) ? "" : this.descriptor));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.configuration == null) ? 0 : this.configuration.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + ((this.descriptor == null) ? 0 : this.descriptor.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof ConfigurationOverride) == false) {
- return false;
- }
- ConfigurationOverride rhs = ((ConfigurationOverride) other);
- return ((((this.configuration == rhs.configuration) || ((this.configuration != null) && this.configuration.equals(rhs.configuration))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && ((this.descriptor == rhs.descriptor) || ((this.descriptor != null) && this.descriptor.equals(rhs.descriptor))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Conversion.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Conversion.java
deleted file mode 100644
index d51cdfd2a9..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Conversion.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Describes how a converter transformed the output of a static analysis tool from the analysis tool's native output format into the SARIF format.
- */
-@Generated("jsonschema2pojo")
-public class Conversion {
-
- /**
- * The analysis tool that was run.
- * (Required)
- */
- @SerializedName("tool")
- @Expose
- private Tool tool;
- /**
- * The runtime environment of the analysis tool run.
- */
- @SerializedName("invocation")
- @Expose
- private Invocation invocation;
- /**
- * The locations of the analysis tool's per-run log files.
- */
- @SerializedName("analysisToolLogFiles")
- @Expose
- private Set analysisToolLogFiles = new LinkedHashSet();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public Conversion() {
- }
-
- /**
- * @param invocation
- * @param analysisToolLogFiles
- * @param tool
- * @param properties
- */
- public Conversion(Tool tool, Invocation invocation, Set analysisToolLogFiles, PropertyBag properties) {
- super();
- this.tool = tool;
- this.invocation = invocation;
- this.analysisToolLogFiles = analysisToolLogFiles;
- this.properties = properties;
- }
-
- /**
- * The analysis tool that was run.
- * (Required)
- */
- public Tool getTool() {
- return tool;
- }
-
- /**
- * The analysis tool that was run.
- * (Required)
- */
- public void setTool(Tool tool) {
- this.tool = tool;
- }
-
- public Conversion withTool(Tool tool) {
- this.tool = tool;
- return this;
- }
-
- /**
- * The runtime environment of the analysis tool run.
- */
- public Invocation getInvocation() {
- return invocation;
- }
-
- /**
- * The runtime environment of the analysis tool run.
- */
- public void setInvocation(Invocation invocation) {
- this.invocation = invocation;
- }
-
- public Conversion withInvocation(Invocation invocation) {
- this.invocation = invocation;
- return this;
- }
-
- /**
- * The locations of the analysis tool's per-run log files.
- */
- public Set getAnalysisToolLogFiles() {
- return analysisToolLogFiles;
- }
-
- /**
- * The locations of the analysis tool's per-run log files.
- */
- public void setAnalysisToolLogFiles(Set analysisToolLogFiles) {
- this.analysisToolLogFiles = analysisToolLogFiles;
- }
-
- public Conversion withAnalysisToolLogFiles(Set analysisToolLogFiles) {
- this.analysisToolLogFiles = analysisToolLogFiles;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public Conversion withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(Conversion.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("tool");
- sb.append('=');
- sb.append(((this.tool == null) ? "" : this.tool));
- sb.append(',');
- sb.append("invocation");
- sb.append('=');
- sb.append(((this.invocation == null) ? "" : this.invocation));
- sb.append(',');
- sb.append("analysisToolLogFiles");
- sb.append('=');
- sb.append(((this.analysisToolLogFiles == null) ? "" : this.analysisToolLogFiles));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.invocation == null) ? 0 : this.invocation.hashCode()));
- result = ((result * 31) + ((this.analysisToolLogFiles == null) ? 0 : this.analysisToolLogFiles.hashCode()));
- result = ((result * 31) + ((this.tool == null) ? 0 : this.tool.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof Conversion) == false) {
- return false;
- }
- Conversion rhs = ((Conversion) other);
- return (((((this.invocation == rhs.invocation) || ((this.invocation != null) && this.invocation.equals(rhs.invocation))) && ((this.analysisToolLogFiles == rhs.analysisToolLogFiles) || ((this.analysisToolLogFiles != null) && this.analysisToolLogFiles.equals(rhs.analysisToolLogFiles)))) && ((this.tool == rhs.tool) || ((this.tool != null) && this.tool.equals(rhs.tool)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Edge.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Edge.java
deleted file mode 100644
index 6b6d9b9ee5..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Edge.java
+++ /dev/null
@@ -1,228 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Represents a directed edge in a graph.
- */
-@Generated("jsonschema2pojo")
-public class Edge {
-
- /**
- * A string that uniquely identifies the edge within its graph.
- * (Required)
- */
- @SerializedName("id")
- @Expose
- private String id;
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- @SerializedName("label")
- @Expose
- private Message label;
- /**
- * Identifies the source node (the node at which the edge starts).
- * (Required)
- */
- @SerializedName("sourceNodeId")
- @Expose
- private String sourceNodeId;
- /**
- * Identifies the target node (the node at which the edge ends).
- * (Required)
- */
- @SerializedName("targetNodeId")
- @Expose
- private String targetNodeId;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public Edge() {
- }
-
- /**
- * @param sourceNodeId
- * @param id
- * @param label
- * @param targetNodeId
- * @param properties
- */
- public Edge(String id, Message label, String sourceNodeId, String targetNodeId, PropertyBag properties) {
- super();
- this.id = id;
- this.label = label;
- this.sourceNodeId = sourceNodeId;
- this.targetNodeId = targetNodeId;
- this.properties = properties;
- }
-
- /**
- * A string that uniquely identifies the edge within its graph.
- * (Required)
- */
- public String getId() {
- return id;
- }
-
- /**
- * A string that uniquely identifies the edge within its graph.
- * (Required)
- */
- public void setId(String id) {
- this.id = id;
- }
-
- public Edge withId(String id) {
- this.id = id;
- return this;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public Message getLabel() {
- return label;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public void setLabel(Message label) {
- this.label = label;
- }
-
- public Edge withLabel(Message label) {
- this.label = label;
- return this;
- }
-
- /**
- * Identifies the source node (the node at which the edge starts).
- * (Required)
- */
- public String getSourceNodeId() {
- return sourceNodeId;
- }
-
- /**
- * Identifies the source node (the node at which the edge starts).
- * (Required)
- */
- public void setSourceNodeId(String sourceNodeId) {
- this.sourceNodeId = sourceNodeId;
- }
-
- public Edge withSourceNodeId(String sourceNodeId) {
- this.sourceNodeId = sourceNodeId;
- return this;
- }
-
- /**
- * Identifies the target node (the node at which the edge ends).
- * (Required)
- */
- public String getTargetNodeId() {
- return targetNodeId;
- }
-
- /**
- * Identifies the target node (the node at which the edge ends).
- * (Required)
- */
- public void setTargetNodeId(String targetNodeId) {
- this.targetNodeId = targetNodeId;
- }
-
- public Edge withTargetNodeId(String targetNodeId) {
- this.targetNodeId = targetNodeId;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public Edge withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(Edge.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("id");
- sb.append('=');
- sb.append(((this.id == null) ? "" : this.id));
- sb.append(',');
- sb.append("label");
- sb.append('=');
- sb.append(((this.label == null) ? "" : this.label));
- sb.append(',');
- sb.append("sourceNodeId");
- sb.append('=');
- sb.append(((this.sourceNodeId == null) ? "" : this.sourceNodeId));
- sb.append(',');
- sb.append("targetNodeId");
- sb.append('=');
- sb.append(((this.targetNodeId == null) ? "" : this.targetNodeId));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.id == null) ? 0 : this.id.hashCode()));
- result = ((result * 31) + ((this.label == null) ? 0 : this.label.hashCode()));
- result = ((result * 31) + ((this.targetNodeId == null) ? 0 : this.targetNodeId.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + ((this.sourceNodeId == null) ? 0 : this.sourceNodeId.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof Edge) == false) {
- return false;
- }
- Edge rhs = ((Edge) other);
- return ((((((this.id == rhs.id) || ((this.id != null) && this.id.equals(rhs.id))) && ((this.label == rhs.label) || ((this.label != null) && this.label.equals(rhs.label)))) && ((this.targetNodeId == rhs.targetNodeId) || ((this.targetNodeId != null) && this.targetNodeId.equals(rhs.targetNodeId)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && ((this.sourceNodeId == rhs.sourceNodeId) || ((this.sourceNodeId != null) && this.sourceNodeId.equals(rhs.sourceNodeId))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/EdgeTraversal.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/EdgeTraversal.java
deleted file mode 100644
index a37c951c8e..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/EdgeTraversal.java
+++ /dev/null
@@ -1,222 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Represents the traversal of a single edge during a graph traversal.
- */
-@Generated("jsonschema2pojo")
-public class EdgeTraversal {
-
- /**
- * Identifies the edge being traversed.
- * (Required)
- */
- @SerializedName("edgeId")
- @Expose
- private String edgeId;
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- @SerializedName("message")
- @Expose
- private Message message;
- /**
- * The values of relevant expressions after the edge has been traversed.
- */
- @SerializedName("finalState")
- @Expose
- private FinalState finalState;
- /**
- * The number of edge traversals necessary to return from a nested graph.
- */
- @SerializedName("stepOverEdgeCount")
- @Expose
- private int stepOverEdgeCount;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public EdgeTraversal() {
- }
-
- /**
- * @param edgeId
- * @param stepOverEdgeCount
- * @param message
- * @param finalState
- * @param properties
- */
- public EdgeTraversal(String edgeId, Message message, FinalState finalState, int stepOverEdgeCount, PropertyBag properties) {
- super();
- this.edgeId = edgeId;
- this.message = message;
- this.finalState = finalState;
- this.stepOverEdgeCount = stepOverEdgeCount;
- this.properties = properties;
- }
-
- /**
- * Identifies the edge being traversed.
- * (Required)
- */
- public String getEdgeId() {
- return edgeId;
- }
-
- /**
- * Identifies the edge being traversed.
- * (Required)
- */
- public void setEdgeId(String edgeId) {
- this.edgeId = edgeId;
- }
-
- public EdgeTraversal withEdgeId(String edgeId) {
- this.edgeId = edgeId;
- return this;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public Message getMessage() {
- return message;
- }
-
- /**
- * Encapsulates a message intended to be read by the end user.
- */
- public void setMessage(Message message) {
- this.message = message;
- }
-
- public EdgeTraversal withMessage(Message message) {
- this.message = message;
- return this;
- }
-
- /**
- * The values of relevant expressions after the edge has been traversed.
- */
- public FinalState getFinalState() {
- return finalState;
- }
-
- /**
- * The values of relevant expressions after the edge has been traversed.
- */
- public void setFinalState(FinalState finalState) {
- this.finalState = finalState;
- }
-
- public EdgeTraversal withFinalState(FinalState finalState) {
- this.finalState = finalState;
- return this;
- }
-
- /**
- * The number of edge traversals necessary to return from a nested graph.
- */
- public int getStepOverEdgeCount() {
- return stepOverEdgeCount;
- }
-
- /**
- * The number of edge traversals necessary to return from a nested graph.
- */
- public void setStepOverEdgeCount(int stepOverEdgeCount) {
- this.stepOverEdgeCount = stepOverEdgeCount;
- }
-
- public EdgeTraversal withStepOverEdgeCount(int stepOverEdgeCount) {
- this.stepOverEdgeCount = stepOverEdgeCount;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public EdgeTraversal withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(EdgeTraversal.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("edgeId");
- sb.append('=');
- sb.append(((this.edgeId == null) ? "" : this.edgeId));
- sb.append(',');
- sb.append("message");
- sb.append('=');
- sb.append(((this.message == null) ? "" : this.message));
- sb.append(',');
- sb.append("finalState");
- sb.append('=');
- sb.append(((this.finalState == null) ? "" : this.finalState));
- sb.append(',');
- sb.append("stepOverEdgeCount");
- sb.append('=');
- sb.append(this.stepOverEdgeCount);
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.edgeId == null) ? 0 : this.edgeId.hashCode()));
- result = ((result * 31) + ((this.message == null) ? 0 : this.message.hashCode()));
- result = ((result * 31) + this.stepOverEdgeCount);
- result = ((result * 31) + ((this.finalState == null) ? 0 : this.finalState.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof EdgeTraversal) == false) {
- return false;
- }
- EdgeTraversal rhs = ((EdgeTraversal) other);
- return ((((((this.edgeId == rhs.edgeId) || ((this.edgeId != null) && this.edgeId.equals(rhs.edgeId))) && ((this.message == rhs.message) || ((this.message != null) && this.message.equals(rhs.message)))) && (this.stepOverEdgeCount == rhs.stepOverEdgeCount)) && ((this.finalState == rhs.finalState) || ((this.finalState != null) && this.finalState.equals(rhs.finalState)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/EnvironmentVariables.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/EnvironmentVariables.java
deleted file mode 100644
index 211cf622f5..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/EnvironmentVariables.java
+++ /dev/null
@@ -1,44 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-
-/**
- * The environment variables associated with the analysis tool process, expressed as key/value pairs.
- */
-@Generated("jsonschema2pojo")
-public class EnvironmentVariables {
-
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(EnvironmentVariables.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof EnvironmentVariables) == false) {
- return false;
- }
- EnvironmentVariables rhs = ((EnvironmentVariables) other);
- return true;
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Exception.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Exception.java
deleted file mode 100644
index ab7eebc803..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/Exception.java
+++ /dev/null
@@ -1,221 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Describes a runtime exception encountered during the execution of an analysis tool.
- */
-@Generated("jsonschema2pojo")
-public class Exception {
-
- /**
- * A string that identifies the kind of exception, for example, the fully qualified type name of an object that was thrown, or the symbolic name of a signal.
- */
- @SerializedName("kind")
- @Expose
- private String kind;
- /**
- * A message that describes the exception.
- */
- @SerializedName("message")
- @Expose
- private String message;
- /**
- * A call stack that is relevant to a result.
- */
- @SerializedName("stack")
- @Expose
- private Stack stack;
- /**
- * An array of exception objects each of which is considered a cause of this exception.
- */
- @SerializedName("innerExceptions")
- @Expose
- private List innerExceptions = new ArrayList();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public Exception() {
- }
-
- /**
- * @param stack
- * @param kind
- * @param innerExceptions
- * @param message
- * @param properties
- */
- public Exception(String kind, String message, Stack stack, List innerExceptions, PropertyBag properties) {
- super();
- this.kind = kind;
- this.message = message;
- this.stack = stack;
- this.innerExceptions = innerExceptions;
- this.properties = properties;
- }
-
- /**
- * A string that identifies the kind of exception, for example, the fully qualified type name of an object that was thrown, or the symbolic name of a signal.
- */
- public String getKind() {
- return kind;
- }
-
- /**
- * A string that identifies the kind of exception, for example, the fully qualified type name of an object that was thrown, or the symbolic name of a signal.
- */
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public Exception withKind(String kind) {
- this.kind = kind;
- return this;
- }
-
- /**
- * A message that describes the exception.
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * A message that describes the exception.
- */
- public void setMessage(String message) {
- this.message = message;
- }
-
- public Exception withMessage(String message) {
- this.message = message;
- return this;
- }
-
- /**
- * A call stack that is relevant to a result.
- */
- public Stack getStack() {
- return stack;
- }
-
- /**
- * A call stack that is relevant to a result.
- */
- public void setStack(Stack stack) {
- this.stack = stack;
- }
-
- public Exception withStack(Stack stack) {
- this.stack = stack;
- return this;
- }
-
- /**
- * An array of exception objects each of which is considered a cause of this exception.
- */
- public List getInnerExceptions() {
- return innerExceptions;
- }
-
- /**
- * An array of exception objects each of which is considered a cause of this exception.
- */
- public void setInnerExceptions(List innerExceptions) {
- this.innerExceptions = innerExceptions;
- }
-
- public Exception withInnerExceptions(List innerExceptions) {
- this.innerExceptions = innerExceptions;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public Exception withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(Exception.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("kind");
- sb.append('=');
- sb.append(((this.kind == null) ? "" : this.kind));
- sb.append(',');
- sb.append("message");
- sb.append('=');
- sb.append(((this.message == null) ? "" : this.message));
- sb.append(',');
- sb.append("stack");
- sb.append('=');
- sb.append(((this.stack == null) ? "" : this.stack));
- sb.append(',');
- sb.append("innerExceptions");
- sb.append('=');
- sb.append(((this.innerExceptions == null) ? "" : this.innerExceptions));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.stack == null) ? 0 : this.stack.hashCode()));
- result = ((result * 31) + ((this.innerExceptions == null) ? 0 : this.innerExceptions.hashCode()));
- result = ((result * 31) + ((this.message == null) ? 0 : this.message.hashCode()));
- result = ((result * 31) + ((this.kind == null) ? 0 : this.kind.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof Exception) == false) {
- return false;
- }
- Exception rhs = ((Exception) other);
- return ((((((this.stack == rhs.stack) || ((this.stack != null) && this.stack.equals(rhs.stack))) && ((this.innerExceptions == rhs.innerExceptions) || ((this.innerExceptions != null) && this.innerExceptions.equals(rhs.innerExceptions)))) && ((this.message == rhs.message) || ((this.message != null) && this.message.equals(rhs.message)))) && ((this.kind == rhs.kind) || ((this.kind != null) && this.kind.equals(rhs.kind)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties))));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalProperties.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalProperties.java
deleted file mode 100644
index 8af1758fd6..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalProperties.java
+++ /dev/null
@@ -1,780 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * The top-level element of an external property file.
- */
-@Generated("jsonschema2pojo")
-public class ExternalProperties {
-
- /**
- * The URI of the JSON schema corresponding to the version of the external property file format.
- */
- @SerializedName("schema")
- @Expose
- private URI schema;
- /**
- * The SARIF format version of this external properties object.
- */
- @SerializedName("version")
- @Expose
- private ExternalProperties.Version version;
- /**
- * A stable, unique identifer for this external properties object, in the form of a GUID.
- */
- @SerializedName("guid")
- @Expose
- private String guid;
- /**
- * A stable, unique identifer for the run associated with this external properties object, in the form of a GUID.
- */
- @SerializedName("runGuid")
- @Expose
- private String runGuid;
- /**
- * Describes how a converter transformed the output of a static analysis tool from the analysis tool's native output format into the SARIF format.
- */
- @SerializedName("conversion")
- @Expose
- private Conversion conversion;
- /**
- * An array of graph objects that will be merged with a separate run.
- */
- @SerializedName("graphs")
- @Expose
- private Set graphs = new LinkedHashSet();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("externalizedProperties")
- @Expose
- private PropertyBag externalizedProperties;
- /**
- * An array of artifact objects that will be merged with a separate run.
- */
- @SerializedName("artifacts")
- @Expose
- private Set artifacts = new LinkedHashSet();
- /**
- * Describes the invocation of the analysis tool that will be merged with a separate run.
- */
- @SerializedName("invocations")
- @Expose
- private List invocations = new ArrayList();
- /**
- * An array of logical locations such as namespaces, types or functions that will be merged with a separate run.
- */
- @SerializedName("logicalLocations")
- @Expose
- private Set logicalLocations = new LinkedHashSet();
- /**
- * An array of threadFlowLocation objects that will be merged with a separate run.
- */
- @SerializedName("threadFlowLocations")
- @Expose
- private Set threadFlowLocations = new LinkedHashSet();
- /**
- * An array of result objects that will be merged with a separate run.
- */
- @SerializedName("results")
- @Expose
- private List results = new ArrayList();
- /**
- * Tool taxonomies that will be merged with a separate run.
- */
- @SerializedName("taxonomies")
- @Expose
- private Set taxonomies = new LinkedHashSet();
- /**
- * A component, such as a plug-in or the driver, of the analysis tool that was run.
- */
- @SerializedName("driver")
- @Expose
- private ToolComponent driver;
- /**
- * Tool extensions that will be merged with a separate run.
- */
- @SerializedName("extensions")
- @Expose
- private Set extensions = new LinkedHashSet();
- /**
- * Tool policies that will be merged with a separate run.
- */
- @SerializedName("policies")
- @Expose
- private Set policies = new LinkedHashSet();
- /**
- * Tool translations that will be merged with a separate run.
- */
- @SerializedName("translations")
- @Expose
- private Set translations = new LinkedHashSet();
- /**
- * Addresses that will be merged with a separate run.
- */
- @SerializedName("addresses")
- @Expose
- private List addresses = new ArrayList();
- /**
- * Requests that will be merged with a separate run.
- */
- @SerializedName("webRequests")
- @Expose
- private Set webRequests = new LinkedHashSet();
- /**
- * Responses that will be merged with a separate run.
- */
- @SerializedName("webResponses")
- @Expose
- private Set webResponses = new LinkedHashSet();
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public ExternalProperties() {
- }
-
- /**
- * @param schema
- * @param addresses
- * @param logicalLocations
- * @param policies
- * @param runGuid
- * @param version
- * @param externalizedProperties
- * @param invocations
- * @param graphs
- * @param extensions
- * @param driver
- * @param taxonomies
- * @param translations
- * @param webResponses
- * @param guid
- * @param webRequests
- * @param results
- * @param threadFlowLocations
- * @param properties
- * @param conversion
- * @param artifacts
- */
- public ExternalProperties(URI schema, ExternalProperties.Version version, String guid, String runGuid, Conversion conversion, Set graphs, PropertyBag externalizedProperties, Set artifacts, List invocations, Set logicalLocations, Set threadFlowLocations, List results, Set taxonomies, ToolComponent driver, Set extensions, Set policies, Set translations, List addresses, Set webRequests, Set webResponses, PropertyBag properties) {
- super();
- this.schema = schema;
- this.version = version;
- this.guid = guid;
- this.runGuid = runGuid;
- this.conversion = conversion;
- this.graphs = graphs;
- this.externalizedProperties = externalizedProperties;
- this.artifacts = artifacts;
- this.invocations = invocations;
- this.logicalLocations = logicalLocations;
- this.threadFlowLocations = threadFlowLocations;
- this.results = results;
- this.taxonomies = taxonomies;
- this.driver = driver;
- this.extensions = extensions;
- this.policies = policies;
- this.translations = translations;
- this.addresses = addresses;
- this.webRequests = webRequests;
- this.webResponses = webResponses;
- this.properties = properties;
- }
-
- /**
- * The URI of the JSON schema corresponding to the version of the external property file format.
- */
- public URI getSchema() {
- return schema;
- }
-
- /**
- * The URI of the JSON schema corresponding to the version of the external property file format.
- */
- public void setSchema(URI schema) {
- this.schema = schema;
- }
-
- public ExternalProperties withSchema(URI schema) {
- this.schema = schema;
- return this;
- }
-
- /**
- * The SARIF format version of this external properties object.
- */
- public ExternalProperties.Version getVersion() {
- return version;
- }
-
- /**
- * The SARIF format version of this external properties object.
- */
- public void setVersion(ExternalProperties.Version version) {
- this.version = version;
- }
-
- public ExternalProperties withVersion(ExternalProperties.Version version) {
- this.version = version;
- return this;
- }
-
- /**
- * A stable, unique identifer for this external properties object, in the form of a GUID.
- */
- public String getGuid() {
- return guid;
- }
-
- /**
- * A stable, unique identifer for this external properties object, in the form of a GUID.
- */
- public void setGuid(String guid) {
- this.guid = guid;
- }
-
- public ExternalProperties withGuid(String guid) {
- this.guid = guid;
- return this;
- }
-
- /**
- * A stable, unique identifer for the run associated with this external properties object, in the form of a GUID.
- */
- public String getRunGuid() {
- return runGuid;
- }
-
- /**
- * A stable, unique identifer for the run associated with this external properties object, in the form of a GUID.
- */
- public void setRunGuid(String runGuid) {
- this.runGuid = runGuid;
- }
-
- public ExternalProperties withRunGuid(String runGuid) {
- this.runGuid = runGuid;
- return this;
- }
-
- /**
- * Describes how a converter transformed the output of a static analysis tool from the analysis tool's native output format into the SARIF format.
- */
- public Conversion getConversion() {
- return conversion;
- }
-
- /**
- * Describes how a converter transformed the output of a static analysis tool from the analysis tool's native output format into the SARIF format.
- */
- public void setConversion(Conversion conversion) {
- this.conversion = conversion;
- }
-
- public ExternalProperties withConversion(Conversion conversion) {
- this.conversion = conversion;
- return this;
- }
-
- /**
- * An array of graph objects that will be merged with a separate run.
- */
- public Set getGraphs() {
- return graphs;
- }
-
- /**
- * An array of graph objects that will be merged with a separate run.
- */
- public void setGraphs(Set graphs) {
- this.graphs = graphs;
- }
-
- public ExternalProperties withGraphs(Set graphs) {
- this.graphs = graphs;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getExternalizedProperties() {
- return externalizedProperties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setExternalizedProperties(PropertyBag externalizedProperties) {
- this.externalizedProperties = externalizedProperties;
- }
-
- public ExternalProperties withExternalizedProperties(PropertyBag externalizedProperties) {
- this.externalizedProperties = externalizedProperties;
- return this;
- }
-
- /**
- * An array of artifact objects that will be merged with a separate run.
- */
- public Set getArtifacts() {
- return artifacts;
- }
-
- /**
- * An array of artifact objects that will be merged with a separate run.
- */
- public void setArtifacts(Set artifacts) {
- this.artifacts = artifacts;
- }
-
- public ExternalProperties withArtifacts(Set artifacts) {
- this.artifacts = artifacts;
- return this;
- }
-
- /**
- * Describes the invocation of the analysis tool that will be merged with a separate run.
- */
- public List getInvocations() {
- return invocations;
- }
-
- /**
- * Describes the invocation of the analysis tool that will be merged with a separate run.
- */
- public void setInvocations(List invocations) {
- this.invocations = invocations;
- }
-
- public ExternalProperties withInvocations(List invocations) {
- this.invocations = invocations;
- return this;
- }
-
- /**
- * An array of logical locations such as namespaces, types or functions that will be merged with a separate run.
- */
- public Set getLogicalLocations() {
- return logicalLocations;
- }
-
- /**
- * An array of logical locations such as namespaces, types or functions that will be merged with a separate run.
- */
- public void setLogicalLocations(Set logicalLocations) {
- this.logicalLocations = logicalLocations;
- }
-
- public ExternalProperties withLogicalLocations(Set logicalLocations) {
- this.logicalLocations = logicalLocations;
- return this;
- }
-
- /**
- * An array of threadFlowLocation objects that will be merged with a separate run.
- */
- public Set getThreadFlowLocations() {
- return threadFlowLocations;
- }
-
- /**
- * An array of threadFlowLocation objects that will be merged with a separate run.
- */
- public void setThreadFlowLocations(Set threadFlowLocations) {
- this.threadFlowLocations = threadFlowLocations;
- }
-
- public ExternalProperties withThreadFlowLocations(Set threadFlowLocations) {
- this.threadFlowLocations = threadFlowLocations;
- return this;
- }
-
- /**
- * An array of result objects that will be merged with a separate run.
- */
- public List getResults() {
- return results;
- }
-
- /**
- * An array of result objects that will be merged with a separate run.
- */
- public void setResults(List results) {
- this.results = results;
- }
-
- public ExternalProperties withResults(List results) {
- this.results = results;
- return this;
- }
-
- /**
- * Tool taxonomies that will be merged with a separate run.
- */
- public Set getTaxonomies() {
- return taxonomies;
- }
-
- /**
- * Tool taxonomies that will be merged with a separate run.
- */
- public void setTaxonomies(Set taxonomies) {
- this.taxonomies = taxonomies;
- }
-
- public ExternalProperties withTaxonomies(Set taxonomies) {
- this.taxonomies = taxonomies;
- return this;
- }
-
- /**
- * A component, such as a plug-in or the driver, of the analysis tool that was run.
- */
- public ToolComponent getDriver() {
- return driver;
- }
-
- /**
- * A component, such as a plug-in or the driver, of the analysis tool that was run.
- */
- public void setDriver(ToolComponent driver) {
- this.driver = driver;
- }
-
- public ExternalProperties withDriver(ToolComponent driver) {
- this.driver = driver;
- return this;
- }
-
- /**
- * Tool extensions that will be merged with a separate run.
- */
- public Set getExtensions() {
- return extensions;
- }
-
- /**
- * Tool extensions that will be merged with a separate run.
- */
- public void setExtensions(Set extensions) {
- this.extensions = extensions;
- }
-
- public ExternalProperties withExtensions(Set extensions) {
- this.extensions = extensions;
- return this;
- }
-
- /**
- * Tool policies that will be merged with a separate run.
- */
- public Set getPolicies() {
- return policies;
- }
-
- /**
- * Tool policies that will be merged with a separate run.
- */
- public void setPolicies(Set policies) {
- this.policies = policies;
- }
-
- public ExternalProperties withPolicies(Set policies) {
- this.policies = policies;
- return this;
- }
-
- /**
- * Tool translations that will be merged with a separate run.
- */
- public Set getTranslations() {
- return translations;
- }
-
- /**
- * Tool translations that will be merged with a separate run.
- */
- public void setTranslations(Set translations) {
- this.translations = translations;
- }
-
- public ExternalProperties withTranslations(Set translations) {
- this.translations = translations;
- return this;
- }
-
- /**
- * Addresses that will be merged with a separate run.
- */
- public List getAddresses() {
- return addresses;
- }
-
- /**
- * Addresses that will be merged with a separate run.
- */
- public void setAddresses(List addresses) {
- this.addresses = addresses;
- }
-
- public ExternalProperties withAddresses(List addresses) {
- this.addresses = addresses;
- return this;
- }
-
- /**
- * Requests that will be merged with a separate run.
- */
- public Set getWebRequests() {
- return webRequests;
- }
-
- /**
- * Requests that will be merged with a separate run.
- */
- public void setWebRequests(Set webRequests) {
- this.webRequests = webRequests;
- }
-
- public ExternalProperties withWebRequests(Set webRequests) {
- this.webRequests = webRequests;
- return this;
- }
-
- /**
- * Responses that will be merged with a separate run.
- */
- public Set getWebResponses() {
- return webResponses;
- }
-
- /**
- * Responses that will be merged with a separate run.
- */
- public void setWebResponses(Set webResponses) {
- this.webResponses = webResponses;
- }
-
- public ExternalProperties withWebResponses(Set webResponses) {
- this.webResponses = webResponses;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public ExternalProperties withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(ExternalProperties.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("schema");
- sb.append('=');
- sb.append(((this.schema == null) ? "" : this.schema));
- sb.append(',');
- sb.append("version");
- sb.append('=');
- sb.append(((this.version == null) ? "" : this.version));
- sb.append(',');
- sb.append("guid");
- sb.append('=');
- sb.append(((this.guid == null) ? "" : this.guid));
- sb.append(',');
- sb.append("runGuid");
- sb.append('=');
- sb.append(((this.runGuid == null) ? "" : this.runGuid));
- sb.append(',');
- sb.append("conversion");
- sb.append('=');
- sb.append(((this.conversion == null) ? "" : this.conversion));
- sb.append(',');
- sb.append("graphs");
- sb.append('=');
- sb.append(((this.graphs == null) ? "" : this.graphs));
- sb.append(',');
- sb.append("externalizedProperties");
- sb.append('=');
- sb.append(((this.externalizedProperties == null) ? "" : this.externalizedProperties));
- sb.append(',');
- sb.append("artifacts");
- sb.append('=');
- sb.append(((this.artifacts == null) ? "" : this.artifacts));
- sb.append(',');
- sb.append("invocations");
- sb.append('=');
- sb.append(((this.invocations == null) ? "" : this.invocations));
- sb.append(',');
- sb.append("logicalLocations");
- sb.append('=');
- sb.append(((this.logicalLocations == null) ? "" : this.logicalLocations));
- sb.append(',');
- sb.append("threadFlowLocations");
- sb.append('=');
- sb.append(((this.threadFlowLocations == null) ? "" : this.threadFlowLocations));
- sb.append(',');
- sb.append("results");
- sb.append('=');
- sb.append(((this.results == null) ? "" : this.results));
- sb.append(',');
- sb.append("taxonomies");
- sb.append('=');
- sb.append(((this.taxonomies == null) ? "" : this.taxonomies));
- sb.append(',');
- sb.append("driver");
- sb.append('=');
- sb.append(((this.driver == null) ? "" : this.driver));
- sb.append(',');
- sb.append("extensions");
- sb.append('=');
- sb.append(((this.extensions == null) ? "" : this.extensions));
- sb.append(',');
- sb.append("policies");
- sb.append('=');
- sb.append(((this.policies == null) ? "" : this.policies));
- sb.append(',');
- sb.append("translations");
- sb.append('=');
- sb.append(((this.translations == null) ? "" : this.translations));
- sb.append(',');
- sb.append("addresses");
- sb.append('=');
- sb.append(((this.addresses == null) ? "" : this.addresses));
- sb.append(',');
- sb.append("webRequests");
- sb.append('=');
- sb.append(((this.webRequests == null) ? "" : this.webRequests));
- sb.append(',');
- sb.append("webResponses");
- sb.append('=');
- sb.append(((this.webResponses == null) ? "" : this.webResponses));
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.schema == null) ? 0 : this.schema.hashCode()));
- result = ((result * 31) + ((this.addresses == null) ? 0 : this.addresses.hashCode()));
- result = ((result * 31) + ((this.logicalLocations == null) ? 0 : this.logicalLocations.hashCode()));
- result = ((result * 31) + ((this.policies == null) ? 0 : this.policies.hashCode()));
- result = ((result * 31) + ((this.runGuid == null) ? 0 : this.runGuid.hashCode()));
- result = ((result * 31) + ((this.version == null) ? 0 : this.version.hashCode()));
- result = ((result * 31) + ((this.externalizedProperties == null) ? 0 : this.externalizedProperties.hashCode()));
- result = ((result * 31) + ((this.invocations == null) ? 0 : this.invocations.hashCode()));
- result = ((result * 31) + ((this.graphs == null) ? 0 : this.graphs.hashCode()));
- result = ((result * 31) + ((this.extensions == null) ? 0 : this.extensions.hashCode()));
- result = ((result * 31) + ((this.driver == null) ? 0 : this.driver.hashCode()));
- result = ((result * 31) + ((this.taxonomies == null) ? 0 : this.taxonomies.hashCode()));
- result = ((result * 31) + ((this.translations == null) ? 0 : this.translations.hashCode()));
- result = ((result * 31) + ((this.webResponses == null) ? 0 : this.webResponses.hashCode()));
- result = ((result * 31) + ((this.guid == null) ? 0 : this.guid.hashCode()));
- result = ((result * 31) + ((this.webRequests == null) ? 0 : this.webRequests.hashCode()));
- result = ((result * 31) + ((this.results == null) ? 0 : this.results.hashCode()));
- result = ((result * 31) + ((this.threadFlowLocations == null) ? 0 : this.threadFlowLocations.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + ((this.conversion == null) ? 0 : this.conversion.hashCode()));
- result = ((result * 31) + ((this.artifacts == null) ? 0 : this.artifacts.hashCode()));
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof ExternalProperties) == false) {
- return false;
- }
- ExternalProperties rhs = ((ExternalProperties) other);
- return ((((((((((((((((((((((this.schema == rhs.schema) || ((this.schema != null) && this.schema.equals(rhs.schema))) && ((this.addresses == rhs.addresses) || ((this.addresses != null) && this.addresses.equals(rhs.addresses)))) && ((this.logicalLocations == rhs.logicalLocations) || ((this.logicalLocations != null) && this.logicalLocations.equals(rhs.logicalLocations)))) && ((this.policies == rhs.policies) || ((this.policies != null) && this.policies.equals(rhs.policies)))) && ((this.runGuid == rhs.runGuid) || ((this.runGuid != null) && this.runGuid.equals(rhs.runGuid)))) && ((this.version == rhs.version) || ((this.version != null) && this.version.equals(rhs.version)))) && ((this.externalizedProperties == rhs.externalizedProperties) || ((this.externalizedProperties != null) && this.externalizedProperties.equals(rhs.externalizedProperties)))) && ((this.invocations == rhs.invocations) || ((this.invocations != null) && this.invocations.equals(rhs.invocations)))) && ((this.graphs == rhs.graphs) || ((this.graphs != null) && this.graphs.equals(rhs.graphs)))) && ((this.extensions == rhs.extensions) || ((this.extensions != null) && this.extensions.equals(rhs.extensions)))) && ((this.driver == rhs.driver) || ((this.driver != null) && this.driver.equals(rhs.driver)))) && ((this.taxonomies == rhs.taxonomies) || ((this.taxonomies != null) && this.taxonomies.equals(rhs.taxonomies)))) && ((this.translations == rhs.translations) || ((this.translations != null) && this.translations.equals(rhs.translations)))) && ((this.webResponses == rhs.webResponses) || ((this.webResponses != null) && this.webResponses.equals(rhs.webResponses)))) && ((this.guid == rhs.guid) || ((this.guid != null) && this.guid.equals(rhs.guid)))) && ((this.webRequests == rhs.webRequests) || ((this.webRequests != null) && this.webRequests.equals(rhs.webRequests)))) && ((this.results == rhs.results) || ((this.results != null) && this.results.equals(rhs.results)))) && ((this.threadFlowLocations == rhs.threadFlowLocations) || ((this.threadFlowLocations != null) && this.threadFlowLocations.equals(rhs.threadFlowLocations)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && ((this.conversion == rhs.conversion) || ((this.conversion != null) && this.conversion.equals(rhs.conversion)))) && ((this.artifacts == rhs.artifacts) || ((this.artifacts != null) && this.artifacts.equals(rhs.artifacts))));
- }
-
-
- /**
- * The SARIF format version of this external properties object.
- */
- @Generated("jsonschema2pojo")
- public enum Version {
-
- @SerializedName("2.1.0")
- _2_1_0("2.1.0");
- private final String value;
- private final static Map CONSTANTS = new HashMap();
-
- static {
- for (ExternalProperties.Version c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- Version(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- public String value() {
- return this.value;
- }
-
- public static ExternalProperties.Version fromValue(String value) {
- ExternalProperties.Version constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
-
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalPropertyFileReference.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalPropertyFileReference.java
deleted file mode 100644
index 2e7298f0b2..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalPropertyFileReference.java
+++ /dev/null
@@ -1,187 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * Contains information that enables a SARIF consumer to locate the external property file that contains the value of an externalized property associated with the run.
- */
-@Generated("jsonschema2pojo")
-public class ExternalPropertyFileReference {
-
- /**
- * Specifies the location of an artifact.
- */
- @SerializedName("location")
- @Expose
- private ArtifactLocation location;
- /**
- * A stable, unique identifer for the external property file in the form of a GUID.
- */
- @SerializedName("guid")
- @Expose
- private String guid;
- /**
- * A non-negative integer specifying the number of items contained in the external property file.
- */
- @SerializedName("itemCount")
- @Expose
- private int itemCount = -1;
- /**
- * Key/value pairs that provide additional information about the object.
- */
- @SerializedName("properties")
- @Expose
- private PropertyBag properties;
-
- /**
- * No args constructor for use in serialization
- */
- public ExternalPropertyFileReference() {
- }
-
- /**
- * @param guid
- * @param location
- * @param properties
- * @param itemCount
- */
- public ExternalPropertyFileReference(ArtifactLocation location, String guid, int itemCount, PropertyBag properties) {
- super();
- this.location = location;
- this.guid = guid;
- this.itemCount = itemCount;
- this.properties = properties;
- }
-
- /**
- * Specifies the location of an artifact.
- */
- public ArtifactLocation getLocation() {
- return location;
- }
-
- /**
- * Specifies the location of an artifact.
- */
- public void setLocation(ArtifactLocation location) {
- this.location = location;
- }
-
- public ExternalPropertyFileReference withLocation(ArtifactLocation location) {
- this.location = location;
- return this;
- }
-
- /**
- * A stable, unique identifer for the external property file in the form of a GUID.
- */
- public String getGuid() {
- return guid;
- }
-
- /**
- * A stable, unique identifer for the external property file in the form of a GUID.
- */
- public void setGuid(String guid) {
- this.guid = guid;
- }
-
- public ExternalPropertyFileReference withGuid(String guid) {
- this.guid = guid;
- return this;
- }
-
- /**
- * A non-negative integer specifying the number of items contained in the external property file.
- */
- public int getItemCount() {
- return itemCount;
- }
-
- /**
- * A non-negative integer specifying the number of items contained in the external property file.
- */
- public void setItemCount(int itemCount) {
- this.itemCount = itemCount;
- }
-
- public ExternalPropertyFileReference withItemCount(int itemCount) {
- this.itemCount = itemCount;
- return this;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public PropertyBag getProperties() {
- return properties;
- }
-
- /**
- * Key/value pairs that provide additional information about the object.
- */
- public void setProperties(PropertyBag properties) {
- this.properties = properties;
- }
-
- public ExternalPropertyFileReference withProperties(PropertyBag properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(ExternalPropertyFileReference.class.getName()).append('@').append(Integer.toHexString(System.identityHashCode(this))).append('[');
- sb.append("location");
- sb.append('=');
- sb.append(((this.location == null) ? "" : this.location));
- sb.append(',');
- sb.append("guid");
- sb.append('=');
- sb.append(((this.guid == null) ? "" : this.guid));
- sb.append(',');
- sb.append("itemCount");
- sb.append('=');
- sb.append(this.itemCount);
- sb.append(',');
- sb.append("properties");
- sb.append('=');
- sb.append(((this.properties == null) ? "" : this.properties));
- sb.append(',');
- if (sb.charAt((sb.length() - 1)) == ',') {
- sb.setCharAt((sb.length() - 1), ']');
- } else {
- sb.append(']');
- }
- return sb.toString();
- }
-
- @Override
- public int hashCode() {
- int result = 1;
- result = ((result * 31) + ((this.guid == null) ? 0 : this.guid.hashCode()));
- result = ((result * 31) + ((this.location == null) ? 0 : this.location.hashCode()));
- result = ((result * 31) + ((this.properties == null) ? 0 : this.properties.hashCode()));
- result = ((result * 31) + this.itemCount);
- return result;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if ((other instanceof ExternalPropertyFileReference) == false) {
- return false;
- }
- ExternalPropertyFileReference rhs = ((ExternalPropertyFileReference) other);
- return (((((this.guid == rhs.guid) || ((this.guid != null) && this.guid.equals(rhs.guid))) && ((this.location == rhs.location) || ((this.location != null) && this.location.equals(rhs.location)))) && ((this.properties == rhs.properties) || ((this.properties != null) && this.properties.equals(rhs.properties)))) && (this.itemCount == rhs.itemCount));
- }
-
-}
diff --git a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalPropertyFileReferences.java b/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalPropertyFileReferences.java
deleted file mode 100644
index e8ecfe1667..0000000000
--- a/jmlparser-jml-tools/src/main/java/com/github/jmlparser/lint/sarif/ExternalPropertyFileReferences.java
+++ /dev/null
@@ -1,605 +0,0 @@
-
-package com.github.jmlparser.lint.sarif;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import javax.annotation.processing.Generated;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-
-/**
- * References to external property files that should be inlined with the content of a root log file.
- */
-@Generated("jsonschema2pojo")
-public class ExternalPropertyFileReferences {
-
- /**
- * Contains information that enables a SARIF consumer to locate the external property file that contains the value of an externalized property associated with the run.
- */
- @SerializedName("conversion")
- @Expose
- private ExternalPropertyFileReference conversion;
- /**
- * An array of external property files containing a run.graphs object to be merged with the root log file.
- */
- @SerializedName("graphs")
- @Expose
- private Set graphs = new LinkedHashSet();
- /**
- * Contains information that enables a SARIF consumer to locate the external property file that contains the value of an externalized property associated with the run.
- */
- @SerializedName("externalizedProperties")
- @Expose
- private ExternalPropertyFileReference externalizedProperties;
- /**
- * An array of external property files containing run.artifacts arrays to be merged with the root log file.
- */
- @SerializedName("artifacts")
- @Expose
- private Set artifacts = new LinkedHashSet();
- /**
- * An array of external property files containing run.invocations arrays to be merged with the root log file.
- */
- @SerializedName("invocations")
- @Expose
- private Set invocations = new LinkedHashSet();
- /**
- * An array of external property files containing run.logicalLocations arrays to be merged with the root log file.
- */
- @SerializedName("logicalLocations")
- @Expose
- private Set logicalLocations = new LinkedHashSet();
- /**
- * An array of external property files containing run.threadFlowLocations arrays to be merged with the root log file.
- */
- @SerializedName("threadFlowLocations")
- @Expose
- private Set threadFlowLocations = new LinkedHashSet();
- /**
- * An array of external property files containing run.results arrays to be merged with the root log file.
- */
- @SerializedName("results")
- @Expose
- private Set results = new LinkedHashSet();
- /**
- * An array of external property files containing run.taxonomies arrays to be merged with the root log file.
- */
- @SerializedName("taxonomies")
- @Expose
- private Set taxonomies = new LinkedHashSet();
- /**
- * An array of external property files containing run.addresses arrays to be merged with the root log file.
- */
- @SerializedName("addresses")
- @Expose
- private Set addresses = new LinkedHashSet();
- /**
- * Contains information that enables a SARIF consumer to locate the external property file that contains the value of an externalized property associated with the run.
- */
- @SerializedName("driver")
- @Expose
- private ExternalPropertyFileReference driver;
- /**
- * An array of external property files containing run.extensions arrays to be merged with the root log file.
- */
- @SerializedName("extensions")
- @Expose
- private Set extensions = new LinkedHashSet