From a8d795821fa3e67a37f7a6196c4ec4422bfd2d7a Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sat, 27 Sep 2025 10:33:55 +0200 Subject: [PATCH 01/11] BridiFieldTestData is generated --- .../model/SumtiTestData2Generator.java | 20 +++++ .../io/github/magwas/inez/BridiTestData.java | 6 +- .../CreateBridisFromParserOutputTest.java | 2 + .../query/QueryProcessorEndToEndTest.java | 10 ++- .../magwas/inez/query/QueryProcessorTest.java | 14 ++-- .../inez/storage/BridiStoreEndToEndTest.java | 2 +- .../FindAllByRepresentationServiceStub.java | 2 +- .../storage/FindAllByRepresentationTest.java | 4 +- .../FindAllIdByRepresentationServiceStub.java | 2 +- .../FindAllIdByRepresentationTest.java | 3 +- .../storage/FindBridiByIdServiceStub.java | 2 +- .../inez/storage/model/SumtiTestData.java | 4 +- .../repository/SumtiRepositoryStub.java | 4 +- inez.parser.tests/.classpath | 1 + .../parse/BridiFieldTestDataGenerator.java | 56 ++++++++++++++ .../BridiFieldTestDataGeneratorConstants.java | 13 ++++ .../magwas/inez/parse/BridiFieldTestData.java | 77 ------------------- .../CreateParserFromTokensServiceStub.java | 2 +- .../inez/parse/ParseTextServiceStub.java | 12 +-- .../magwas/inez/parse/ParseTextTest.java | 8 +- .../inez/parse/ParserOutputTestData.java | 26 +++---- inez.parser.tests/src/main/resources/extra | 7 ++ .../src/main/resources/idreferences | 3 + inez.parser.tests/src/main/resources/ids | 7 ++ inez.parser.tests/src/main/resources/inputs | 9 +++ .../src/main/resources/references | 8 ++ .../src/main/resources/representations | 25 ++++++ inez.target/inez.target | 4 +- inez.target/pom.xml | 5 ++ pom.xml | 4 +- 30 files changed, 209 insertions(+), 133 deletions(-) create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java delete mode 100644 inez.parser.tests/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java create mode 100644 inez.parser.tests/src/main/resources/extra create mode 100644 inez.parser.tests/src/main/resources/idreferences create mode 100644 inez.parser.tests/src/main/resources/ids create mode 100644 inez.parser.tests/src/main/resources/inputs create mode 100644 inez.parser.tests/src/main/resources/references create mode 100644 inez.parser.tests/src/main/resources/representations diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java new file mode 100644 index 0000000..6471e49 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java @@ -0,0 +1,20 @@ +package io.github.magwas.inez.storage.model; + +import java.util.function.Supplier; + +import io.github.magwas.inez.parse.BridiFieldTestDataGeneratorConstants; +import io.github.magwas.runtime.GeneratorUtil; + +public class SumtiTestData2Generator + implements Supplier, BridiFieldTestDataGeneratorConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, ""); + GeneratorUtil.mapToCode(REPRESENTATIONS, + GeneratorUtil.stringConstant("REPR"), builder); + builder.append("}\n"); + return builder; + } +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java index 59bfab2..e80dcbe 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java @@ -11,11 +11,11 @@ public interface BridiTestData extends BridiElementTestData { Bridi ALICE = new Bridi(IdUtil.createID(ALICE_REPR), ALICE_REPR, List.of()); - Bridi GO1 = new Bridi(GO1_ID, GO_REPRESENTATION, null); - Bridi GO2 = new Bridi(GO2_ID, GO_REPRESENTATION, null); + Bridi GO1 = new Bridi(GO_ID, GO_REPR, null); + Bridi GO2 = new Bridi(GO2_ID, GO_REPR, null); Bridi SUMTI_IS_A_THING_IS_A_THING = new Bridi( SUMTI_IS_A_THING_IS_A_THING_ID, - SUMTI_IS_A_THING_IS_A_THING_REPR_NOREFERENCE, + SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); Bridi TAUTOLOGY_IS_A_THING = new Bridi(TAUTOLOGY_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java index 057d737..bf1cfd0 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java @@ -13,6 +13,7 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.ParserOutputTestData; import io.github.magwas.testing.TestBase; +import io.github.magwas.testing.TestUtil; class CreateBridisFromParserOutputTest extends TestBase implements BridiTestData, ParserOutputTestData { @InjectMocks @@ -24,6 +25,7 @@ void test() { Set expected = Set.of(THING_GENERATED, IS_A_NONSAVED, SUMTI, SUMTI_IS_A_THING_GENERATED); Set actual = createBridisFromParserOutput.apply(OUTPUT_SUMTI_IS_A_THING).collect(Collectors.toSet()); + TestUtil.diffCollections(expected, actual); assertEquals(expected, actual); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java index 865ad68..17005c8 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java @@ -52,10 +52,12 @@ void test1() { inez.create(TEST_TEXT).peek(x -> LogUtil.debug("created:" + x)).toList(); assertEquals(List.of(ALICE), inez.findAllByRepresentation(ALICE_REPR).toList()); assertQuery(Set.of(ALICE_REPR), ALICE_REPR); - assertQuery(Set.of(ALICE_EATS_BANANA), ALICE_EATS_BANANA); - assertQuery(Set.of(ALICE_EATS_BANANA, BOB_EATS_BANANA, CECILE_EATS_BANANA), "{$?} {{eats} {banana}}"); - assertQuery(Set.of(CECILE_EATS_BANANA, CECILE_LOOKS_AT_BANANA), "{cecile} {{$?} {banana}}"); - assertQuery(Set.of(ALICE_EATS_BANANA, ALICE_EATS_CHIPS), "{alice} {{eats} {$?}}"); + assertQuery(Set.of(ALICE_EATS_BANANA_REPR), ALICE_EATS_BANANA_REPR); + assertQuery( + Set.of(ALICE_EATS_BANANA_REPR, BOB_EATS_BANANA_REPR, CECILE_EATS_BANANA_REPR), + "{$?} {{eats} {banana}}"); + assertQuery(Set.of(CECILE_EATS_BANANA_REPR, CECILE_LOOKS_AT_BANANA_REPR), "{cecile} {{$?} {banana}}"); + assertQuery(Set.of(ALICE_EATS_BANANA_REPR, ALICE_EATS_CHIPS_REPR), "{alice} {{eats} {$?}}"); assertQuery(Set.of("putty"), "doSave {" + "putty" + "}"); assertEquals(1, inez.findAllByRepresentation("putty").count()); List putty = inez.findAllByRepresentation("putty").toList(); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java index f6ae8d3..74de1ba 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java @@ -13,6 +13,7 @@ import io.github.magwas.inez.Bridi; import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.ParserConstants; +import io.github.magwas.runtime.LogUtil; import io.github.magwas.testing.TestBase; import io.github.magwas.testing.TestUtil; @@ -24,7 +25,7 @@ class QueryProcessorTest extends TestBase implements BridiTestData { @Test @DisplayName("for a nonexisting sumti returns the empty list") void test() { - Stream actual = queryProcessor.apply(QUERY_NONEXISTING); + Stream actual = queryProcessor.apply(NONEXISTING_INPUT); TestUtil.assertStreamEquals(Set.of(), actual); } @@ -37,12 +38,13 @@ void test_1() { @Test @DisplayName("if more sumtis exist with the representation, return them all") void test_2() { - TestUtil.assertStreamEquals(Set.of(GO1, GO2), queryProcessor.apply(GO_REPRESENTATION)); + TestUtil.assertStreamEquals(Set.of(GO1, GO2), queryProcessor.apply(GO_REPR)); } @Test @DisplayName("for a reference, return the referenced bridi") void test_3() { + LogUtil.addDebuggedClass(QueryProcessorService.class); TestUtil.assertStreamEquals(Set.of(GO1), queryProcessor.apply(GO1_REFERENCE)); } @@ -73,7 +75,7 @@ void test_7() { @Test @DisplayName("for a bridi where one of the sumties is '$?', the matching bridies return") void test1() { - TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, queryProcessor.apply(QUERY_STRING_SIMPLE)); + TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, queryProcessor.apply(SIMPLE_INPUT)); } @Test @@ -81,19 +83,19 @@ void test1() { void test1_1() { assertThrows( ParseCancellationException.class, - () -> queryProcessor.apply(QUERY_STRING_ALL_ANY).toArray()); + () -> queryProcessor.apply(ALL_ANY_INPUT).toArray()); } @Test @DisplayName("if no stored bridi matches the query with '$?', and empty list is returned") void test2() { - TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(QUERY_STRING_NONMATCHING)); + TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONMATCHING_INPUT)); } @Test @DisplayName("query works with the '$?' being deep down in the query") void test3() { - Stream actual = queryProcessor.apply(RECURSIVE_QUERY); + Stream actual = queryProcessor.apply(RECURSIVE_INPUT); TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java index f757b5b..800bafa 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java @@ -34,7 +34,7 @@ void test() { assertEquals(List.of(ALICE), inez.findAllByRepresentation("alice").toList()); inez.save(Set.of(GO1, GO2)); - inez.findAllByRepresentation(GO_REPRESENTATION).forEach(x -> LogUtil.debug("go", x)); + inez.findAllByRepresentation(GO_REPR).forEach(x -> LogUtil.debug("go", x)); String CECILE_EATS_BANANA_REPR = "{cecile} {{eats} {banana}}"; String CECILE_LOOKS_AT_BANANA_REPR = "{cecile} {{looks at} {banana}}"; Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, inez.query(CECILE_EATS_BANANA_REPR)); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java index f101736..fb15832 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java @@ -12,7 +12,7 @@ public class FindAllByRepresentationServiceStub implements BridiTestData { public static FindAllByRepresentationService stub() { FindAllByRepresentationService mock = mock(FindAllByRepresentationService.class); when(mock.apply(THING_REPR)).thenAnswer((args) -> Stream.of(THING)); - when(mock.apply(GO_REPRESENTATION)).thenAnswer((args) -> Stream.of(GO1, GO2)); + when(mock.apply(GO_REPR)).thenAnswer((args) -> Stream.of(GO1, GO2)); when(mock.apply(SUMTI_IS_A_THING_REPR)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING)); when(mock.apply(ParserConstants.QUERY_BRIDI_ID)).thenAnswer((args) -> Stream.of(ANY)); return mock; diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java index 47ac049..fe7de14 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java @@ -20,8 +20,6 @@ class FindAllByRepresentationTest extends TestBase implements BridiTestData { @Test @DisplayName("finds all bridis based on a representation") void test() { - assertEquals( - Set.of(GO1, GO2), - findAllByRepresentation.apply(GO_REPRESENTATION).collect(Collectors.toSet())); + assertEquals(Set.of(GO1, GO2), findAllByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java index e7f3b98..cbefecf 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java @@ -12,7 +12,7 @@ public class FindAllIdByRepresentationServiceStub implements BridiTestData { public static FindAllIdByRepresentationService stub() { FindAllIdByRepresentationService mock = mock(FindAllIdByRepresentationService.class); when(mock.apply(THING_REPR)).thenAnswer((args) -> Stream.of(THING_ID)); - when(mock.apply(GO_REPRESENTATION)).thenAnswer((args) -> Stream.of(GO1_ID, GO2_ID)); + when(mock.apply(GO_REPR)).thenAnswer((args) -> Stream.of(GO_ID, GO2_ID)); when(mock.apply(SUMTI_IS_A_THING_REPR)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); when(mock.apply(ParserConstants.QUERY_BRIDI_ID)) .thenAnswer((args) -> Stream.of(ParserConstants.QUERY_BRIDI_ID)); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java index 8012677..250d5a9 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java @@ -20,7 +20,6 @@ class FindAllIdByRepresentationTest extends TestBase implements BridiFieldTestDa @DisplayName("returns the ids of all the sumties with the given representation") void test() { assertEquals( - Set.of(GO1_ID, GO2_ID), - findAllIdByRepresentation.apply(GO_REPRESENTATION).collect(Collectors.toSet())); + Set.of(GO_ID, GO2_ID), findAllIdByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java index 0a2ad40..93516e2 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java @@ -11,7 +11,7 @@ public class FindBridiByIdServiceStub implements BridiTestData { public static FindBridiByIdService stub() { FindBridiByIdService mock = mock(FindBridiByIdService.class); - when(mock.apply(GO1_ID)).thenReturn(Optional.of(GO1)); + when(mock.apply(GO_ID)).thenReturn(Optional.of(GO1)); when(mock.apply(GO2_ID)).thenReturn(Optional.of(GO2)); when(mock.apply(SUMTI_IS_A_THING_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING_IS_A_THING)); when(mock.apply(TAUTOLOGY_IS_A_THING_ID)).thenReturn(Optional.of(TAUTOLOGY_IS_A_THING)); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java index 7ae7b0d..f9dd904 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java @@ -7,6 +7,6 @@ public interface SumtiTestData extends BridiFieldTestData { Sumti THING_SUMTI = new Sumti(THING_ID, THING_REPR); Sumti SUMTI_IS_A_THING_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR); Sumti SUMTI_IS_A_THING_CHANGED_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR); - Sumti GO1_SUMTI = new Sumti(GO1_ID, GO_REPRESENTATION); - Sumti GO2_SUMTI = new Sumti(GO2_ID, GO_REPRESENTATION); + Sumti GO1_SUMTI = new Sumti(GO_ID, GO_REPR); + Sumti GO2_SUMTI = new Sumti(GO2_ID, GO_REPR); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java index 45b5fa5..f1bc513 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java @@ -13,9 +13,9 @@ public static SumtiRepository stub() { SumtiRepository mock = mock(SumtiRepository.class); when(mock.findById(THING_ID)).thenReturn(Optional.of(THING_SUMTI)); when(mock.findById(SUMTI_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING_SUMTI)); - when(mock.findById(NOT_SAVED_ID)).thenReturn(Optional.empty()); + when(mock.findById(SUMTI_ID)).thenReturn(Optional.empty()); - when(mock.findAllByRepresentation(GO_REPRESENTATION)).thenReturn(Set.of(GO1_SUMTI, GO2_SUMTI)); + when(mock.findAllByRepresentation(GO_REPR)).thenReturn(Set.of(GO1_SUMTI, GO2_SUMTI)); return mock; } } diff --git a/inez.parser.tests/.classpath b/inez.parser.tests/.classpath index 030981d..b0fcce7 100644 --- a/inez.parser.tests/.classpath +++ b/inez.parser.tests/.classpath @@ -3,6 +3,7 @@ + diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java new file mode 100644 index 0000000..b47206c --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java @@ -0,0 +1,56 @@ +package io.github.magwas.inez.parse; + +import java.text.MessageFormat; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Stream; + +import io.github.magwas.runtime.GeneratorUtil; + +public class BridiFieldTestDataGenerator + implements Supplier, BridiFieldTestDataGeneratorConstants { + + @Override + public StringBuilder get() { + List definedIdlist = GeneratorUtil.linesOf(IDS) + .map(s -> s.split(",")[0]).toList(); + Stream generatedIds = GeneratorUtil.linesOf(REPRESENTATIONS) + .map(s -> s.split(",")[0]).filter(x -> !definedIdlist.contains(x)); + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, """ + import java.util.List; + """); + GeneratorUtil.mapToCode(REPRESENTATIONS, + GeneratorUtil.stringConstant("REPR"), builder); + builder.append("\n"); + GeneratorUtil.mapToCode(generatedIds, line -> { + String[] parts = line.split(",", 2); + return MessageFormat.format(""" + String {0}_ID = IdUtil.createID({0}_REPR); + """, parts[0].trim()); + }, builder); + GeneratorUtil.mapToCode(IDS, GeneratorUtil.stringConstant("ID"), builder); + builder.append("\n"); + GeneratorUtil.mapToCode(INPUTS, GeneratorUtil.stringConstant("INPUT"), + builder); + builder.append("\n"); + GeneratorUtil.mapToCode(IDREFERENCES, line -> { + String[] parts = line.split(",", 2); + return MessageFormat.format(""" + String {0}_REFERENCE = "@{0}"; + """, parts[0].trim()); + }, builder); + builder.append("\n"); + GeneratorUtil.mapToCode(REFERENCES, line -> { + String[] parts = line.split(",", 2); + return MessageFormat.format(""" + List {0}_REFERENCES = List.of({1}); + """, parts[0].trim(), parts[1]); + }, builder); + builder.append("\n"); + builder.append(EXTRA); + builder.append("}\n"); + + return builder; + } +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java new file mode 100644 index 0000000..8092f54 --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java @@ -0,0 +1,13 @@ +package io.github.magwas.inez.parse; + +import io.github.magwas.testing.TestUtil; + +public interface BridiFieldTestDataGeneratorConstants { + String REPRESENTATIONS = TestUtil.loadResourceAsString("representations"); + String IDS = TestUtil.loadResourceAsString("ids"); + String EXTRA = TestUtil.loadResourceAsString("extra"); + String IDREFERENCES = TestUtil.loadResourceAsString("idreferences"); + String INPUTS = TestUtil.loadResourceAsString("inputs"); + String REFERENCES = TestUtil.loadResourceAsString("references"); + +} diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java deleted file mode 100644 index 7383de8..0000000 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/BridiFieldTestData.java +++ /dev/null @@ -1,77 +0,0 @@ -package io.github.magwas.inez.parse; - -import java.util.List; - -public interface BridiFieldTestData { - String ALICE_REPR = "alice"; - String ALICE_ID = IdUtil.createID(ALICE_REPR); - String THING_REPR = "THING"; - String THING_ID = "THING"; - String THING_REFERENCE = "@" + THING_ID; - String SUMTI_REPR = "sumti"; - String BRIDI_REPR = "bridi"; - String IS_A_REPR = "{0} is a {1}"; - String SUMTI_IS_A_THING_REPR = "{sumti} is a {THING}"; - String SUMTI_IS_A_THING_CHANGED_REPR = SUMTI_IS_A_THING_REPR + " changed"; - String THING_IS_A_SUMTI_REPR = "{THING} is a {sumti}"; - String TAUTOLOGY_REPR = "the most basic tautology"; - String TAUTOLOGY_GENERATED_REPR = "{THING} is a {THING}"; - String SUMTI_IS_A_THING_IS_A_THING_REPR = "{{sumti} is a {THING}} is a {@THING}"; - String SUMTI_IS_A_THING_IS_A_THING_REPR_NOREFERENCE = "{{sumti} is a {THING}} is a {THING}"; - String TAUTOLOGY_IS_A_THING_REPR = "{{THING} is a {THING}} is a {THING}"; - String STUFF_ID = "stuff"; - String COULDBE_ID = "ID:could be"; - - String GO_REPRESENTATION = "go"; - String GO1_ID = "go1"; - String GO2_ID = "go2"; - String GO1_REFERENCE = "@go1"; - String NONEXISTENT_REFERENCE = "@nonexistent"; - String NONEXISTENT_REPR = "nonexistent"; - String INPUT_BAD = "{bridi is a {THING}"; - String INPUT_FROM_UNKNOWN_PARSER = "INPUT_FROM_UNKNOWN_PARSER"; - String QUERY_NONEXISTING = "nonexisting"; - String QUERY_STRING_SIMPLE = "{$?} is a {THING}"; - String QUERY_STRING_ALL_ANY = "{$?} is a {$?}"; - String QUERY_STRING_NONMATCHING = "{$?} is a {god}"; - String RECURSIVE_QUERY = "{{$?} is a {THING}} is a {THING}"; - - String DESCRIPTION_SUMTI_IS_A_THING_STRING = "sumti is a THING"; - String GOD_REPR = "god"; - String TWO_SUMTI_BRIDI_REPR = "{0} {1}"; - String CECILE_LOOKS_AT_BANANA = "{cecile} {{looks at} {banana}}"; - String CECILE_EATS_BANANA = "{cecile} {{eats} {banana}}"; - String BOB_EATS_CHIPS = "{bob} {{eats} {chips}}"; - String BOB_EATS_BANANA = "{bob} {{eats} {banana}}"; - String ALICE_EATS_CHIPS = "{alice} {{eats} {chips}}"; - String ALICE_EATS_BANANA = "{alice} {{eats} {banana}}"; - - String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_REPR_NOREFERENCE + "\n" - + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA + "\n" - + ALICE_EATS_CHIPS + "\n" + BOB_EATS_BANANA + "\n" + BOB_EATS_CHIPS + "\n" - + CECILE_EATS_BANANA + "\n" + CECILE_LOOKS_AT_BANANA + "\n" - + SUMTI_IS_A_THING_REPR + "\n" + TAUTOLOGY_GENERATED_REPR; - - String SUMTI_ID = IdUtil.createID("sumti"); - String BRIDI_ID = IdUtil.createID("bridi"); - String IS_A_ID = "IS_A"; - String SUMTI_IS_A_THING_ID = IdUtil.createID("{sumti} is a {THING}"); - String SUMTI_IS_A_THING_IS_A_THING_ID = IdUtil.createID("{{sumti} is a {THING}} is a {THING}"); - String TAUTOLOGY_IS_A_THING_ID = IdUtil.createID("{{THING} is a {THING}} is a {THING}"); - String THING_IS_A_SUMTI_ID = "not tautology"; - String TAUTOLOGY_ID = "tautology"; - - String GOD_ID = IdUtil.createID("god"); - String NOT_SAVED_ID = IdUtil.createID(SUMTI_REPR); - String NONEXISTENT_ID = IdUtil.createID(NONEXISTENT_REPR); - List SUMTI_IS_A_THING_IS_A_THING_REFERENCES = List.of(IS_A_ID, SUMTI_IS_A_THING_ID, THING_ID); - List TAUTOLOGY_IS_A_THING_REFERENCES = List.of(IS_A_ID, TAUTOLOGY_ID, THING_REPR); - List BAD_BRIDI_REFERENCES = List.of(IS_A_REPR, SUMTI_IS_A_THING_ID, NONEXISTENT_REPR); - List SUMTI_IS_A_THING_CHANGED_REFERENCES = List.of(IS_A_ID, THING_ID, THING_ID); - List SUMTI_IS_A_THING_REFERENCES = List.of(IS_A_ID, SUMTI_ID, THING_ID); - List SUMTI_IS_A_THING_GENERATED_REFERENCES = - List.of(IdUtil.createID(IS_A_REPR), SUMTI_ID, IdUtil.createID(THING_REPR)); - List THING_IS_A_SUMTI_REFERENCES = List.of(IS_A_ID, THING_ID, SUMTI_ID); - String INPUT_WITH_LITERAL = "{My folder} contains {[{0} is a {1}]}"; - List INPUT_WITH_LITERAL_REFS = List.of("{0} contains {1}", "My folder", "{0} is a {1}"); -} diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java index e2eeea7..d9da6a6 100644 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java +++ b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java @@ -24,7 +24,7 @@ public static CreateParserFromTokensService stub() { para.children = List.of(bridiContext); when(bridiParsermock.paragraph()).thenReturn(para); when(mock.apply(any())).thenCallRealMethod(); - when(mock.apply(INPUT_FROM_UNKNOWN_PARSER)).thenReturn(bridiParsermock); + when(mock.apply(FROM_UNKNOWN_PARSER_INPUT)).thenReturn(bridiParsermock); return mock; } } diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java index 6951ac4..f5b0d2e 100644 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java +++ b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java @@ -8,19 +8,19 @@ class ParseTextServiceStub implements ParserOutputTestData { public static ParseTextService stub() { ParseTextService mock = mock(ParseTextService.class); - when(mock.apply(QUERY_NONEXISTING)).thenReturn(Stream.of(OUTPUT_NONEXISTING)); + when(mock.apply(NONEXISTENT_REPR)).thenReturn(Stream.of(OUTPUT_NONEXISTING)); when(mock.apply(THING_REPR)).thenReturn(Stream.of(OUTPUT_THING)); - when(mock.apply(GO_REPRESENTATION)).thenReturn(Stream.of(OUTPUT_GO)); + when(mock.apply(GO_REPR)).thenReturn(Stream.of(OUTPUT_GO)); when(mock.apply(SUMTI_IS_A_THING_REPR)).thenReturn(Stream.of(OUTPUT_SUMTI_IS_A_THING)); when(mock.apply(GO1_REFERENCE)).thenReturn(Stream.of(OUTPUT_GO1)); when(mock.apply(NONEXISTENT_REFERENCE)).thenReturn(Stream.of(OUTPUT_NONEXISTENT_REFERENCE)); when(mock.apply(TAUTOLOGY_GENERATED_REPR)).thenReturn(Stream.of(OUTPUT_TAUTOLOGY)); when(mock.apply(ParserConstants.QUERY_BRIDI_ID)).thenReturn(Stream.of(OUTPUT_ANY)); - when(mock.apply(QUERY_STRING_SIMPLE)).thenReturn(Stream.of(OUTPUT_SIMPLE)); - when(mock.apply(QUERY_STRING_ALL_ANY)).thenReturn(Stream.of(OUTPUT_ALL_ANY)); - when(mock.apply(QUERY_STRING_NONMATCHING)).thenReturn(Stream.of(OUTPUT_NONMATCHING)); - when(mock.apply(RECURSIVE_QUERY)).thenReturn(Stream.of(OUTPUT_RECURSIVE)); + when(mock.apply(SIMPLE_INPUT)).thenReturn(Stream.of(OUTPUT_SIMPLE)); + when(mock.apply(ALL_ANY_INPUT)).thenReturn(Stream.of(OUTPUT_ALL_ANY)); + when(mock.apply(NONMATCHING_INPUT)).thenReturn(Stream.of(OUTPUT_NONMATCHING)); + when(mock.apply(RECURSIVE_INPUT)).thenReturn(Stream.of(OUTPUT_RECURSIVE)); return mock; } } diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java index 09fa5e8..82e2975 100644 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java +++ b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java @@ -54,13 +54,13 @@ void test4() { void test5() { assertThrows( InternalError.class, - () -> parseText.apply(INPUT_FROM_UNKNOWN_PARSER).toList()); + () -> parseText.apply(FROM_UNKNOWN_PARSER_INPUT).toList()); } @Test @DisplayName("if the text cannot be unambigously parsed, a ParseCancellationException is thrown") void test1() { - assertThrows(ParseCancellationException.class, () -> parseText.apply(INPUT_BAD)); + assertThrows(ParseCancellationException.class, () -> parseText.apply(BAD_INPUT)); } @Test @@ -68,7 +68,7 @@ void test1() { void test6() { assertEquals( OUTPOUT_WITH_LITERAL, - parseText.apply(INPUT_WITH_LITERAL).toList().get(0)); + parseText.apply(WITH_LITERAL_INPUT).toList().get(0)); } @Test @@ -77,7 +77,7 @@ void test7() { assertEquals( List.of(OUTPOUT_WITH_LITERAL, OUTPUT_TAUTOLOGY), parseText - .apply(INPUT_WITH_LITERAL + "\n" + TAUTOLOGY_GENERATED_REPR) + .apply(WITH_LITERAL_INPUT + "\n" + TAUTOLOGY_GENERATED_REPR) .toList()); } } diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java index c39d4da..99441dc 100644 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java +++ b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java @@ -6,11 +6,11 @@ public interface ParserOutputTestData extends BridiFieldTestData { ParserOutput OUTPOUT_WITH_LITERAL = - new ParserOutput(INPUT_WITH_LITERAL, Map.of(INPUT_WITH_LITERAL, INPUT_WITH_LITERAL_REFS)); + new ParserOutput(WITH_LITERAL_INPUT, Map.of(WITH_LITERAL_INPUT, INPUT_WITH_LITERAL_REFS_REFERENCES)); - ParserOutput OUTPUT_NONEXISTING = new ParserOutput(QUERY_NONEXISTING, Map.of()); + ParserOutput OUTPUT_NONEXISTING = new ParserOutput(NONEXISTENT_REFERENCE, Map.of()); ParserOutput OUTPUT_THING = new ParserOutput(THING_REPR, Map.of()); - ParserOutput OUTPUT_GO = new ParserOutput(GO_REPRESENTATION, Map.of()); + ParserOutput OUTPUT_GO = new ParserOutput(GO_REPR, Map.of()); ParserOutput OUTPUT_GO1 = new ParserOutput(GO1_REFERENCE, Map.of()); ParserOutput OUTPUT_NONEXISTENT_REFERENCE = new ParserOutput(NONEXISTENT_REFERENCE, Map.of()); ParserOutput OUTPUT_ANY = new ParserOutput(ParserConstants.QUERY_BRIDI_ID, Map.of()); @@ -20,23 +20,19 @@ public interface ParserOutputTestData extends BridiFieldTestData { ParserOutput OUTPUT_TAUTOLOGY = new ParserOutput( TAUTOLOGY_GENERATED_REPR, Map.of(TAUTOLOGY_GENERATED_REPR, List.of(IS_A_REPR, THING_REPR, THING_REPR))); ParserOutput OUTPUT_SIMPLE = new ParserOutput( - QUERY_STRING_SIMPLE, - Map.of(QUERY_STRING_SIMPLE, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, THING_REPR))); + SIMPLE_INPUT, Map.of(SIMPLE_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, THING_REPR))); ParserOutput OUTPUT_ALL_ANY = new ParserOutput( - QUERY_STRING_ALL_ANY, - Map.of( - QUERY_STRING_ALL_ANY, - List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, ParserConstants.QUERY_BRIDI_ID))); + ALL_ANY_INPUT, + Map.of(ALL_ANY_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, ParserConstants.QUERY_BRIDI_ID))); ParserOutput OUTPUT_NONMATCHING = new ParserOutput( - QUERY_STRING_NONMATCHING, - Map.of(QUERY_STRING_NONMATCHING, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, GOD_REPR))); + NONMATCHING_INPUT, Map.of(NONMATCHING_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, GOD_REPR))); ParserOutput OUTPUT_RECURSIVE = new ParserOutput( - RECURSIVE_QUERY, + RECURSIVE_INPUT, Map.of( - RECURSIVE_QUERY, - List.of(IS_A_REPR, QUERY_STRING_SIMPLE, THING_REPR), + RECURSIVE_INPUT, + List.of(IS_A_REPR, SIMPLE_INPUT, THING_REPR), TAUTOLOGY_GENERATED_REPR, List.of(IS_A_REPR, THING_REPR, THING_REPR), - QUERY_STRING_SIMPLE, + SIMPLE_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, THING_REPR))); } diff --git a/inez.parser.tests/src/main/resources/extra b/inez.parser.tests/src/main/resources/extra new file mode 100644 index 0000000..1eb153c --- /dev/null +++ b/inez.parser.tests/src/main/resources/extra @@ -0,0 +1,7 @@ + + String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR + "\n" + + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA_REPR + "\n" + + ALICE_EATS_CHIPS_REPR + "\n" + BOB_EATS_BANANA_REPR + "\n" + BOB_EATS_CHIPS_REPR + "\n" + + CECILE_EATS_BANANA_REPR + "\n" + CECILE_LOOKS_AT_BANANA_REPR + "\n" + + SUMTI_IS_A_THING_REPR + "\n" + TAUTOLOGY_GENERATED_REPR; + \ No newline at end of file diff --git a/inez.parser.tests/src/main/resources/idreferences b/inez.parser.tests/src/main/resources/idreferences new file mode 100644 index 0000000..70c0167 --- /dev/null +++ b/inez.parser.tests/src/main/resources/idreferences @@ -0,0 +1,3 @@ +NONEXISTENT +GO1 +THING diff --git a/inez.parser.tests/src/main/resources/ids b/inez.parser.tests/src/main/resources/ids new file mode 100644 index 0000000..e3488c6 --- /dev/null +++ b/inez.parser.tests/src/main/resources/ids @@ -0,0 +1,7 @@ +THING,THING +IS_A,IS_A +STUFF,stuff +GO,GO1 +GO2,go2 +THING_IS_A_SUMTI,not tautology +TAUTOLOGY,tautology \ No newline at end of file diff --git a/inez.parser.tests/src/main/resources/inputs b/inez.parser.tests/src/main/resources/inputs new file mode 100644 index 0000000..be2ca06 --- /dev/null +++ b/inez.parser.tests/src/main/resources/inputs @@ -0,0 +1,9 @@ +BAD,{bridi is a {THING} +NONEXISTING,nonexisting +SIMPLE,{$?} is a {THING} +ALL_ANY,{$?} is a {$?} +NONMATCHING,{$?} is a {god} +QUERY,{{$?} is a {THING}} is a {THING} +FROM_UNKNOWN_PARSER,INPUT_FROM_UNKNOWN_PARSER +WITH_LITERAL,{My folder} contains {[{0} is a {1}]} +RECURSIVE,{{$?} is a {THING}} is a {THING} \ No newline at end of file diff --git a/inez.parser.tests/src/main/resources/references b/inez.parser.tests/src/main/resources/references new file mode 100644 index 0000000..a52c3f9 --- /dev/null +++ b/inez.parser.tests/src/main/resources/references @@ -0,0 +1,8 @@ +SUMTI_IS_A_THING_IS_A_THING,IS_A_ID, SUMTI_IS_A_THING_ID, THING_ID +SUMTI_IS_A_THING_GENERATED,IdUtil.createID(IS_A_REPR), SUMTI_ID, IdUtil.createID(THING_REPR) +TAUTOLOGY_IS_A_THING,IS_A_ID, TAUTOLOGY_ID, THING_REPR +BAD_BRIDI,IS_A_REPR, SUMTI_IS_A_THING_ID, NONEXISTENT_REPR +SUMTI_IS_A_THING_CHANGED,IS_A_ID, THING_ID, THING_ID +SUMTI_IS_A_THING,IS_A_ID, SUMTI_ID, THING_ID +THING_IS_A_SUMTI,IS_A_ID, THING_ID, SUMTI_ID +INPUT_WITH_LITERAL_REFS,"{0} contains {1}", "My folder", "{0} is a {1}" \ No newline at end of file diff --git a/inez.parser.tests/src/main/resources/representations b/inez.parser.tests/src/main/resources/representations new file mode 100644 index 0000000..9c4752a --- /dev/null +++ b/inez.parser.tests/src/main/resources/representations @@ -0,0 +1,25 @@ +THING,THING +IS_A,{0} is a {1} +ALICE,alice +SUMTI,sumti +BRIDI,bridi +SUMTI_IS_A_THING,{sumti} is a {THING} +THING_IS_A_SUMTI,{THING} is a {sumti} +TAUTOLOGY,the most basic tautology +TAUTOLOGY_GENERATED,{THING} is a {THING} +SUMTI_IS_A_THING_IS_A_THING,{{sumti} is a {THING}} is a {@THING} +SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE,{{sumti} is a {THING}} is a {THING} +TAUTOLOGY_IS_A_THING,{{THING} is a {THING}} is a {THING} +GOD,god +TWO_SUMTI_BRIDI,{0} {1} +GO,go +NONEXISTENT,nonexistent +DESCRIPTION_SUMTI_IS_A_THING,sumti is a THING +CECILE_LOOKS_AT_BANANA,{cecile} {{looks at} {banana}} +CECILE_EATS_BANANA,{cecile} {{eats} {banana}} +BOB_EATS_CHIPS,{bob} {{eats} {chips}} +BOB_EATS_BANANA,{bob} {{eats} {banana}} +ALICE_EATS_CHIPS,{alice} {{eats} {chips}} +ALICE_EATS_BANANA,{alice} {{eats} {banana}} +SUMTI_IS_A_THING_CHANGED,{sumti} is a {THING} changed +COULDBE,could be diff --git a/inez.target/inez.target b/inez.target/inez.target index 982a8a2..b9dbd88 100644 --- a/inez.target/inez.target +++ b/inez.target/inez.target @@ -23,13 +23,13 @@ io.github.magwas konveyor-base-testing - 0.4.32 + 0.4.33 jar io.github.magwas konveyor-base - 0.4.32 + 0.4.33 jar diff --git a/inez.target/pom.xml b/inez.target/pom.xml index aa8e3a7..e1873ee 100644 --- a/inez.target/pom.xml +++ b/inez.target/pom.xml @@ -58,6 +58,11 @@ javafx-controls 21.0.8 + + io.github.magwas + konveyor-base-testing + ${version.konveyor} + diff --git a/pom.xml b/pom.xml index d440ba3..7695f4a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.magwas konveyor-parent - 0.4.32 + 0.4.33 inez 0.0.1 @@ -55,7 +55,7 @@ true - 0.4.32 + 0.4.33 From b164efcab61d442d69f893fd4cde659de5ac028e Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 28 Sep 2025 19:34:24 +0200 Subject: [PATCH 02/11] TestData units of parser are separated --- inez.model.tests/.classpath | 1 + .../model/SumtiTestData2Generator.java | 4 +- .../io/github/magwas/inez/BridiTestData.java | 41 ++++++----- .../element/BridiElementEndToEndTest.java | 24 ++++--- .../inez/element/BridiElementTestData.java | 33 ++------- .../CreateBridisFromParserOutputTest.java | 13 ++-- .../query/QueryProcessorEndToEndTest.java | 42 ++++++----- .../inez/query/QueryProcessorTestData.java | 14 ++++ .../storage/AddReferencesServiceTest.java | 10 +-- .../inez/storage/AddReferencesTest.java | 8 ++- .../inez/storage/BridiStoreEndToEndTest.java | 23 +++--- .../FindAllIdByRepresentationTest.java | 8 +-- ...BridiIdBySelbriAndSumtiIdsServiceStub.java | 23 +++--- .../storage/model/BridiReferenceTestData.java | 72 +++++++++++-------- .../inez/storage/model/SumtiTestData.java | 10 +-- .../parse/BridiFieldTestDataGenerator.java | 56 --------------- .../inez/parse/IdTestDataGenerator.java | 32 +++++++++ .../inez/parse/InputTestDataGenerator.java | 20 ++++++ .../parse/ParserOutputTestDataGenerator.java | 33 +++++++++ .../parse/ReferenceTestDataGenerator.java | 28 ++++++++ .../RepresentationTestDataGenerator.java | 26 +++++++ ...s.java => TestDataGeneratorConstants.java} | 3 +- .../magwas/inez/parse/ParseTextTest.java | 4 +- .../inez/parse/ParserOutputTestData.java | 38 ---------- inez.parser.tests/src/main/resources/extra | 7 -- inez.parser.tests/src/main/resources/ids | 5 +- inez.parser.tests/src/main/resources/inputs | 7 +- inez.parser.tests/src/main/resources/outputs | 13 ++++ .../src/main/resources/references | 9 ++- .../src/main/resources/representations | 14 ++++ 30 files changed, 367 insertions(+), 254 deletions(-) create mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java delete mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java rename inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/{BridiFieldTestDataGeneratorConstants.java => TestDataGeneratorConstants.java} (81%) delete mode 100644 inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java delete mode 100644 inez.parser.tests/src/main/resources/extra create mode 100644 inez.parser.tests/src/main/resources/outputs diff --git a/inez.model.tests/.classpath b/inez.model.tests/.classpath index 030981d..b0fcce7 100644 --- a/inez.model.tests/.classpath +++ b/inez.model.tests/.classpath @@ -3,6 +3,7 @@ + diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java index 6471e49..499a251 100644 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java @@ -2,11 +2,11 @@ import java.util.function.Supplier; -import io.github.magwas.inez.parse.BridiFieldTestDataGeneratorConstants; +import io.github.magwas.inez.parse.TestDataGeneratorConstants; import io.github.magwas.runtime.GeneratorUtil; public class SumtiTestData2Generator - implements Supplier, BridiFieldTestDataGeneratorConstants { + implements Supplier, TestDataGeneratorConstants { @Override public StringBuilder get() { diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java index e80dcbe..e2e052d 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java @@ -3,43 +3,50 @@ import java.util.List; import java.util.Set; -import io.github.magwas.inez.element.BridiElementTestData; +import io.github.magwas.inez.parse.IdTestData; import io.github.magwas.inez.parse.IdUtil; import io.github.magwas.inez.parse.ParserConstants; +import io.github.magwas.inez.parse.ReferenceTestData; +import io.github.magwas.inez.parse.RepresentationTestData; -public interface BridiTestData extends BridiElementTestData { +public interface BridiTestData + extends RepresentationTestData, IdTestData, ReferenceTestData { Bridi ALICE = new Bridi(IdUtil.createID(ALICE_REPR), ALICE_REPR, List.of()); Bridi GO1 = new Bridi(GO_ID, GO_REPR, null); Bridi GO2 = new Bridi(GO2_ID, GO_REPR, null); - Bridi SUMTI_IS_A_THING_IS_A_THING = new Bridi( - SUMTI_IS_A_THING_IS_A_THING_ID, + Bridi SUMTI_IS_A_THING_IS_A_THING = new Bridi(SUMTI_IS_A_THING_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); - Bridi TAUTOLOGY_IS_A_THING = - new Bridi(TAUTOLOGY_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); + Bridi TAUTOLOGY_IS_A_THING = new Bridi(TAUTOLOGY_IS_A_THING_ID, + TAUTOLOGY_IS_A_THING_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); Bridi THING = new Bridi(THING_ID, THING_REPR, null); Bridi THING_CHANGED = new Bridi(THING_ID, "thung", null); - Bridi THING_GENERATED = new Bridi(IdUtil.createID(THING_REPR), THING_REPR, null); + Bridi THING_GENERATED = new Bridi(IdUtil.createID(THING_REPR), THING_REPR, + null); Bridi SUMTI = new Bridi(SUMTI_ID, SUMTI_REPR, null); Bridi NONEXISTENT = new Bridi(NONEXISTENT_ID, NONEXISTENT_REPR, null); Bridi BRIDI = new Bridi(BRIDI_ID, BRIDI_REPR, null); Bridi IS_A = new Bridi(IS_A_ID, IS_A_REPR, null); Bridi IS_A_NONSAVED = new Bridi(IdUtil.createID(IS_A_REPR), IS_A_REPR, null); - Bridi ANY = new Bridi(ParserConstants.QUERY_BRIDI_ID, ParserConstants.QUERY_BRIDI_ID, null); + Bridi ANY = new Bridi(ParserConstants.QUERY_BRIDI_ID, + ParserConstants.QUERY_BRIDI_ID, null); - Bridi SUMTI_IS_A_THING = new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_REFERENCES); - Bridi SUMTI_IS_A_THING_GENERATED = - new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_GENERATED_REFERENCES); - Bridi SUMTI_IS_A_THING_CHANGED = - new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); - Bridi TAUTOLOGY = new Bridi(TAUTOLOGY_ID, TAUTOLOGY_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); - Bridi THING_IS_A_SUMTI = new Bridi(THING_IS_A_SUMTI_ID, TAUTOLOGY_REPR, THING_IS_A_SUMTI_REFERENCES); + Bridi SUMTI_IS_A_THING = new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, + SUMTI_IS_A_THING_REFERENCES); + Bridi SUMTI_IS_A_THING_GENERATED = new Bridi(SUMTI_IS_A_THING_ID, + SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_GENERATED_REFERENCES); + Bridi SUMTI_IS_A_THING_CHANGED = new Bridi(SUMTI_IS_A_THING_ID, + SUMTI_IS_A_THING_CHANGED_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); + Bridi TAUTOLOGY = new Bridi(TAUTOLOGY_ID, TAUTOLOGY_REPR, + SUMTI_IS_A_THING_CHANGED_REFERENCES); + Bridi THING_IS_A_SUMTI = new Bridi(THING_IS_A_SUMTI_ID, TAUTOLOGY_REPR, + THING_IS_A_SUMTI_REFERENCES); Bridi GOD = new Bridi(GOD_ID, GOD_REPR, null); Bridi HUMAN = new Bridi(HUMAN_ID, HUMAN_REPR, null); Bridi MY_MODEL = new Bridi(MY_MODEL_ID, MY_MODEL_REPR, null); - Set SIMPLE_QUERY_OUTPUT = - Set.of(TAUTOLOGY, SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); + Set SIMPLE_QUERY_OUTPUT = Set.of(TAUTOLOGY, + SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java index 5f71187..87e752b 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java @@ -26,7 +26,7 @@ @Tag("end-to-end") @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestConfig.class) -class BridiElementEndToEndTest implements BridiTestData { +class BridiElementEndToEndTest implements BridiTestData, BridiElementTestData { @Autowired SumtiRepository sumtiRepository; @@ -46,7 +46,8 @@ class BridiElementEndToEndTest implements BridiTestData { @BeforeEach void setUp() { sumtiRepository.findAll().forEach(x -> sumtiRepository.delete(x)); - bridiReferenceRepository.findAll().forEach(x -> bridiReferenceRepository.delete(x)); + bridiReferenceRepository.findAll() + .forEach(x -> bridiReferenceRepository.delete(x)); } @Test @@ -55,10 +56,9 @@ void test() throws IOException { assertSame(bridiElementSystemInitialization.inez, inez); bridiElementSystemInitialization.apply(); BridiElement elementModel = bridiElementFactory.apply(ELEMENT_MODEL_ID); - assertTrue(elementModel - .getChildren() - .anyMatch( - x -> x.getReferences().map(y -> y.id).toList().contains(ElementConstants.IS_FUNCTION_FOR_ID))); + assertTrue(elementModel.getChildren() + .anyMatch(x -> x.getReferences().map(y -> y.id).toList() + .contains(ElementConstants.IS_FUNCTION_FOR_ID))); BridiElement root = bridiElementFactory.apply(ROOT_ID); String rootXml = loadResourceAsString("root.xml"); String theXml = root.toXml(); @@ -71,8 +71,7 @@ void test() throws IOException { assertEquals(CONTAINS_ELEMENT_REPR, element.getRepresentation()); assertEquals(THING_ID, element.getType().id); - assertEquals( - CONTAINS_ELEMENT_REFERENCES, + assertEquals(CONTAINS_ELEMENT_REFERENCES, element.getReferences().map(x -> x.id).toList()); assertEquals(List.of(), element.getChildren().toList()); assertEquals(MY_MODEL_ID, element.getParent().id); @@ -83,7 +82,8 @@ void test() throws IOException { assertEquals(MY_MODEL_REPR, element.getRepresentation()); assertEquals(FOLDER_ID, element.getType().id); assertEquals(List.of(), element.getReferences().toList()); - assertEquals(MY_FOLDER_CHILDREN, element.getChildren().map(x -> x.id).collect(Collectors.toSet())); + assertEquals(MY_FOLDER_CHILDREN, + element.getChildren().map(x -> x.id).collect(Collectors.toSet())); assertEquals(ROOT_ID, element.getParent().id); String xml = loadResourceAsString("mymodel.xml"); assertEquals(xml, element.toXml()); @@ -92,9 +92,11 @@ void test() throws IOException { assertTrue(element.isInstance(THING_ID)); } - private String loadResourceAsString(final String definitionName) throws IOException { + private String loadResourceAsString(final String definitionName) + throws IOException { ClassLoader classloader = Thread.currentThread().getContextClassLoader(); - try (InputStream inputStream = classloader.getResourceAsStream(definitionName)) { + try (InputStream inputStream = classloader + .getResourceAsStream(definitionName)) { return new String(inputStream.readAllBytes()); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java index 2b97419..5001990 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java @@ -1,35 +1,12 @@ package io.github.magwas.inez.element; -import java.util.List; import java.util.Set; -import io.github.magwas.inez.parse.BridiFieldTestData; -import io.github.magwas.inez.parse.IdUtil; +import io.github.magwas.inez.parse.IdTestData; -public interface BridiElementTestData extends BridiFieldTestData { - String DOG_ID = "id:dog"; - String CONTAINS_ID = "CONTAINS"; - String ROOT_ID = "ROOT"; - String ELEMENT_MODEL_ID = "id:elementModel"; - String CONTAINER_ID = "CONTAINER"; - String CONTAINS_ELEMENT_REPR = "{my model} contains {alice}"; - String CONTAINS_ELEMENT_ID = IdUtil.createID(CONTAINS_ELEMENT_REPR); - String MY_MODEL_REPR = "my model"; - String MY_MODEL_ID = IdUtil.createID(MY_MODEL_REPR); - String FOLDER_ID = IdUtil.createID("folder"); - String ALICE_IS_A_HUMAN_ID = "id:{alice} is a {human}"; - String HUMAN_IS_A_ANIMAL_ID = "id:{human} is a {animal}"; - String DOG_IS_A_ANIMAL_ID = "id:{dog} is a {animal}"; - String MY_MODEL_IS_A_FOLDER_ID = "id:{my model} is a {folder}"; - List CONTAINS_ELEMENT_REFERENCES = List.of(CONTAINS_ID, MY_MODEL_ID, ALICE_ID); - String HUMAN_REPR = "human"; - String HUMAN_ID = IdUtil.createID(HUMAN_REPR); - Set MY_FOLDER_CHILDREN = Set.of( - ALICE_ID, - HUMAN_ID, - DOG_ID, - MY_MODEL_IS_A_FOLDER_ID, - DOG_IS_A_ANIMAL_ID, - HUMAN_IS_A_ANIMAL_ID, +public interface BridiElementTestData extends IdTestData { + + Set MY_FOLDER_CHILDREN = Set.of(ALICE_ID, HUMAN_ID, DOG_ID, + MY_MODEL_IS_A_FOLDER_ID, DOG_IS_A_ANIMAL_ID, HUMAN_IS_A_ANIMAL_ID, ALICE_IS_A_HUMAN_ID); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java index bf1cfd0..c245fec 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java @@ -15,16 +15,19 @@ import io.github.magwas.testing.TestBase; import io.github.magwas.testing.TestUtil; -class CreateBridisFromParserOutputTest extends TestBase implements BridiTestData, ParserOutputTestData { +class CreateBridisFromParserOutputTest extends TestBase + implements BridiTestData, ParserOutputTestData { @InjectMocks CreateBridisFromParserOutputService createBridisFromParserOutput; @Test - @DisplayName("creates a list of bridis from the output of the parser\n" + " - does not save them") + @DisplayName("creates a list of bridis from the output of the parser\n" + + " - does not save them") void test() { - Set expected = Set.of(THING_GENERATED, IS_A_NONSAVED, SUMTI, SUMTI_IS_A_THING_GENERATED); - Set actual = - createBridisFromParserOutput.apply(OUTPUT_SUMTI_IS_A_THING).collect(Collectors.toSet()); + Set expected = Set.of(THING_GENERATED, IS_A_NONSAVED, SUMTI, + SUMTI_IS_A_THING_GENERATED); + Set actual = createBridisFromParserOutput + .apply(OUTPUT_SUMTI_IS_A_THING).collect(Collectors.toSet()); TestUtil.diffCollections(expected, actual); assertEquals(expected, actual); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java index 17005c8..b4e5df3 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java @@ -25,13 +25,15 @@ import io.github.magwas.inez.TestConfig; import io.github.magwas.inez.functions.Save; import io.github.magwas.inez.osgi.SpringBootBundleActivator; +import io.github.magwas.inez.parse.InputTestData; import io.github.magwas.runtime.LogUtil; import io.github.magwas.testing.TestUtil; @Tag("end-to-end") @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestConfig.class) -class QueryProcessorEndToEndTest implements BridiTestData { +class QueryProcessorEndToEndTest + implements QueryProcessorTestData, InputTestData, BridiTestData { @Autowired InezImpl inez; @@ -40,7 +42,7 @@ class QueryProcessorEndToEndTest implements BridiTestData { void setUp() throws IOException { ServiceReference sr = mock(ServiceReference.class); BundleContext ctx = mock(BundleContext.class); - when((ServiceReference) ctx.getServiceReference("io.github.magwas.inez.functions.Save")) + when((ServiceReference) ctx.getServiceReference(SAVE_CLASS_NAME)) .thenReturn(sr); when(ctx.getService(sr)).thenReturn(new Save()); SpringBootBundleActivator.bundleContext = ctx; @@ -50,29 +52,31 @@ void setUp() throws IOException { @Test void test1() { inez.create(TEST_TEXT).peek(x -> LogUtil.debug("created:" + x)).toList(); - assertEquals(List.of(ALICE), inez.findAllByRepresentation(ALICE_REPR).toList()); + assertEquals(List.of(ALICE), + inez.findAllByRepresentation(ALICE_REPR).toList()); assertQuery(Set.of(ALICE_REPR), ALICE_REPR); assertQuery(Set.of(ALICE_EATS_BANANA_REPR), ALICE_EATS_BANANA_REPR); - assertQuery( - Set.of(ALICE_EATS_BANANA_REPR, BOB_EATS_BANANA_REPR, CECILE_EATS_BANANA_REPR), - "{$?} {{eats} {banana}}"); - assertQuery(Set.of(CECILE_EATS_BANANA_REPR, CECILE_LOOKS_AT_BANANA_REPR), "{cecile} {{$?} {banana}}"); - assertQuery(Set.of(ALICE_EATS_BANANA_REPR, ALICE_EATS_CHIPS_REPR), "{alice} {{eats} {$?}}"); - assertQuery(Set.of("putty"), "doSave {" + "putty" + "}"); - assertEquals(1, inez.findAllByRepresentation("putty").count()); - List putty = inez.findAllByRepresentation("putty").toList(); - assertQuery( - Set.of("osgi", "bitch", "{0} is a {1}", "{osgi} is a {bitch}"), - "doSave {" + "{osgi} is a {bitch}" + "}"); - assertEquals(1, inez.findAllByRepresentation("osgi").count()); - assertEquals(1, inez.findAllByRepresentation("bitch").count()); + assertQuery(Set.of(ALICE_EATS_BANANA_REPR, BOB_EATS_BANANA_REPR, + CECILE_EATS_BANANA_REPR), WHO_EATS_BANANA_INPUT); + assertQuery(Set.of(CECILE_EATS_BANANA_REPR, CECILE_LOOKS_AT_BANANA_REPR), + CECILE_WHAT_BANANA_INPUT); + assertQuery(Set.of(ALICE_EATS_BANANA_REPR, ALICE_EATS_CHIPS_REPR), + ALICE_EATS_WHAT_INPUT); + assertQuery(Set.of(PUTTY_REPR), DO_SAVE_PUTTY_INPUT); + assertEquals(1, inez.findAllByRepresentation(PUTTY_REPR).count()); + List putty = inez.findAllByRepresentation(PUTTY_REPR).toList(); + assertQuery(Set.of(OSGI_REPR, BITCH_REPR, IS_A_REPR, OSGI_IS_A_BITCH_REPR), + DO_SAVE_OSGI_IS_A_BITCH_INPUT); + assertEquals(1, inez.findAllByRepresentation(OSGI_REPR).count()); + assertEquals(1, inez.findAllByRepresentation(BITCH_REPR).count()); assertEquals(1, putty.size()); } - private Set assertQuery(final Set expected, final String query) { + private Set assertQuery(final Set expected, + final String query) { Set result = inez.query(query).collect(Collectors.toSet()); - Set actual = - result.stream().map(bridi -> bridi.representation()).collect(Collectors.toSet()); + Set actual = result.stream().map(bridi -> bridi.representation()) + .collect(Collectors.toSet()); if (!expected.equals(actual)) { System.out.println("actual:"); actual.forEach(System.out::println); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java new file mode 100644 index 0000000..c9793f6 --- /dev/null +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java @@ -0,0 +1,14 @@ +package io.github.magwas.inez.query; + +import io.github.magwas.inez.parse.RepresentationTestData; + +public interface QueryProcessorTestData extends RepresentationTestData { + String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR + "\n" + + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA_REPR + "\n" + + ALICE_EATS_CHIPS_REPR + "\n" + BOB_EATS_BANANA_REPR + "\n" + + BOB_EATS_CHIPS_REPR + "\n" + CECILE_EATS_BANANA_REPR + "\n" + + CECILE_LOOKS_AT_BANANA_REPR + "\n" + SUMTI_IS_A_THING_REPR + "\n" + + TAUTOLOGY_GENERATED_REPR; + + String SAVE_CLASS_NAME = "io.github.magwas.inez.functions.Save"; +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java index 5198f80..5a3c197 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java @@ -12,11 +12,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; -import io.github.magwas.inez.parse.BridiFieldTestData; +import io.github.magwas.inez.parse.IdTestData; import io.github.magwas.inez.storage.model.BridiReference; import io.github.magwas.testing.TestBase; -class AddReferencesServiceTest extends TestBase implements BridiFieldTestData { +class AddReferencesServiceTest extends TestBase implements IdTestData { @InjectMocks AddReferencesService addReferences; @@ -39,8 +39,10 @@ void test1() { @DisplayName("for each reference adds an entry to the bridireferencerepository") void test2() { addReferences.apply(ALICE_ID, List.of(IS_A_ID, SUMTI_ID)); - ArgumentCaptor argument = ArgumentCaptor.forClass(BridiReference.class); - verify(addReferences.bridiReferenceRepository, times(2)).save(argument.capture()); + ArgumentCaptor argument = ArgumentCaptor + .forClass(BridiReference.class); + verify(addReferences.bridiReferenceRepository, times(2)) + .save(argument.capture()); List values = argument.getAllValues(); assertEquals(ALICE_ID, values.get(0).bridiId()); assertEquals(ALICE_ID, values.get(1).bridiId()); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java index 6a251a1..62c82c8 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java @@ -7,10 +7,12 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; +import io.github.magwas.inez.parse.ReferenceTestData; import io.github.magwas.inez.storage.model.BridiReferenceTestData; import io.github.magwas.testing.TestBase; -class AddReferencesTest extends TestBase implements BridiReferenceTestData { +class AddReferencesTest extends TestBase + implements BridiReferenceTestData, ReferenceTestData { @InjectMocks AddReferencesService addReferences; @@ -18,8 +20,8 @@ class AddReferencesTest extends TestBase implements BridiReferenceTestData { @DisplayName("adds all the references of the bridi to the repository") void test() { addReferences.apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REFERENCES); - SUMTI_IS_A_THING_REFERENCELIST.forEach( - x -> verify(addReferences.bridiReferenceRepository).save(x)); + SUMTI_IS_A_THING_REFERENCELIST + .forEach(x -> verify(addReferences.bridiReferenceRepository).save(x)); } @Test diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java index 800bafa..b570d4c 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java @@ -17,13 +17,14 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.InezImpl; import io.github.magwas.inez.TestConfig; +import io.github.magwas.inez.query.QueryProcessorTestData; import io.github.magwas.runtime.LogUtil; import io.github.magwas.testing.TestUtil; @Tag("end-to-end") @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestConfig.class) -class BridiStoreEndToEndTest implements BridiTestData { +class BridiStoreEndToEndTest implements QueryProcessorTestData, BridiTestData { @Autowired InezImpl inez; @@ -31,25 +32,29 @@ class BridiStoreEndToEndTest implements BridiTestData { @Test void test() { inez.create(TEST_TEXT).toArray(); - assertEquals(List.of(ALICE), inez.findAllByRepresentation("alice").toList()); + assertEquals(List.of(ALICE), + inez.findAllByRepresentation("alice").toList()); inez.save(Set.of(GO1, GO2)); inez.findAllByRepresentation(GO_REPR).forEach(x -> LogUtil.debug("go", x)); String CECILE_EATS_BANANA_REPR = "{cecile} {{eats} {banana}}"; String CECILE_LOOKS_AT_BANANA_REPR = "{cecile} {{looks at} {banana}}"; - Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, inez.query(CECILE_EATS_BANANA_REPR)); - Bridi ceclie_looks_at_banana = - assertGotTheBridi(CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); + Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, + inez.query(CECILE_EATS_BANANA_REPR)); + Bridi ceclie_looks_at_banana = assertGotTheBridi( + CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); TestUtil.assertStreamEquals( - Set.of(cecile_eats_banana, ceclie_looks_at_banana), inez.query("{cecile} {{$?} {banana}}")); + Set.of(cecile_eats_banana, ceclie_looks_at_banana), + inez.query("{cecile} {{$?} {banana}}")); - Bridi looks_at_banana = - inez.findById(ceclie_looks_at_banana.references().get(2)).get(); + Bridi looks_at_banana = inez + .findById(ceclie_looks_at_banana.references().get(2)).get(); Bridi looks_at = inez.findById(looks_at_banana.references().get(1)).get(); assertEquals("looks at", looks_at.representation()); } - private Bridi assertGotTheBridi(final String expected, final Stream actual) { + private Bridi assertGotTheBridi(final String expected, + final Stream actual) { List actualList = actual.toList(); assertEquals(1, actualList.size()); Bridi bridi = actualList.get(0); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java index 250d5a9..3357ff9 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java @@ -9,17 +9,17 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; -import io.github.magwas.inez.parse.BridiFieldTestData; +import io.github.magwas.inez.parse.IdTestData; import io.github.magwas.testing.TestBase; -class FindAllIdByRepresentationTest extends TestBase implements BridiFieldTestData { +class FindAllIdByRepresentationTest extends TestBase implements IdTestData { @InjectMocks FindAllIdByRepresentationService findAllIdByRepresentation; @Test @DisplayName("returns the ids of all the sumties with the given representation") void test() { - assertEquals( - Set.of(GO_ID, GO2_ID), findAllIdByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); + assertEquals(Set.of(GO_ID, GO2_ID), + findAllIdByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java index 2e8dc9f..6acf88c 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java @@ -5,20 +5,23 @@ import java.util.stream.Stream; -import io.github.magwas.inez.parse.BridiFieldTestData; +import io.github.magwas.inez.parse.IdTestData; -public class GetBridiIdBySelbriAndSumtiIdsServiceStub implements BridiFieldTestData { +public class GetBridiIdBySelbriAndSumtiIdsServiceStub implements IdTestData { public static GetBridiIdBySelbriAndSumtiIdsService stub() { - GetBridiIdBySelbriAndSumtiIdsService mock = mock(GetBridiIdBySelbriAndSumtiIdsService.class); - when(mock.apply(IS_A_ID, THING_ID, 1)).thenAnswer((args) -> Stream.of(TAUTOLOGY_ID, THING_IS_A_SUMTI_ID)); - when(mock.apply(IS_A_ID, THING_ID, 2)) - .thenAnswer((args) -> Stream.of( - TAUTOLOGY_ID, SUMTI_IS_A_THING_IS_A_THING_ID, SUMTI_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_ID)); - when(mock.apply(IS_A_ID, IS_A_ID, 0)) - .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_ID)); + GetBridiIdBySelbriAndSumtiIdsService mock = mock( + GetBridiIdBySelbriAndSumtiIdsService.class); + when(mock.apply(IS_A_ID, THING_ID, 1)) + .thenAnswer((args) -> Stream.of(TAUTOLOGY_ID, THING_IS_A_SUMTI_ID)); + when(mock.apply(IS_A_ID, THING_ID, 2)).thenAnswer( + (args) -> Stream.of(TAUTOLOGY_ID, SUMTI_IS_A_THING_IS_A_THING_ID, + SUMTI_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_ID)); + when(mock.apply(IS_A_ID, IS_A_ID, 0)).thenAnswer((args) -> Stream + .of(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_ID)); when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_IS_A_THING_ID, 1)) .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_IS_A_THING_ID)); - when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_ID, 1)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); + when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_ID, 1)) + .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); when(mock.apply(IS_A_ID, GOD_ID, 2)).thenAnswer((args) -> Stream.of()); return mock; diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java index 651e96a..76b1263 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java @@ -2,41 +2,51 @@ import java.util.List; -import io.github.magwas.inez.parse.BridiFieldTestData; +import io.github.magwas.inez.parse.IdTestData; -public interface BridiReferenceTestData extends BridiFieldTestData { +public interface BridiReferenceTestData extends IdTestData { String ID = "id:"; - BridiReference TAUTOLOGY_REFERENCE_0 = new BridiReference(TAUTOLOGY_ID + 0, TAUTOLOGY_ID, IS_A_ID, 0, IS_A_ID); - BridiReference TAUTOLOGY_REFERENCE_1 = new BridiReference(TAUTOLOGY_ID + 1, TAUTOLOGY_ID, IS_A_ID, 1, THING_ID); - BridiReference TAUTOLOGY_REFERENCE_2 = new BridiReference(TAUTOLOGY_ID + 2, TAUTOLOGY_ID, IS_A_ID, 2, THING_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_0 = - new BridiReference(ID + SUMTI_IS_A_THING_ID + 0, SUMTI_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_1 = - new BridiReference(ID + SUMTI_IS_A_THING_ID + 1, SUMTI_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_2 = - new BridiReference(ID + SUMTI_IS_A_THING_ID + 2, SUMTI_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - List SUMTI_IS_A_THING_REFERENCELIST = - List.of(SUMTI_IS_A_THING_REFERENCE_0, SUMTI_IS_A_THING_REFERENCE_1, SUMTI_IS_A_THING_REFERENCE_2); - BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_0 = - new BridiReference(SUMTI_IS_A_THING_IS_A_THING_ID + 0, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); + BridiReference TAUTOLOGY_REFERENCE_0 = new BridiReference(TAUTOLOGY_ID + 0, + TAUTOLOGY_ID, IS_A_ID, 0, IS_A_ID); + BridiReference TAUTOLOGY_REFERENCE_1 = new BridiReference(TAUTOLOGY_ID + 1, + TAUTOLOGY_ID, IS_A_ID, 1, THING_ID); + BridiReference TAUTOLOGY_REFERENCE_2 = new BridiReference(TAUTOLOGY_ID + 2, + TAUTOLOGY_ID, IS_A_ID, 2, THING_ID); + BridiReference SUMTI_IS_A_THING_REFERENCE_0 = new BridiReference( + ID + SUMTI_IS_A_THING_ID + 0, SUMTI_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); + BridiReference SUMTI_IS_A_THING_REFERENCE_1 = new BridiReference( + ID + SUMTI_IS_A_THING_ID + 1, SUMTI_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); + BridiReference SUMTI_IS_A_THING_REFERENCE_2 = new BridiReference( + ID + SUMTI_IS_A_THING_ID + 2, SUMTI_IS_A_THING_ID, IS_A_ID, 2, THING_ID); + List SUMTI_IS_A_THING_REFERENCELIST = List.of( + SUMTI_IS_A_THING_REFERENCE_0, SUMTI_IS_A_THING_REFERENCE_1, + SUMTI_IS_A_THING_REFERENCE_2); + BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_0 = new BridiReference( + SUMTI_IS_A_THING_IS_A_THING_ID + 0, SUMTI_IS_A_THING_IS_A_THING_ID, + IS_A_ID, 0, IS_A_ID); BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_1 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 1, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); + SUMTI_IS_A_THING_IS_A_THING_ID + 1, SUMTI_IS_A_THING_IS_A_THING_ID, + IS_A_ID, 1, SUMTI_ID); BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_2 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 2, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_0 = - new BridiReference(TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, IS_A_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_1 = - new BridiReference(TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, THING_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_2 = - new BridiReference(TAUTOLOGY_IS_A_THING_ID + 2, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_0 = - new BridiReference(THING_IS_A_SUMTI_ID + 0, THING_IS_A_SUMTI_ID, IS_A_ID, 0, IS_A_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_1 = - new BridiReference(THING_IS_A_SUMTI_ID + 1, THING_IS_A_SUMTI_ID, IS_A_ID, 1, THING_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_2 = - new BridiReference(THING_IS_A_SUMTI_ID + 2, THING_IS_A_SUMTI_ID, IS_A_ID, 2, SUMTI_ID); + SUMTI_IS_A_THING_IS_A_THING_ID + 2, SUMTI_IS_A_THING_IS_A_THING_ID, + IS_A_ID, 2, THING_ID); + BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_0 = new BridiReference( + TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, + IS_A_ID); + BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_1 = new BridiReference( + TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, + THING_ID); + BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_2 = new BridiReference( + TAUTOLOGY_IS_A_THING_ID + 2, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 2, + THING_ID); + BridiReference THING_IS_A_SUMTI_REFERENCE_0 = new BridiReference( + THING_IS_A_SUMTI_ID + 0, THING_IS_A_SUMTI_ID, IS_A_ID, 0, IS_A_ID); + BridiReference THING_IS_A_SUMTI_REFERENCE_1 = new BridiReference( + THING_IS_A_SUMTI_ID + 1, THING_IS_A_SUMTI_ID, IS_A_ID, 1, THING_ID); + BridiReference THING_IS_A_SUMTI_REFERENCE_2 = new BridiReference( + THING_IS_A_SUMTI_ID + 2, THING_IS_A_SUMTI_ID, IS_A_ID, 2, SUMTI_ID); - BridiReference STUFF_COULDBE_THING_REFERENCE_2 = - new BridiReference(STUFF_ID + 2, COULDBE_ID, COULDBE_ID, 2, THING_ID); + BridiReference STUFF_COULDBE_THING_REFERENCE_2 = new BridiReference( + STUFF_ID + 2, COULDBE_ID, COULDBE_ID, 2, THING_ID); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java index f9dd904..fe996b6 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java @@ -1,12 +1,14 @@ package io.github.magwas.inez.storage.model; -import io.github.magwas.inez.parse.BridiFieldTestData; +import io.github.magwas.inez.parse.IdTestData; -public interface SumtiTestData extends BridiFieldTestData { +public interface SumtiTestData extends IdTestData { Sumti THING_SUMTI = new Sumti(THING_ID, THING_REPR); - Sumti SUMTI_IS_A_THING_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR); - Sumti SUMTI_IS_A_THING_CHANGED_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR); + Sumti SUMTI_IS_A_THING_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, + SUMTI_IS_A_THING_REPR); + Sumti SUMTI_IS_A_THING_CHANGED_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, + SUMTI_IS_A_THING_CHANGED_REPR); Sumti GO1_SUMTI = new Sumti(GO_ID, GO_REPR); Sumti GO2_SUMTI = new Sumti(GO2_ID, GO_REPR); } diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java deleted file mode 100644 index b47206c..0000000 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGenerator.java +++ /dev/null @@ -1,56 +0,0 @@ -package io.github.magwas.inez.parse; - -import java.text.MessageFormat; -import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Stream; - -import io.github.magwas.runtime.GeneratorUtil; - -public class BridiFieldTestDataGenerator - implements Supplier, BridiFieldTestDataGeneratorConstants { - - @Override - public StringBuilder get() { - List definedIdlist = GeneratorUtil.linesOf(IDS) - .map(s -> s.split(",")[0]).toList(); - Stream generatedIds = GeneratorUtil.linesOf(REPRESENTATIONS) - .map(s -> s.split(",")[0]).filter(x -> !definedIdlist.contains(x)); - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, """ - import java.util.List; - """); - GeneratorUtil.mapToCode(REPRESENTATIONS, - GeneratorUtil.stringConstant("REPR"), builder); - builder.append("\n"); - GeneratorUtil.mapToCode(generatedIds, line -> { - String[] parts = line.split(",", 2); - return MessageFormat.format(""" - String {0}_ID = IdUtil.createID({0}_REPR); - """, parts[0].trim()); - }, builder); - GeneratorUtil.mapToCode(IDS, GeneratorUtil.stringConstant("ID"), builder); - builder.append("\n"); - GeneratorUtil.mapToCode(INPUTS, GeneratorUtil.stringConstant("INPUT"), - builder); - builder.append("\n"); - GeneratorUtil.mapToCode(IDREFERENCES, line -> { - String[] parts = line.split(",", 2); - return MessageFormat.format(""" - String {0}_REFERENCE = "@{0}"; - """, parts[0].trim()); - }, builder); - builder.append("\n"); - GeneratorUtil.mapToCode(REFERENCES, line -> { - String[] parts = line.split(",", 2); - return MessageFormat.format(""" - List {0}_REFERENCES = List.of({1}); - """, parts[0].trim(), parts[1]); - }, builder); - builder.append("\n"); - builder.append(EXTRA); - builder.append("}\n"); - - return builder; - } -} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java new file mode 100644 index 0000000..fdd091f --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java @@ -0,0 +1,32 @@ +package io.github.magwas.inez.parse; + +import java.text.MessageFormat; +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Stream; + +import io.github.magwas.runtime.GeneratorUtil; + +public class IdTestDataGenerator + implements Supplier, TestDataGeneratorConstants { + + @Override + public StringBuilder get() { + List definedIdlist = GeneratorUtil.linesOf(IDS) + .map(s -> s.split(",")[0]).toList(); + Stream generatedIds = GeneratorUtil.linesOf(REPRESENTATIONS) + .map(s -> s.split(",")[0]).filter(x -> !definedIdlist.contains(x)); + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, "", "RepresentationTestData"); + GeneratorUtil.mapToCode(generatedIds, line -> { + String[] parts = line.split(",", 2); + return MessageFormat.format(""" + String {0}_ID = IdUtil.createID({0}_REPR); + """, parts[0].trim()); + }, builder); + GeneratorUtil.mapToCode(IDS, GeneratorUtil.stringConstant("ID"), builder); + builder.append("}\n"); + + return builder; + } +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java new file mode 100644 index 0000000..c64df16 --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java @@ -0,0 +1,20 @@ +package io.github.magwas.inez.parse; + +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; + +public class InputTestDataGenerator + implements Supplier, TestDataGeneratorConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, ""); + GeneratorUtil.mapToCode(INPUTS, GeneratorUtil.stringConstant("INPUT"), + builder); + builder.append("}\n"); + + return builder; + } +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java new file mode 100644 index 0000000..6bde399 --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java @@ -0,0 +1,33 @@ +package io.github.magwas.inez.parse; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; + +public class ParserOutputTestDataGenerator + implements Supplier, TestDataGeneratorConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, """ + import java.util.Map; + """, "InputTestData", "ReferenceTestData"); + GeneratorUtil.linesOf(OUTPUTS).map(line -> { + String[] parts = line.split(",", 3); + String name = parts[0]; + String top = parts[1]; + String map = ""; + if (parts.length == 3) + map = parts[1] + "," + parts[2]; + + return MessageFormat.format( + "\tParserOutput OUTPUT_{0} = new ParserOutput({1},Map.of({2}));\n", + name, top, map); + }).forEach(builder::append); + builder.append("}\n"); + return builder; + } + +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java new file mode 100644 index 0000000..d1bb982 --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java @@ -0,0 +1,28 @@ +package io.github.magwas.inez.parse; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; + +public class ReferenceTestDataGenerator + implements Supplier, TestDataGeneratorConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, """ + import java.util.List; + """, "IdTestData", "InputTestData"); + builder.append("\n"); + GeneratorUtil.mapToCode(REFERENCES, line -> { + String[] parts = line.split(",", 2); + return MessageFormat.format(""" + List {0}_REFERENCES = List.of({1}); + """, parts[0].trim(), parts[1]); + }, builder); + builder.append("}\n"); + + return builder; + } +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java new file mode 100644 index 0000000..e4168de --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java @@ -0,0 +1,26 @@ +package io.github.magwas.inez.parse; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; + +public class RepresentationTestDataGenerator + implements Supplier, TestDataGeneratorConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = new StringBuilder(); + GeneratorUtil.testDataBoilerPlate(builder, ""); + GeneratorUtil.mapToCode(REPRESENTATIONS, + GeneratorUtil.stringConstant("REPR"), builder); + GeneratorUtil.mapToCode(IDREFERENCES, line -> { + String[] parts = line.split(",", 2); + return MessageFormat.format(""" + String {0}_REFERENCE = "@{0}"; + """, parts[0].trim()); + }, builder); + builder.append("}\n"); + return builder; + } +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java similarity index 81% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java rename to inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java index 8092f54..f3159f7 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/BridiFieldTestDataGeneratorConstants.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java @@ -2,12 +2,13 @@ import io.github.magwas.testing.TestUtil; -public interface BridiFieldTestDataGeneratorConstants { +public interface TestDataGeneratorConstants { String REPRESENTATIONS = TestUtil.loadResourceAsString("representations"); String IDS = TestUtil.loadResourceAsString("ids"); String EXTRA = TestUtil.loadResourceAsString("extra"); String IDREFERENCES = TestUtil.loadResourceAsString("idreferences"); String INPUTS = TestUtil.loadResourceAsString("inputs"); String REFERENCES = TestUtil.loadResourceAsString("references"); + String OUTPUTS = TestUtil.loadResourceAsString("outputs"); } diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java index 82e2975..f85fdc7 100644 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java +++ b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java @@ -67,7 +67,7 @@ void test1() { @DisplayName("literal is parsed correctly") void test6() { assertEquals( - OUTPOUT_WITH_LITERAL, + OUTPUT_WITH_LITERAL, parseText.apply(WITH_LITERAL_INPUT).toList().get(0)); } @@ -75,7 +75,7 @@ void test6() { @DisplayName("multiline is working") void test7() { assertEquals( - List.of(OUTPOUT_WITH_LITERAL, OUTPUT_TAUTOLOGY), + List.of(OUTPUT_WITH_LITERAL, OUTPUT_TAUTOLOGY), parseText .apply(WITH_LITERAL_INPUT + "\n" + TAUTOLOGY_GENERATED_REPR) .toList()); diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java deleted file mode 100644 index 99441dc..0000000 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParserOutputTestData.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.github.magwas.inez.parse; - -import java.util.List; -import java.util.Map; - -public interface ParserOutputTestData extends BridiFieldTestData { - - ParserOutput OUTPOUT_WITH_LITERAL = - new ParserOutput(WITH_LITERAL_INPUT, Map.of(WITH_LITERAL_INPUT, INPUT_WITH_LITERAL_REFS_REFERENCES)); - - ParserOutput OUTPUT_NONEXISTING = new ParserOutput(NONEXISTENT_REFERENCE, Map.of()); - ParserOutput OUTPUT_THING = new ParserOutput(THING_REPR, Map.of()); - ParserOutput OUTPUT_GO = new ParserOutput(GO_REPR, Map.of()); - ParserOutput OUTPUT_GO1 = new ParserOutput(GO1_REFERENCE, Map.of()); - ParserOutput OUTPUT_NONEXISTENT_REFERENCE = new ParserOutput(NONEXISTENT_REFERENCE, Map.of()); - ParserOutput OUTPUT_ANY = new ParserOutput(ParserConstants.QUERY_BRIDI_ID, Map.of()); - - ParserOutput OUTPUT_SUMTI_IS_A_THING = new ParserOutput( - SUMTI_IS_A_THING_REPR, Map.of(SUMTI_IS_A_THING_REPR, List.of(IS_A_REPR, SUMTI_REPR, THING_REPR))); - ParserOutput OUTPUT_TAUTOLOGY = new ParserOutput( - TAUTOLOGY_GENERATED_REPR, Map.of(TAUTOLOGY_GENERATED_REPR, List.of(IS_A_REPR, THING_REPR, THING_REPR))); - ParserOutput OUTPUT_SIMPLE = new ParserOutput( - SIMPLE_INPUT, Map.of(SIMPLE_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, THING_REPR))); - ParserOutput OUTPUT_ALL_ANY = new ParserOutput( - ALL_ANY_INPUT, - Map.of(ALL_ANY_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, ParserConstants.QUERY_BRIDI_ID))); - ParserOutput OUTPUT_NONMATCHING = new ParserOutput( - NONMATCHING_INPUT, Map.of(NONMATCHING_INPUT, List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, GOD_REPR))); - ParserOutput OUTPUT_RECURSIVE = new ParserOutput( - RECURSIVE_INPUT, - Map.of( - RECURSIVE_INPUT, - List.of(IS_A_REPR, SIMPLE_INPUT, THING_REPR), - TAUTOLOGY_GENERATED_REPR, - List.of(IS_A_REPR, THING_REPR, THING_REPR), - SIMPLE_INPUT, - List.of(IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, THING_REPR))); -} diff --git a/inez.parser.tests/src/main/resources/extra b/inez.parser.tests/src/main/resources/extra deleted file mode 100644 index 1eb153c..0000000 --- a/inez.parser.tests/src/main/resources/extra +++ /dev/null @@ -1,7 +0,0 @@ - - String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR + "\n" - + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA_REPR + "\n" - + ALICE_EATS_CHIPS_REPR + "\n" + BOB_EATS_BANANA_REPR + "\n" + BOB_EATS_CHIPS_REPR + "\n" - + CECILE_EATS_BANANA_REPR + "\n" + CECILE_LOOKS_AT_BANANA_REPR + "\n" - + SUMTI_IS_A_THING_REPR + "\n" + TAUTOLOGY_GENERATED_REPR; - \ No newline at end of file diff --git a/inez.parser.tests/src/main/resources/ids b/inez.parser.tests/src/main/resources/ids index e3488c6..784e1b7 100644 --- a/inez.parser.tests/src/main/resources/ids +++ b/inez.parser.tests/src/main/resources/ids @@ -4,4 +4,7 @@ STUFF,stuff GO,GO1 GO2,go2 THING_IS_A_SUMTI,not tautology -TAUTOLOGY,tautology \ No newline at end of file +TAUTOLOGY,tautology +CONTAINS,CONTAINS +ROOT,ROOT +CONTAINER,CONTAINER diff --git a/inez.parser.tests/src/main/resources/inputs b/inez.parser.tests/src/main/resources/inputs index be2ca06..b655fcc 100644 --- a/inez.parser.tests/src/main/resources/inputs +++ b/inez.parser.tests/src/main/resources/inputs @@ -6,4 +6,9 @@ NONMATCHING,{$?} is a {god} QUERY,{{$?} is a {THING}} is a {THING} FROM_UNKNOWN_PARSER,INPUT_FROM_UNKNOWN_PARSER WITH_LITERAL,{My folder} contains {[{0} is a {1}]} -RECURSIVE,{{$?} is a {THING}} is a {THING} \ No newline at end of file +RECURSIVE,{{$?} is a {THING}} is a {THING} +DO_SAVE_OSGI_IS_A_BITCH,doSave {{osgi} is a {bitch}} +ALICE_EATS_WHAT,{alice} {{eats} {$?}} +CECILE_WHAT_BANANA,{cecile} {{$?} {banana}} +WHO_EATS_BANANA,{$?} {{eats} {banana}} +DO_SAVE_PUTTY,doSave {putty} \ No newline at end of file diff --git a/inez.parser.tests/src/main/resources/outputs b/inez.parser.tests/src/main/resources/outputs new file mode 100644 index 0000000..773cb20 --- /dev/null +++ b/inez.parser.tests/src/main/resources/outputs @@ -0,0 +1,13 @@ +WITH_LITERAL,WITH_LITERAL_INPUT,INPUT_WITH_LITERAL_REFERENCES +NONEXISTING,NONEXISTENT_REFERENCE +THING,THING_REPR +GO,GO_REPR +GO1,GO1_REFERENCE +NONEXISTENT_REFERENCE,NONEXISTENT_REFERENCE +ANY,ParserConstants.QUERY_BRIDI_ID +SUMTI_IS_A_THING,SUMTI_IS_A_THING_REPR,SUMTI_IS_A_THING_REPR_REFERENCES +TAUTOLOGY,TAUTOLOGY_GENERATED_REPR,TAUTOLOGY_REPR_REFERENCES +SIMPLE,SIMPLE_INPUT,SIMPLE_INPUT_REPR_REFERENCES +ALL_ANY,ALL_ANY_INPUT,ALL_ANY_INPUT_REPR_REFERENCES +NONMATCHING,NONMATCHING_INPUT,NONMATCHING_INPUT_REFERENCES +RECURSIVE,RECURSIVE_INPUT,RECURSIVE_INPUT_REFERENCES,TAUTOLOGY_GENERATED_REPR,TAUTOLOGY_REPR_REFERENCES,SIMPLE_INPUT,SIMPLE_INPUT_REPR_REFERENCES diff --git a/inez.parser.tests/src/main/resources/references b/inez.parser.tests/src/main/resources/references index a52c3f9..dd05ab4 100644 --- a/inez.parser.tests/src/main/resources/references +++ b/inez.parser.tests/src/main/resources/references @@ -1,8 +1,15 @@ SUMTI_IS_A_THING_IS_A_THING,IS_A_ID, SUMTI_IS_A_THING_ID, THING_ID SUMTI_IS_A_THING_GENERATED,IdUtil.createID(IS_A_REPR), SUMTI_ID, IdUtil.createID(THING_REPR) TAUTOLOGY_IS_A_THING,IS_A_ID, TAUTOLOGY_ID, THING_REPR +TAUTOLOGY_REPR,IS_A_REPR, THING_REPR, THING_REPR BAD_BRIDI,IS_A_REPR, SUMTI_IS_A_THING_ID, NONEXISTENT_REPR SUMTI_IS_A_THING_CHANGED,IS_A_ID, THING_ID, THING_ID SUMTI_IS_A_THING,IS_A_ID, SUMTI_ID, THING_ID +SUMTI_IS_A_THING_REPR,IS_A_REPR,SUMTI_REPR,THING_REPR THING_IS_A_SUMTI,IS_A_ID, THING_ID, SUMTI_ID -INPUT_WITH_LITERAL_REFS,"{0} contains {1}", "My folder", "{0} is a {1}" \ No newline at end of file +INPUT_WITH_LITERAL,"{0} contains {1}", "My folder", "{0} is a {1}" +CONTAINS_ELEMENT,CONTAINS_ID, MY_MODEL_ID,ALICE_ID +SIMPLE_INPUT_REPR,IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, THING_REPR +ALL_ANY_INPUT_REPR,IS_A_REPR, ParserConstants.QUERY_BRIDI_ID,ParserConstants.QUERY_BRIDI_ID +NONMATCHING_INPUT,IS_A_REPR, ParserConstants.QUERY_BRIDI_ID, GOD_REPR +RECURSIVE_INPUT,IS_A_REPR, SIMPLE_INPUT, THING_REPR diff --git a/inez.parser.tests/src/main/resources/representations b/inez.parser.tests/src/main/resources/representations index 9c4752a..4e7cfcc 100644 --- a/inez.parser.tests/src/main/resources/representations +++ b/inez.parser.tests/src/main/resources/representations @@ -23,3 +23,17 @@ ALICE_EATS_CHIPS,{alice} {{eats} {chips}} ALICE_EATS_BANANA,{alice} {{eats} {banana}} SUMTI_IS_A_THING_CHANGED,{sumti} is a {THING} changed COULDBE,could be +PUTTY,putty +OSGI,osgi +BITCH,bitch +OSGI_IS_A_BITCH,{osgi} is a {bitch} +DOG,dog +ELEMENT_MODEL,elementModel +CONTAINS_ELEMENT,{my model} contains {alice} +MY_MODEL,my model +FOLDER,folder +HUMAN,human +ALICE_IS_A_HUMAN,{alice} is a {human} +HUMAN_IS_A_ANIMAL,{human} is a {animal} +DOG_IS_A_ANIMAL,{dog} is a {animal} +MY_MODEL_IS_A_FOLDER,{my model} is a {folder} From 54bb25e36abdedf0627b16e37a0a87db721adcc1 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 12 Oct 2025 10:18:34 +0200 Subject: [PATCH 03/11] some stuff is generated --- .../model/SumtiTestData2Generator.java | 6 +- .../io/github/magwas/inez/BridiTestData.java | 37 +++++----- .../element/BridiElementEndToEndTest.java | 22 +++--- .../inez/element/BridiElementTestData.java | 9 ++- .../CreateBridisFromParserOutputTest.java | 13 ++-- .../query/QueryProcessorEndToEndTest.java | 29 +++----- .../storage/AddReferencesServiceTest.java | 6 +- .../inez/storage/AddReferencesTest.java | 7 +- .../inez/storage/BridiStoreEndToEndTest.java | 20 +++--- .../FindAllIdByRepresentationTest.java | 4 +- ...BridiIdBySelbriAndSumtiIdsServiceStub.java | 19 +++--- .../storage/model/BridiReferenceTestData.java | 68 ++++++++----------- .../inez/storage/model/SumtiTestData.java | 6 +- inez.parser.tests/META-INF/MANIFEST.MF | 7 +- .../inez/parse/IdTestDataGenerator.java | 8 +-- .../inez/parse/InputTestDataGenerator.java | 7 +- .../parse/ParseTextServiceStubGenerator.java | 25 +++++++ .../parse/ParserOutputTestDataGenerator.java | 6 +- .../parse/ReferenceTestDataGenerator.java | 7 +- .../RepresentationTestDataGenerator.java | 7 +- .../parse/TestDataGeneratorConstants.java | 3 +- .../inez/parse/ParseTextServiceStub.java | 26 ------- .../src/main/resources/parse_text_stubdata | 12 ++++ inez.target/inez.target | 4 +- pom.xml | 4 +- 25 files changed, 166 insertions(+), 196 deletions(-) create mode 100644 inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java delete mode 100644 inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java create mode 100644 inez.parser.tests/src/main/resources/parse_text_stubdata diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java index 499a251..4c962e9 100644 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java @@ -10,11 +10,9 @@ public class SumtiTestData2Generator @Override public StringBuilder get() { - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, ""); + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""); GeneratorUtil.mapToCode(REPRESENTATIONS, GeneratorUtil.stringConstant("REPR"), builder); - builder.append("}\n"); - return builder; + return GeneratorUtil.testDataTail(builder); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java index e2e052d..52a5562 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java @@ -9,44 +9,39 @@ import io.github.magwas.inez.parse.ReferenceTestData; import io.github.magwas.inez.parse.RepresentationTestData; -public interface BridiTestData - extends RepresentationTestData, IdTestData, ReferenceTestData { +public interface BridiTestData extends RepresentationTestData, IdTestData, ReferenceTestData { Bridi ALICE = new Bridi(IdUtil.createID(ALICE_REPR), ALICE_REPR, List.of()); Bridi GO1 = new Bridi(GO_ID, GO_REPR, null); Bridi GO2 = new Bridi(GO2_ID, GO_REPR, null); - Bridi SUMTI_IS_A_THING_IS_A_THING = new Bridi(SUMTI_IS_A_THING_IS_A_THING_ID, + Bridi SUMTI_IS_A_THING_IS_A_THING = new Bridi( + SUMTI_IS_A_THING_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); - Bridi TAUTOLOGY_IS_A_THING = new Bridi(TAUTOLOGY_IS_A_THING_ID, - TAUTOLOGY_IS_A_THING_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); + Bridi TAUTOLOGY_IS_A_THING = + new Bridi(TAUTOLOGY_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); Bridi THING = new Bridi(THING_ID, THING_REPR, null); Bridi THING_CHANGED = new Bridi(THING_ID, "thung", null); - Bridi THING_GENERATED = new Bridi(IdUtil.createID(THING_REPR), THING_REPR, - null); + Bridi THING_GENERATED = new Bridi(IdUtil.createID(THING_REPR), THING_REPR, null); Bridi SUMTI = new Bridi(SUMTI_ID, SUMTI_REPR, null); Bridi NONEXISTENT = new Bridi(NONEXISTENT_ID, NONEXISTENT_REPR, null); Bridi BRIDI = new Bridi(BRIDI_ID, BRIDI_REPR, null); Bridi IS_A = new Bridi(IS_A_ID, IS_A_REPR, null); Bridi IS_A_NONSAVED = new Bridi(IdUtil.createID(IS_A_REPR), IS_A_REPR, null); - Bridi ANY = new Bridi(ParserConstants.QUERY_BRIDI_ID, - ParserConstants.QUERY_BRIDI_ID, null); + Bridi ANY = new Bridi(ParserConstants.QUERY_BRIDI_ID, ParserConstants.QUERY_BRIDI_ID, null); - Bridi SUMTI_IS_A_THING = new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, - SUMTI_IS_A_THING_REFERENCES); - Bridi SUMTI_IS_A_THING_GENERATED = new Bridi(SUMTI_IS_A_THING_ID, - SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_GENERATED_REFERENCES); - Bridi SUMTI_IS_A_THING_CHANGED = new Bridi(SUMTI_IS_A_THING_ID, - SUMTI_IS_A_THING_CHANGED_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); - Bridi TAUTOLOGY = new Bridi(TAUTOLOGY_ID, TAUTOLOGY_REPR, - SUMTI_IS_A_THING_CHANGED_REFERENCES); - Bridi THING_IS_A_SUMTI = new Bridi(THING_IS_A_SUMTI_ID, TAUTOLOGY_REPR, - THING_IS_A_SUMTI_REFERENCES); + Bridi SUMTI_IS_A_THING = new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_REFERENCES); + Bridi SUMTI_IS_A_THING_GENERATED = + new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_GENERATED_REFERENCES); + Bridi SUMTI_IS_A_THING_CHANGED = + new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); + Bridi TAUTOLOGY = new Bridi(TAUTOLOGY_ID, TAUTOLOGY_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); + Bridi THING_IS_A_SUMTI = new Bridi(THING_IS_A_SUMTI_ID, TAUTOLOGY_REPR, THING_IS_A_SUMTI_REFERENCES); Bridi GOD = new Bridi(GOD_ID, GOD_REPR, null); Bridi HUMAN = new Bridi(HUMAN_ID, HUMAN_REPR, null); Bridi MY_MODEL = new Bridi(MY_MODEL_ID, MY_MODEL_REPR, null); - Set SIMPLE_QUERY_OUTPUT = Set.of(TAUTOLOGY, - SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); + Set SIMPLE_QUERY_OUTPUT = + Set.of(TAUTOLOGY, SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java index 87e752b..abc24dd 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java @@ -46,8 +46,7 @@ class BridiElementEndToEndTest implements BridiTestData, BridiElementTestData { @BeforeEach void setUp() { sumtiRepository.findAll().forEach(x -> sumtiRepository.delete(x)); - bridiReferenceRepository.findAll() - .forEach(x -> bridiReferenceRepository.delete(x)); + bridiReferenceRepository.findAll().forEach(x -> bridiReferenceRepository.delete(x)); } @Test @@ -56,9 +55,10 @@ void test() throws IOException { assertSame(bridiElementSystemInitialization.inez, inez); bridiElementSystemInitialization.apply(); BridiElement elementModel = bridiElementFactory.apply(ELEMENT_MODEL_ID); - assertTrue(elementModel.getChildren() - .anyMatch(x -> x.getReferences().map(y -> y.id).toList() - .contains(ElementConstants.IS_FUNCTION_FOR_ID))); + assertTrue(elementModel + .getChildren() + .anyMatch( + x -> x.getReferences().map(y -> y.id).toList().contains(ElementConstants.IS_FUNCTION_FOR_ID))); BridiElement root = bridiElementFactory.apply(ROOT_ID); String rootXml = loadResourceAsString("root.xml"); String theXml = root.toXml(); @@ -71,7 +71,8 @@ void test() throws IOException { assertEquals(CONTAINS_ELEMENT_REPR, element.getRepresentation()); assertEquals(THING_ID, element.getType().id); - assertEquals(CONTAINS_ELEMENT_REFERENCES, + assertEquals( + CONTAINS_ELEMENT_REFERENCES, element.getReferences().map(x -> x.id).toList()); assertEquals(List.of(), element.getChildren().toList()); assertEquals(MY_MODEL_ID, element.getParent().id); @@ -82,8 +83,7 @@ void test() throws IOException { assertEquals(MY_MODEL_REPR, element.getRepresentation()); assertEquals(FOLDER_ID, element.getType().id); assertEquals(List.of(), element.getReferences().toList()); - assertEquals(MY_FOLDER_CHILDREN, - element.getChildren().map(x -> x.id).collect(Collectors.toSet())); + assertEquals(MY_FOLDER_CHILDREN, element.getChildren().map(x -> x.id).collect(Collectors.toSet())); assertEquals(ROOT_ID, element.getParent().id); String xml = loadResourceAsString("mymodel.xml"); assertEquals(xml, element.toXml()); @@ -92,11 +92,9 @@ void test() throws IOException { assertTrue(element.isInstance(THING_ID)); } - private String loadResourceAsString(final String definitionName) - throws IOException { + private String loadResourceAsString(final String definitionName) throws IOException { ClassLoader classloader = Thread.currentThread().getContextClassLoader(); - try (InputStream inputStream = classloader - .getResourceAsStream(definitionName)) { + try (InputStream inputStream = classloader.getResourceAsStream(definitionName)) { return new String(inputStream.readAllBytes()); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java index 5001990..436308e 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java @@ -6,7 +6,12 @@ public interface BridiElementTestData extends IdTestData { - Set MY_FOLDER_CHILDREN = Set.of(ALICE_ID, HUMAN_ID, DOG_ID, - MY_MODEL_IS_A_FOLDER_ID, DOG_IS_A_ANIMAL_ID, HUMAN_IS_A_ANIMAL_ID, + Set MY_FOLDER_CHILDREN = Set.of( + ALICE_ID, + HUMAN_ID, + DOG_ID, + MY_MODEL_IS_A_FOLDER_ID, + DOG_IS_A_ANIMAL_ID, + HUMAN_IS_A_ANIMAL_ID, ALICE_IS_A_HUMAN_ID); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java index c245fec..bf1cfd0 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java @@ -15,19 +15,16 @@ import io.github.magwas.testing.TestBase; import io.github.magwas.testing.TestUtil; -class CreateBridisFromParserOutputTest extends TestBase - implements BridiTestData, ParserOutputTestData { +class CreateBridisFromParserOutputTest extends TestBase implements BridiTestData, ParserOutputTestData { @InjectMocks CreateBridisFromParserOutputService createBridisFromParserOutput; @Test - @DisplayName("creates a list of bridis from the output of the parser\n" - + " - does not save them") + @DisplayName("creates a list of bridis from the output of the parser\n" + " - does not save them") void test() { - Set expected = Set.of(THING_GENERATED, IS_A_NONSAVED, SUMTI, - SUMTI_IS_A_THING_GENERATED); - Set actual = createBridisFromParserOutput - .apply(OUTPUT_SUMTI_IS_A_THING).collect(Collectors.toSet()); + Set expected = Set.of(THING_GENERATED, IS_A_NONSAVED, SUMTI, SUMTI_IS_A_THING_GENERATED); + Set actual = + createBridisFromParserOutput.apply(OUTPUT_SUMTI_IS_A_THING).collect(Collectors.toSet()); TestUtil.diffCollections(expected, actual); assertEquals(expected, actual); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java index b4e5df3..16e8f7c 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java @@ -32,8 +32,7 @@ @Tag("end-to-end") @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestConfig.class) -class QueryProcessorEndToEndTest - implements QueryProcessorTestData, InputTestData, BridiTestData { +class QueryProcessorEndToEndTest implements QueryProcessorTestData, InputTestData, BridiTestData { @Autowired InezImpl inez; @@ -42,8 +41,7 @@ class QueryProcessorEndToEndTest void setUp() throws IOException { ServiceReference sr = mock(ServiceReference.class); BundleContext ctx = mock(BundleContext.class); - when((ServiceReference) ctx.getServiceReference(SAVE_CLASS_NAME)) - .thenReturn(sr); + when((ServiceReference) ctx.getServiceReference(SAVE_CLASS_NAME)).thenReturn(sr); when(ctx.getService(sr)).thenReturn(new Save()); SpringBootBundleActivator.bundleContext = ctx; inez.initialize(); @@ -52,31 +50,26 @@ void setUp() throws IOException { @Test void test1() { inez.create(TEST_TEXT).peek(x -> LogUtil.debug("created:" + x)).toList(); - assertEquals(List.of(ALICE), - inez.findAllByRepresentation(ALICE_REPR).toList()); + assertEquals(List.of(ALICE), inez.findAllByRepresentation(ALICE_REPR).toList()); assertQuery(Set.of(ALICE_REPR), ALICE_REPR); assertQuery(Set.of(ALICE_EATS_BANANA_REPR), ALICE_EATS_BANANA_REPR); - assertQuery(Set.of(ALICE_EATS_BANANA_REPR, BOB_EATS_BANANA_REPR, - CECILE_EATS_BANANA_REPR), WHO_EATS_BANANA_INPUT); - assertQuery(Set.of(CECILE_EATS_BANANA_REPR, CECILE_LOOKS_AT_BANANA_REPR), - CECILE_WHAT_BANANA_INPUT); - assertQuery(Set.of(ALICE_EATS_BANANA_REPR, ALICE_EATS_CHIPS_REPR), - ALICE_EATS_WHAT_INPUT); + assertQuery( + Set.of(ALICE_EATS_BANANA_REPR, BOB_EATS_BANANA_REPR, CECILE_EATS_BANANA_REPR), WHO_EATS_BANANA_INPUT); + assertQuery(Set.of(CECILE_EATS_BANANA_REPR, CECILE_LOOKS_AT_BANANA_REPR), CECILE_WHAT_BANANA_INPUT); + assertQuery(Set.of(ALICE_EATS_BANANA_REPR, ALICE_EATS_CHIPS_REPR), ALICE_EATS_WHAT_INPUT); assertQuery(Set.of(PUTTY_REPR), DO_SAVE_PUTTY_INPUT); assertEquals(1, inez.findAllByRepresentation(PUTTY_REPR).count()); List putty = inez.findAllByRepresentation(PUTTY_REPR).toList(); - assertQuery(Set.of(OSGI_REPR, BITCH_REPR, IS_A_REPR, OSGI_IS_A_BITCH_REPR), - DO_SAVE_OSGI_IS_A_BITCH_INPUT); + assertQuery(Set.of(OSGI_REPR, BITCH_REPR, IS_A_REPR, OSGI_IS_A_BITCH_REPR), DO_SAVE_OSGI_IS_A_BITCH_INPUT); assertEquals(1, inez.findAllByRepresentation(OSGI_REPR).count()); assertEquals(1, inez.findAllByRepresentation(BITCH_REPR).count()); assertEquals(1, putty.size()); } - private Set assertQuery(final Set expected, - final String query) { + private Set assertQuery(final Set expected, final String query) { Set result = inez.query(query).collect(Collectors.toSet()); - Set actual = result.stream().map(bridi -> bridi.representation()) - .collect(Collectors.toSet()); + Set actual = + result.stream().map(bridi -> bridi.representation()).collect(Collectors.toSet()); if (!expected.equals(actual)) { System.out.println("actual:"); actual.forEach(System.out::println); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java index 5a3c197..e41f0c6 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java @@ -39,10 +39,8 @@ void test1() { @DisplayName("for each reference adds an entry to the bridireferencerepository") void test2() { addReferences.apply(ALICE_ID, List.of(IS_A_ID, SUMTI_ID)); - ArgumentCaptor argument = ArgumentCaptor - .forClass(BridiReference.class); - verify(addReferences.bridiReferenceRepository, times(2)) - .save(argument.capture()); + ArgumentCaptor argument = ArgumentCaptor.forClass(BridiReference.class); + verify(addReferences.bridiReferenceRepository, times(2)).save(argument.capture()); List values = argument.getAllValues(); assertEquals(ALICE_ID, values.get(0).bridiId()); assertEquals(ALICE_ID, values.get(1).bridiId()); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java index 62c82c8..b3ea365 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java @@ -11,8 +11,7 @@ import io.github.magwas.inez.storage.model.BridiReferenceTestData; import io.github.magwas.testing.TestBase; -class AddReferencesTest extends TestBase - implements BridiReferenceTestData, ReferenceTestData { +class AddReferencesTest extends TestBase implements BridiReferenceTestData, ReferenceTestData { @InjectMocks AddReferencesService addReferences; @@ -20,8 +19,8 @@ class AddReferencesTest extends TestBase @DisplayName("adds all the references of the bridi to the repository") void test() { addReferences.apply(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REFERENCES); - SUMTI_IS_A_THING_REFERENCELIST - .forEach(x -> verify(addReferences.bridiReferenceRepository).save(x)); + SUMTI_IS_A_THING_REFERENCELIST.forEach( + x -> verify(addReferences.bridiReferenceRepository).save(x)); } @Test diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java index b570d4c..ede34b5 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java @@ -32,29 +32,25 @@ class BridiStoreEndToEndTest implements QueryProcessorTestData, BridiTestData { @Test void test() { inez.create(TEST_TEXT).toArray(); - assertEquals(List.of(ALICE), - inez.findAllByRepresentation("alice").toList()); + assertEquals(List.of(ALICE), inez.findAllByRepresentation("alice").toList()); inez.save(Set.of(GO1, GO2)); inez.findAllByRepresentation(GO_REPR).forEach(x -> LogUtil.debug("go", x)); String CECILE_EATS_BANANA_REPR = "{cecile} {{eats} {banana}}"; String CECILE_LOOKS_AT_BANANA_REPR = "{cecile} {{looks at} {banana}}"; - Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, - inez.query(CECILE_EATS_BANANA_REPR)); - Bridi ceclie_looks_at_banana = assertGotTheBridi( - CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); + Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, inez.query(CECILE_EATS_BANANA_REPR)); + Bridi ceclie_looks_at_banana = + assertGotTheBridi(CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); TestUtil.assertStreamEquals( - Set.of(cecile_eats_banana, ceclie_looks_at_banana), - inez.query("{cecile} {{$?} {banana}}")); + Set.of(cecile_eats_banana, ceclie_looks_at_banana), inez.query("{cecile} {{$?} {banana}}")); - Bridi looks_at_banana = inez - .findById(ceclie_looks_at_banana.references().get(2)).get(); + Bridi looks_at_banana = + inez.findById(ceclie_looks_at_banana.references().get(2)).get(); Bridi looks_at = inez.findById(looks_at_banana.references().get(1)).get(); assertEquals("looks at", looks_at.representation()); } - private Bridi assertGotTheBridi(final String expected, - final Stream actual) { + private Bridi assertGotTheBridi(final String expected, final Stream actual) { List actualList = actual.toList(); assertEquals(1, actualList.size()); Bridi bridi = actualList.get(0); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java index 3357ff9..516dec9 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java @@ -19,7 +19,7 @@ class FindAllIdByRepresentationTest extends TestBase implements IdTestData { @Test @DisplayName("returns the ids of all the sumties with the given representation") void test() { - assertEquals(Set.of(GO_ID, GO2_ID), - findAllIdByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); + assertEquals( + Set.of(GO_ID, GO2_ID), findAllIdByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java index 6acf88c..1993573 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java @@ -9,19 +9,16 @@ public class GetBridiIdBySelbriAndSumtiIdsServiceStub implements IdTestData { public static GetBridiIdBySelbriAndSumtiIdsService stub() { - GetBridiIdBySelbriAndSumtiIdsService mock = mock( - GetBridiIdBySelbriAndSumtiIdsService.class); - when(mock.apply(IS_A_ID, THING_ID, 1)) - .thenAnswer((args) -> Stream.of(TAUTOLOGY_ID, THING_IS_A_SUMTI_ID)); - when(mock.apply(IS_A_ID, THING_ID, 2)).thenAnswer( - (args) -> Stream.of(TAUTOLOGY_ID, SUMTI_IS_A_THING_IS_A_THING_ID, - SUMTI_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_ID)); - when(mock.apply(IS_A_ID, IS_A_ID, 0)).thenAnswer((args) -> Stream - .of(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_ID)); + GetBridiIdBySelbriAndSumtiIdsService mock = mock(GetBridiIdBySelbriAndSumtiIdsService.class); + when(mock.apply(IS_A_ID, THING_ID, 1)).thenAnswer((args) -> Stream.of(TAUTOLOGY_ID, THING_IS_A_SUMTI_ID)); + when(mock.apply(IS_A_ID, THING_ID, 2)) + .thenAnswer((args) -> Stream.of( + TAUTOLOGY_ID, SUMTI_IS_A_THING_IS_A_THING_ID, SUMTI_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_ID)); + when(mock.apply(IS_A_ID, IS_A_ID, 0)) + .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_ID)); when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_IS_A_THING_ID, 1)) .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_IS_A_THING_ID)); - when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_ID, 1)) - .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); + when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_ID, 1)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); when(mock.apply(IS_A_ID, GOD_ID, 2)).thenAnswer((args) -> Stream.of()); return mock; diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java index 76b1263..3d4844e 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java @@ -7,46 +7,36 @@ public interface BridiReferenceTestData extends IdTestData { String ID = "id:"; - BridiReference TAUTOLOGY_REFERENCE_0 = new BridiReference(TAUTOLOGY_ID + 0, - TAUTOLOGY_ID, IS_A_ID, 0, IS_A_ID); - BridiReference TAUTOLOGY_REFERENCE_1 = new BridiReference(TAUTOLOGY_ID + 1, - TAUTOLOGY_ID, IS_A_ID, 1, THING_ID); - BridiReference TAUTOLOGY_REFERENCE_2 = new BridiReference(TAUTOLOGY_ID + 2, - TAUTOLOGY_ID, IS_A_ID, 2, THING_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_0 = new BridiReference( - ID + SUMTI_IS_A_THING_ID + 0, SUMTI_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_1 = new BridiReference( - ID + SUMTI_IS_A_THING_ID + 1, SUMTI_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_2 = new BridiReference( - ID + SUMTI_IS_A_THING_ID + 2, SUMTI_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - List SUMTI_IS_A_THING_REFERENCELIST = List.of( - SUMTI_IS_A_THING_REFERENCE_0, SUMTI_IS_A_THING_REFERENCE_1, - SUMTI_IS_A_THING_REFERENCE_2); - BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_0 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 0, SUMTI_IS_A_THING_IS_A_THING_ID, - IS_A_ID, 0, IS_A_ID); + BridiReference TAUTOLOGY_REFERENCE_0 = new BridiReference(TAUTOLOGY_ID + 0, TAUTOLOGY_ID, IS_A_ID, 0, IS_A_ID); + BridiReference TAUTOLOGY_REFERENCE_1 = new BridiReference(TAUTOLOGY_ID + 1, TAUTOLOGY_ID, IS_A_ID, 1, THING_ID); + BridiReference TAUTOLOGY_REFERENCE_2 = new BridiReference(TAUTOLOGY_ID + 2, TAUTOLOGY_ID, IS_A_ID, 2, THING_ID); + BridiReference SUMTI_IS_A_THING_REFERENCE_0 = + new BridiReference(ID + SUMTI_IS_A_THING_ID + 0, SUMTI_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); + BridiReference SUMTI_IS_A_THING_REFERENCE_1 = + new BridiReference(ID + SUMTI_IS_A_THING_ID + 1, SUMTI_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); + BridiReference SUMTI_IS_A_THING_REFERENCE_2 = + new BridiReference(ID + SUMTI_IS_A_THING_ID + 2, SUMTI_IS_A_THING_ID, IS_A_ID, 2, THING_ID); + List SUMTI_IS_A_THING_REFERENCELIST = + List.of(SUMTI_IS_A_THING_REFERENCE_0, SUMTI_IS_A_THING_REFERENCE_1, SUMTI_IS_A_THING_REFERENCE_2); + BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_0 = + new BridiReference(SUMTI_IS_A_THING_IS_A_THING_ID + 0, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_1 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 1, SUMTI_IS_A_THING_IS_A_THING_ID, - IS_A_ID, 1, SUMTI_ID); + SUMTI_IS_A_THING_IS_A_THING_ID + 1, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_2 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 2, SUMTI_IS_A_THING_IS_A_THING_ID, - IS_A_ID, 2, THING_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_0 = new BridiReference( - TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, - IS_A_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_1 = new BridiReference( - TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, - THING_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_2 = new BridiReference( - TAUTOLOGY_IS_A_THING_ID + 2, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 2, - THING_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_0 = new BridiReference( - THING_IS_A_SUMTI_ID + 0, THING_IS_A_SUMTI_ID, IS_A_ID, 0, IS_A_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_1 = new BridiReference( - THING_IS_A_SUMTI_ID + 1, THING_IS_A_SUMTI_ID, IS_A_ID, 1, THING_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_2 = new BridiReference( - THING_IS_A_SUMTI_ID + 2, THING_IS_A_SUMTI_ID, IS_A_ID, 2, SUMTI_ID); + SUMTI_IS_A_THING_IS_A_THING_ID + 2, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 2, THING_ID); + BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_0 = + new BridiReference(TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, IS_A_ID); + BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_1 = + new BridiReference(TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, THING_ID); + BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_2 = + new BridiReference(TAUTOLOGY_IS_A_THING_ID + 2, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 2, THING_ID); + BridiReference THING_IS_A_SUMTI_REFERENCE_0 = + new BridiReference(THING_IS_A_SUMTI_ID + 0, THING_IS_A_SUMTI_ID, IS_A_ID, 0, IS_A_ID); + BridiReference THING_IS_A_SUMTI_REFERENCE_1 = + new BridiReference(THING_IS_A_SUMTI_ID + 1, THING_IS_A_SUMTI_ID, IS_A_ID, 1, THING_ID); + BridiReference THING_IS_A_SUMTI_REFERENCE_2 = + new BridiReference(THING_IS_A_SUMTI_ID + 2, THING_IS_A_SUMTI_ID, IS_A_ID, 2, SUMTI_ID); - BridiReference STUFF_COULDBE_THING_REFERENCE_2 = new BridiReference( - STUFF_ID + 2, COULDBE_ID, COULDBE_ID, 2, THING_ID); + BridiReference STUFF_COULDBE_THING_REFERENCE_2 = + new BridiReference(STUFF_ID + 2, COULDBE_ID, COULDBE_ID, 2, THING_ID); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java index fe996b6..47c4f97 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java @@ -5,10 +5,8 @@ public interface SumtiTestData extends IdTestData { Sumti THING_SUMTI = new Sumti(THING_ID, THING_REPR); - Sumti SUMTI_IS_A_THING_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, - SUMTI_IS_A_THING_REPR); - Sumti SUMTI_IS_A_THING_CHANGED_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, - SUMTI_IS_A_THING_CHANGED_REPR); + Sumti SUMTI_IS_A_THING_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR); + Sumti SUMTI_IS_A_THING_CHANGED_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR); Sumti GO1_SUMTI = new Sumti(GO_ID, GO_REPR); Sumti GO2_SUMTI = new Sumti(GO2_ID, GO_REPR); } diff --git a/inez.parser.tests/META-INF/MANIFEST.MF b/inez.parser.tests/META-INF/MANIFEST.MF index 56df782..e7b48f8 100644 --- a/inez.parser.tests/META-INF/MANIFEST.MF +++ b/inez.parser.tests/META-INF/MANIFEST.MF @@ -18,6 +18,11 @@ Require-Bundle: wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0 junit-jupiter-api;bundle-version="5.11.4", junit-platform-commons;bundle-version="1.11.4", wrapped.org.springframework.spring-aop;bundle-version="6.2.8", - wrapped.org.springframework.spring-expression;bundle-version="6.2.8" + wrapped.org.springframework.spring-expression;bundle-version="6.2.8", + wrapped.org.springframework.spring-context;bundle-version="6.2.8", + wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", + wrapped.org.springframework.spring-beans;bundle-version="6.2.8", + wrapped.org.springframework.spring-core;bundle-version="6.2.8", + wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1" Automatic-Module-Name: io.github.magwas.inez.parser.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java index fdd091f..08aa0c1 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java @@ -16,8 +16,8 @@ public StringBuilder get() { .map(s -> s.split(",")[0]).toList(); Stream generatedIds = GeneratorUtil.linesOf(REPRESENTATIONS) .map(s -> s.split(",")[0]).filter(x -> !definedIdlist.contains(x)); - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, "", "RepresentationTestData"); + StringBuilder builder = GeneratorUtil.testDataBoilerPlate("", + "RepresentationTestData"); GeneratorUtil.mapToCode(generatedIds, line -> { String[] parts = line.split(",", 2); return MessageFormat.format(""" @@ -25,8 +25,6 @@ public StringBuilder get() { """, parts[0].trim()); }, builder); GeneratorUtil.mapToCode(IDS, GeneratorUtil.stringConstant("ID"), builder); - builder.append("}\n"); - - return builder; + return GeneratorUtil.testDataTail(builder); } } diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java index c64df16..ef89190 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java @@ -9,12 +9,9 @@ public class InputTestDataGenerator @Override public StringBuilder get() { - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, ""); + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""); GeneratorUtil.mapToCode(INPUTS, GeneratorUtil.stringConstant("INPUT"), builder); - builder.append("}\n"); - - return builder; + return GeneratorUtil.testDataTail(builder); } } diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java new file mode 100644 index 0000000..762049f --- /dev/null +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java @@ -0,0 +1,25 @@ +package io.github.magwas.inez.parse; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; + +public class ParseTextServiceStubGenerator + implements Supplier, TestDataGeneratorConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.stubBoilerPlate(""" + import java.util.stream.Stream; + """, "ParserOutputTestData"); + GeneratorUtil.linesOf(PARSE_TEXT_STUB_DATA).map(line -> { + String[] splat = line.split(","); + return MessageFormat.format(""" + when(mock.apply({0})).thenReturn(Stream.of({1})); + """, splat[0], splat[1]); + }).forEach(builder::append); + return GeneratorUtil.stubTail(builder); + } + +} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java index 6bde399..47c443f 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java @@ -10,8 +10,7 @@ public class ParserOutputTestDataGenerator @Override public StringBuilder get() { - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, """ + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" import java.util.Map; """, "InputTestData", "ReferenceTestData"); GeneratorUtil.linesOf(OUTPUTS).map(line -> { @@ -26,8 +25,7 @@ public StringBuilder get() { "\tParserOutput OUTPUT_{0} = new ParserOutput({1},Map.of({2}));\n", name, top, map); }).forEach(builder::append); - builder.append("}\n"); - return builder; + return GeneratorUtil.testDataTail(builder); } } diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java index d1bb982..c3d8e1a 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java @@ -10,8 +10,7 @@ public class ReferenceTestDataGenerator @Override public StringBuilder get() { - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, """ + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" import java.util.List; """, "IdTestData", "InputTestData"); builder.append("\n"); @@ -21,8 +20,6 @@ public StringBuilder get() { List {0}_REFERENCES = List.of({1}); """, parts[0].trim(), parts[1]); }, builder); - builder.append("}\n"); - - return builder; + return GeneratorUtil.testDataTail(builder); } } diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java index e4168de..656cd2c 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java @@ -10,8 +10,7 @@ public class RepresentationTestDataGenerator @Override public StringBuilder get() { - StringBuilder builder = new StringBuilder(); - GeneratorUtil.testDataBoilerPlate(builder, ""); + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""); GeneratorUtil.mapToCode(REPRESENTATIONS, GeneratorUtil.stringConstant("REPR"), builder); GeneratorUtil.mapToCode(IDREFERENCES, line -> { @@ -20,7 +19,7 @@ public StringBuilder get() { String {0}_REFERENCE = "@{0}"; """, parts[0].trim()); }, builder); - builder.append("}\n"); - return builder; + return GeneratorUtil.testDataTail(builder); } + } diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java index f3159f7..d4194e6 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java @@ -5,10 +5,11 @@ public interface TestDataGeneratorConstants { String REPRESENTATIONS = TestUtil.loadResourceAsString("representations"); String IDS = TestUtil.loadResourceAsString("ids"); - String EXTRA = TestUtil.loadResourceAsString("extra"); String IDREFERENCES = TestUtil.loadResourceAsString("idreferences"); String INPUTS = TestUtil.loadResourceAsString("inputs"); String REFERENCES = TestUtil.loadResourceAsString("references"); String OUTPUTS = TestUtil.loadResourceAsString("outputs"); + String PARSE_TEXT_STUB_DATA = TestUtil + .loadResourceAsString("parse_text_stubdata"); } diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java deleted file mode 100644 index f5b0d2e..0000000 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextServiceStub.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.github.magwas.inez.parse; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.stream.Stream; - -class ParseTextServiceStub implements ParserOutputTestData { - public static ParseTextService stub() { - ParseTextService mock = mock(ParseTextService.class); - when(mock.apply(NONEXISTENT_REPR)).thenReturn(Stream.of(OUTPUT_NONEXISTING)); - when(mock.apply(THING_REPR)).thenReturn(Stream.of(OUTPUT_THING)); - when(mock.apply(GO_REPR)).thenReturn(Stream.of(OUTPUT_GO)); - when(mock.apply(SUMTI_IS_A_THING_REPR)).thenReturn(Stream.of(OUTPUT_SUMTI_IS_A_THING)); - when(mock.apply(GO1_REFERENCE)).thenReturn(Stream.of(OUTPUT_GO1)); - when(mock.apply(NONEXISTENT_REFERENCE)).thenReturn(Stream.of(OUTPUT_NONEXISTENT_REFERENCE)); - when(mock.apply(TAUTOLOGY_GENERATED_REPR)).thenReturn(Stream.of(OUTPUT_TAUTOLOGY)); - when(mock.apply(ParserConstants.QUERY_BRIDI_ID)).thenReturn(Stream.of(OUTPUT_ANY)); - - when(mock.apply(SIMPLE_INPUT)).thenReturn(Stream.of(OUTPUT_SIMPLE)); - when(mock.apply(ALL_ANY_INPUT)).thenReturn(Stream.of(OUTPUT_ALL_ANY)); - when(mock.apply(NONMATCHING_INPUT)).thenReturn(Stream.of(OUTPUT_NONMATCHING)); - when(mock.apply(RECURSIVE_INPUT)).thenReturn(Stream.of(OUTPUT_RECURSIVE)); - return mock; - } -} diff --git a/inez.parser.tests/src/main/resources/parse_text_stubdata b/inez.parser.tests/src/main/resources/parse_text_stubdata new file mode 100644 index 0000000..56aaaa9 --- /dev/null +++ b/inez.parser.tests/src/main/resources/parse_text_stubdata @@ -0,0 +1,12 @@ +NONEXISTENT_REPR,OUTPUT_NONEXISTING +THING_REPR,OUTPUT_THING +GO_REPR,OUTPUT_GO +SUMTI_IS_A_THING_REPR,OUTPUT_SUMTI_IS_A_THING +GO1_REFERENCE,OUTPUT_GO1 +NONEXISTENT_REFERENCE,OUTPUT_NONEXISTENT_REFERENCE +TAUTOLOGY_GENERATED_REPR,OUTPUT_TAUTOLOGY +ParserConstants.QUERY_BRIDI_ID,OUTPUT_ANY +SIMPLE_INPUT,OUTPUT_SIMPLE +ALL_ANY_INPUT,OUTPUT_ALL_ANY +NONMATCHING_INPUT,OUTPUT_NONMATCHING +RECURSIVE_INPUT,OUTPUT_RECURSIVE diff --git a/inez.target/inez.target b/inez.target/inez.target index b9dbd88..abf206f 100644 --- a/inez.target/inez.target +++ b/inez.target/inez.target @@ -23,13 +23,13 @@ io.github.magwas konveyor-base-testing - 0.4.33 + 0.4.37 jar io.github.magwas konveyor-base - 0.4.33 + 0.4.37 jar diff --git a/pom.xml b/pom.xml index 7695f4a..c50f960 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.magwas konveyor-parent - 0.4.33 + 0.4.37 inez 0.0.1 @@ -55,7 +55,7 @@ true - 0.4.33 + 0.4.37 From 923334c1a4fb91bc31c110856adaf25e099ebac7 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 12 Oct 2025 11:36:18 +0200 Subject: [PATCH 04/11] fixup: konveyor version --- inez.target/inez.target | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inez.target/inez.target b/inez.target/inez.target index abf206f..3b4d34e 100644 --- a/inez.target/inez.target +++ b/inez.target/inez.target @@ -23,13 +23,13 @@ io.github.magwas konveyor-base-testing - 0.4.37 + 0.4.38 jar io.github.magwas konveyor-base - 0.4.37 + 0.4.38 jar diff --git a/pom.xml b/pom.xml index c50f960..a8451d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.github.magwas konveyor-parent - 0.4.37 + 0.4.38 inez 0.0.1 @@ -55,7 +55,7 @@ true - 0.4.37 + 0.4.38 From 74942afe4b7ca2c7fe8485c6fd8384e58d8bc243 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 12 Oct 2025 16:42:10 +0200 Subject: [PATCH 05/11] SumtiTestData and BridiReferenceTestData are generated closes: #29, #30 --- inez.model.tests/pom.xml | 1 + .../BridiReferenceTestDataGenerator.java | 39 +++++++++++++++++ .../model/SumtiTestData2Generator.java | 18 -------- .../storage/model/SumtiTestDataGenerator.java | 23 ++++++++++ .../storage/model/BridiReferenceTestData.java | 42 ------------------- .../inez/storage/model/SumtiTestData.java | 12 ------ .../BridiReferenceRepositoryStub.java | 4 +- .../src/main/resources/bridireferences | 6 +++ inez.model.tests/src/main/resources/sumties | 5 +++ inez.parser.tests/pom.xml | 1 + .../parse/ReferenceTestDataGenerator.java | 1 - inez.parser.tests/src/main/resources/ids | 1 + 12 files changed, 77 insertions(+), 76 deletions(-) create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java delete mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java create mode 100644 inez.model.tests/src/main/resources/bridireferences create mode 100644 inez.model.tests/src/main/resources/sumties diff --git a/inez.model.tests/pom.xml b/inez.model.tests/pom.xml index f6a0d7b..c2fe960 100644 --- a/inez.model.tests/pom.xml +++ b/inez.model.tests/pom.xml @@ -53,6 +53,7 @@ org.eclipse.tycho tycho-surefire-plugin + ${version.tycho} true diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java new file mode 100644 index 0000000..02c49a5 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java @@ -0,0 +1,39 @@ +package io.github.magwas.inez.storage.model; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class BridiReferenceTestDataGenerator + implements Supplier { + String BRIDI_REFERENCE_PATTERN = """ + BridiReference {0}_REFERENCE_0 = new BridiReference( + IdUtil.createID({0}_ID+0), {0}_ID, {1}_ID, 0, {1}_ID); + BridiReference {0}_REFERENCE_1 = new BridiReference( + IdUtil.createID({0}_ID+1), {0}_ID, {1}_ID, 1, {2}_ID); + BridiReference {0}_REFERENCE_2 = new BridiReference( + IdUtil.createID({0}_ID+2), {0}_ID, {1}_ID, 2, {3}_ID); + List {0}_REFERENCELIST = List.of( + {0}_REFERENCE_0, {0}_REFERENCE_1, + {0}_REFERENCE_2); + """; + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" + import io.github.magwas.inez.parse.IdTestData; + import io.github.magwas.inez.parse.IdUtil; + import java.util.List; + """, "IdTestData"); + String bridireferences = TestUtil.loadResourceAsString("bridireferences"); + GeneratorUtil.mapToCode(bridireferences, + line -> MessageFormat.format(BRIDI_REFERENCE_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA)), + builder); + return GeneratorUtil.testDataTail(builder); + } + +} diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java deleted file mode 100644 index 4c962e9..0000000 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestData2Generator.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.github.magwas.inez.storage.model; - -import java.util.function.Supplier; - -import io.github.magwas.inez.parse.TestDataGeneratorConstants; -import io.github.magwas.runtime.GeneratorUtil; - -public class SumtiTestData2Generator - implements Supplier, TestDataGeneratorConstants { - - @Override - public StringBuilder get() { - StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""); - GeneratorUtil.mapToCode(REPRESENTATIONS, - GeneratorUtil.stringConstant("REPR"), builder); - return GeneratorUtil.testDataTail(builder); - } -} diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java new file mode 100644 index 0000000..b180e79 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java @@ -0,0 +1,23 @@ +package io.github.magwas.inez.storage.model; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class SumtiTestDataGenerator implements Supplier { + String SUMTI_PATTERN = "\tSumti {0} = new Sumti({1}, {2});\n"; + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.testDataBoilerPlate( + "import io.github.magwas.inez.parse.IdTestData;", "IdTestData"); + String sumties = TestUtil.loadResourceAsString("sumties"); + GeneratorUtil.mapToCode(sumties, line -> MessageFormat.format(SUMTI_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA)), builder); + return GeneratorUtil.testDataTail(builder); + } + +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java deleted file mode 100644 index 3d4844e..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/BridiReferenceTestData.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.github.magwas.inez.storage.model; - -import java.util.List; - -import io.github.magwas.inez.parse.IdTestData; - -public interface BridiReferenceTestData extends IdTestData { - - String ID = "id:"; - BridiReference TAUTOLOGY_REFERENCE_0 = new BridiReference(TAUTOLOGY_ID + 0, TAUTOLOGY_ID, IS_A_ID, 0, IS_A_ID); - BridiReference TAUTOLOGY_REFERENCE_1 = new BridiReference(TAUTOLOGY_ID + 1, TAUTOLOGY_ID, IS_A_ID, 1, THING_ID); - BridiReference TAUTOLOGY_REFERENCE_2 = new BridiReference(TAUTOLOGY_ID + 2, TAUTOLOGY_ID, IS_A_ID, 2, THING_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_0 = - new BridiReference(ID + SUMTI_IS_A_THING_ID + 0, SUMTI_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_1 = - new BridiReference(ID + SUMTI_IS_A_THING_ID + 1, SUMTI_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); - BridiReference SUMTI_IS_A_THING_REFERENCE_2 = - new BridiReference(ID + SUMTI_IS_A_THING_ID + 2, SUMTI_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - List SUMTI_IS_A_THING_REFERENCELIST = - List.of(SUMTI_IS_A_THING_REFERENCE_0, SUMTI_IS_A_THING_REFERENCE_1, SUMTI_IS_A_THING_REFERENCE_2); - BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_0 = - new BridiReference(SUMTI_IS_A_THING_IS_A_THING_ID + 0, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 0, IS_A_ID); - BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_1 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 1, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 1, SUMTI_ID); - BridiReference SUMTI_IS_A_THING_IS_A_THING_REFERENCE_2 = new BridiReference( - SUMTI_IS_A_THING_IS_A_THING_ID + 2, SUMTI_IS_A_THING_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_0 = - new BridiReference(TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, IS_A_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_1 = - new BridiReference(TAUTOLOGY_IS_A_THING_ID + 1, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 1, THING_ID); - BridiReference TAUTOLOGY_IS_A_THING_REFERENCE_2 = - new BridiReference(TAUTOLOGY_IS_A_THING_ID + 2, TAUTOLOGY_IS_A_THING_ID, IS_A_ID, 2, THING_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_0 = - new BridiReference(THING_IS_A_SUMTI_ID + 0, THING_IS_A_SUMTI_ID, IS_A_ID, 0, IS_A_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_1 = - new BridiReference(THING_IS_A_SUMTI_ID + 1, THING_IS_A_SUMTI_ID, IS_A_ID, 1, THING_ID); - BridiReference THING_IS_A_SUMTI_REFERENCE_2 = - new BridiReference(THING_IS_A_SUMTI_ID + 2, THING_IS_A_SUMTI_ID, IS_A_ID, 2, SUMTI_ID); - - BridiReference STUFF_COULDBE_THING_REFERENCE_2 = - new BridiReference(STUFF_ID + 2, COULDBE_ID, COULDBE_ID, 2, THING_ID); -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java deleted file mode 100644 index 47c4f97..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/model/SumtiTestData.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.github.magwas.inez.storage.model; - -import io.github.magwas.inez.parse.IdTestData; - -public interface SumtiTestData extends IdTestData { - - Sumti THING_SUMTI = new Sumti(THING_ID, THING_REPR); - Sumti SUMTI_IS_A_THING_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR); - Sumti SUMTI_IS_A_THING_CHANGED_SUMTI = new Sumti(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR); - Sumti GO1_SUMTI = new Sumti(GO_ID, GO_REPR); - Sumti GO2_SUMTI = new Sumti(GO2_ID, GO_REPR); -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java index 3df85c6..266b36d 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java @@ -14,9 +14,7 @@ public static BridiReferenceRepository stub() { when(mock.findAllByBridiId(SUMTI_IS_A_THING_ID)) .thenAnswer(params -> Set.of( - SUMTI_IS_A_THING_IS_A_THING_REFERENCE_0, - SUMTI_IS_A_THING_IS_A_THING_REFERENCE_1, - SUMTI_IS_A_THING_IS_A_THING_REFERENCE_2)); + SUMTI_IS_A_THING_REFERENCE_0, SUMTI_IS_A_THING_REFERENCE_1, SUMTI_IS_A_THING_REFERENCE_2)); when(mock.findAllBySelbriIdAndSumtiIdAndPosition(IS_A_ID, THING_ID, 2)) .thenAnswer(params -> Set.of( TAUTOLOGY_REFERENCE_2, diff --git a/inez.model.tests/src/main/resources/bridireferences b/inez.model.tests/src/main/resources/bridireferences new file mode 100644 index 0000000..797aad5 --- /dev/null +++ b/inez.model.tests/src/main/resources/bridireferences @@ -0,0 +1,6 @@ +TAUTOLOGY,IS_A,THING,THING +SUMTI_IS_A_THING,IS_A,SUMTI,THING +SUMTI_IS_A_THING_IS_A_THING,IS_A,SUMTI_IS_A_THING,THING +TAUTOLOGY_IS_A_THING,IS_A,TAUTOLOGY,THING +THING_IS_A_SUMTI,IS_A,THING,SUMTI +STUFF_COULDBE_THING,COULDBE,STUFF,THING diff --git a/inez.model.tests/src/main/resources/sumties b/inez.model.tests/src/main/resources/sumties new file mode 100644 index 0000000..053270c --- /dev/null +++ b/inez.model.tests/src/main/resources/sumties @@ -0,0 +1,5 @@ +THING_SUMTI,THING_ID,THING_REPR +SUMTI_IS_A_THING_SUMTI,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_REPR +SUMTI_IS_A_THING_CHANGED_SUMTI,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_CHANGED_REPR +GO1_SUMTI,GO_ID,GO_REPR +GO2_SUMTI,GO2_ID,GO_REPR diff --git a/inez.parser.tests/pom.xml b/inez.parser.tests/pom.xml index bfc1985..1fc1e1f 100644 --- a/inez.parser.tests/pom.xml +++ b/inez.parser.tests/pom.xml @@ -46,6 +46,7 @@ org.eclipse.tycho tycho-surefire-plugin + ${version.tycho} true diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java index c3d8e1a..97f9060 100644 --- a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java +++ b/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java @@ -13,7 +13,6 @@ public StringBuilder get() { StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" import java.util.List; """, "IdTestData", "InputTestData"); - builder.append("\n"); GeneratorUtil.mapToCode(REFERENCES, line -> { String[] parts = line.split(",", 2); return MessageFormat.format(""" diff --git a/inez.parser.tests/src/main/resources/ids b/inez.parser.tests/src/main/resources/ids index 784e1b7..f61a9d3 100644 --- a/inez.parser.tests/src/main/resources/ids +++ b/inez.parser.tests/src/main/resources/ids @@ -8,3 +8,4 @@ TAUTOLOGY,tautology CONTAINS,CONTAINS ROOT,ROOT CONTAINER,CONTAINER +STUFF_COULDBE_THING,STUFF_COULDBE_THING From b5e5ea9e690e76aecafcbddce76ce2f7f27b1525 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 12 Oct 2025 17:14:25 +0200 Subject: [PATCH 06/11] BridiTestData is generated closes: #31 --- .../magwas/inez/BridiTestDataGenerator.java | 29 ++++++++++++ .../io/github/magwas/inez/BridiTestData.java | 47 ------------------- .../magwas/inez/query/QueryProcessorTest.java | 36 ++++++++------ .../inez/query/QueryProcessorTestData.java | 10 +++- inez.model.tests/src/main/resources/bridies | 22 +++++++++ .../CreateBridisFromParserOutputService.java | 22 +++++---- 6 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java create mode 100644 inez.model.tests/src/main/resources/bridies diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java new file mode 100644 index 0000000..2bff35a --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java @@ -0,0 +1,29 @@ +package io.github.magwas.inez; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class BridiTestDataGenerator implements Supplier { + String BRIDI_PATTERN = "\tBridi {0} = new Bridi({1}, {2},{3});\n"; + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" + import java.util.List; + import io.github.magwas.inez.parse.IdTestData; + import io.github.magwas.inez.parse.IdUtil; + import io.github.magwas.inez.parse.ParserConstants; + import io.github.magwas.inez.parse.ReferenceTestData; + + """, "IdTestData", "ReferenceTestData"); + String bridies = TestUtil.loadResourceAsString("bridies"); + GeneratorUtil.mapToCode(bridies, line -> MessageFormat.format(BRIDI_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA, 4)), builder); + return GeneratorUtil.testDataTail(builder); + } + +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java deleted file mode 100644 index 52a5562..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/BridiTestData.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.github.magwas.inez; - -import java.util.List; -import java.util.Set; - -import io.github.magwas.inez.parse.IdTestData; -import io.github.magwas.inez.parse.IdUtil; -import io.github.magwas.inez.parse.ParserConstants; -import io.github.magwas.inez.parse.ReferenceTestData; -import io.github.magwas.inez.parse.RepresentationTestData; - -public interface BridiTestData extends RepresentationTestData, IdTestData, ReferenceTestData { - - Bridi ALICE = new Bridi(IdUtil.createID(ALICE_REPR), ALICE_REPR, List.of()); - - Bridi GO1 = new Bridi(GO_ID, GO_REPR, null); - Bridi GO2 = new Bridi(GO2_ID, GO_REPR, null); - Bridi SUMTI_IS_A_THING_IS_A_THING = new Bridi( - SUMTI_IS_A_THING_IS_A_THING_ID, - SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR, - SUMTI_IS_A_THING_IS_A_THING_REFERENCES); - Bridi TAUTOLOGY_IS_A_THING = - new Bridi(TAUTOLOGY_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_REPR, SUMTI_IS_A_THING_IS_A_THING_REFERENCES); - Bridi THING = new Bridi(THING_ID, THING_REPR, null); - Bridi THING_CHANGED = new Bridi(THING_ID, "thung", null); - Bridi THING_GENERATED = new Bridi(IdUtil.createID(THING_REPR), THING_REPR, null); - Bridi SUMTI = new Bridi(SUMTI_ID, SUMTI_REPR, null); - Bridi NONEXISTENT = new Bridi(NONEXISTENT_ID, NONEXISTENT_REPR, null); - Bridi BRIDI = new Bridi(BRIDI_ID, BRIDI_REPR, null); - Bridi IS_A = new Bridi(IS_A_ID, IS_A_REPR, null); - Bridi IS_A_NONSAVED = new Bridi(IdUtil.createID(IS_A_REPR), IS_A_REPR, null); - Bridi ANY = new Bridi(ParserConstants.QUERY_BRIDI_ID, ParserConstants.QUERY_BRIDI_ID, null); - - Bridi SUMTI_IS_A_THING = new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_REFERENCES); - Bridi SUMTI_IS_A_THING_GENERATED = - new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_REPR, SUMTI_IS_A_THING_GENERATED_REFERENCES); - Bridi SUMTI_IS_A_THING_CHANGED = - new Bridi(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_CHANGED_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); - Bridi TAUTOLOGY = new Bridi(TAUTOLOGY_ID, TAUTOLOGY_REPR, SUMTI_IS_A_THING_CHANGED_REFERENCES); - Bridi THING_IS_A_SUMTI = new Bridi(THING_IS_A_SUMTI_ID, TAUTOLOGY_REPR, THING_IS_A_SUMTI_REFERENCES); - - Bridi GOD = new Bridi(GOD_ID, GOD_REPR, null); - Bridi HUMAN = new Bridi(HUMAN_ID, HUMAN_REPR, null); - Bridi MY_MODEL = new Bridi(MY_MODEL_ID, MY_MODEL_REPR, null); - Set SIMPLE_QUERY_OUTPUT = - Set.of(TAUTOLOGY, SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java index 74de1ba..f567082 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java @@ -11,13 +11,12 @@ import org.mockito.InjectMocks; import io.github.magwas.inez.Bridi; -import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.ParserConstants; import io.github.magwas.runtime.LogUtil; import io.github.magwas.testing.TestBase; import io.github.magwas.testing.TestUtil; -class QueryProcessorTest extends TestBase implements BridiTestData { +class QueryProcessorTest extends TestBase implements QueryProcessorTestData { @InjectMocks QueryProcessorService queryProcessor; @@ -32,70 +31,79 @@ void test() { @Test @DisplayName("for an existing sumti returns the sumti") void test_1() { - TestUtil.assertStreamEquals(Set.of(THING), queryProcessor.apply(THING_REPR)); + TestUtil.assertStreamEquals(Set.of(THING), + queryProcessor.apply(THING_REPR)); } @Test @DisplayName("if more sumtis exist with the representation, return them all") void test_2() { - TestUtil.assertStreamEquals(Set.of(GO1, GO2), queryProcessor.apply(GO_REPR)); + TestUtil.assertStreamEquals(Set.of(GO1, GO2), + queryProcessor.apply(GO_REPR)); } @Test @DisplayName("for a reference, return the referenced bridi") void test_3() { LogUtil.addDebuggedClass(QueryProcessorService.class); - TestUtil.assertStreamEquals(Set.of(GO1), queryProcessor.apply(GO1_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(GO1), + queryProcessor.apply(GO1_REFERENCE)); } @Test @DisplayName("for a reference to a nonexisting bridi, return an empty list") void test_5() { - TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONEXISTENT_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(), + queryProcessor.apply(NONEXISTENT_REFERENCE)); } @Test @DisplayName("for a bridi with the matching representation returns it") void test_4() { - TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), queryProcessor.apply(SUMTI_IS_A_THING_REPR)); + TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), + queryProcessor.apply(SUMTI_IS_A_THING_REPR)); } @Test @DisplayName("for a bridi where the representation does not match, but the selbri and sumties do, finds it") void test_6() { - TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); + TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), + queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); } @Test @DisplayName("'$?' returns a list of the any sumti") void test_7() { - TestUtil.assertStreamEquals(Set.of(ANY), queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); + TestUtil.assertStreamEquals(Set.of(ANY), + queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); } @Test @DisplayName("for a bridi where one of the sumties is '$?', the matching bridies return") void test1() { - TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, queryProcessor.apply(SIMPLE_INPUT)); + TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, + queryProcessor.apply(SIMPLE_INPUT)); } @Test @DisplayName("for a bridi where all of the sumties is '$?', a ParseCancellationException is thrown") void test1_1() { - assertThrows( - ParseCancellationException.class, + assertThrows(ParseCancellationException.class, () -> queryProcessor.apply(ALL_ANY_INPUT).toArray()); } @Test @DisplayName("if no stored bridi matches the query with '$?', and empty list is returned") void test2() { - TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONMATCHING_INPUT)); + TestUtil.assertStreamEquals(Set.of(), + queryProcessor.apply(NONMATCHING_INPUT)); } @Test @DisplayName("query works with the '$?' being deep down in the query") void test3() { Stream actual = queryProcessor.apply(RECURSIVE_INPUT); - TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); + TestUtil.assertStreamEquals( + Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java index c9793f6..f766289 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java @@ -1,8 +1,13 @@ package io.github.magwas.inez.query; +import java.util.Set; + +import io.github.magwas.inez.Bridi; +import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.RepresentationTestData; -public interface QueryProcessorTestData extends RepresentationTestData { +public interface QueryProcessorTestData + extends RepresentationTestData, BridiTestData { String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR + "\n" + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA_REPR + "\n" + ALICE_EATS_CHIPS_REPR + "\n" + BOB_EATS_BANANA_REPR + "\n" @@ -11,4 +16,7 @@ public interface QueryProcessorTestData extends RepresentationTestData { + TAUTOLOGY_GENERATED_REPR; String SAVE_CLASS_NAME = "io.github.magwas.inez.functions.Save"; + Set SIMPLE_QUERY_OUTPUT = Set.of(TAUTOLOGY, + SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); + } diff --git a/inez.model.tests/src/main/resources/bridies b/inez.model.tests/src/main/resources/bridies new file mode 100644 index 0000000..ccb38c2 --- /dev/null +++ b/inez.model.tests/src/main/resources/bridies @@ -0,0 +1,22 @@ +ALICE,IdUtil.createID(ALICE_REPR),ALICE_REPR,List.of() +GO1,GO_ID,GO_REPR,List.of() +GO2,GO2_ID,GO_REPR,List.of() +SUMTI_IS_A_THING_IS_A_THING,SUMTI_IS_A_THING_IS_A_THING_ID,SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR,SUMTI_IS_A_THING_IS_A_THING_REFERENCES +TAUTOLOGY_IS_A_THING,TAUTOLOGY_IS_A_THING_ID,TAUTOLOGY_IS_A_THING_REPR,SUMTI_IS_A_THING_IS_A_THING_REFERENCES +THING,THING_ID,THING_REPR,List.of() +THING_CHANGED,THING_ID,"thung",List.of() +THING_GENERATED,IdUtil.createID(THING_REPR),THING_REPR,List.of() +SUMTI,SUMTI_ID,SUMTI_REPR,List.of() +NONEXISTENT,NONEXISTENT_ID,NONEXISTENT_REPR,List.of() +BRIDI,BRIDI_ID,BRIDI_REPR,List.of() +IS_A,IS_A_ID,IS_A_REPR,List.of() +IS_A_NONSAVED,IdUtil.createID(IS_A_REPR),IS_A_REPR,List.of() +ANY,ParserConstants.QUERY_BRIDI_ID,ParserConstants.QUERY_BRIDI_ID,List.of() +SUMTI_IS_A_THING,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_REPR,SUMTI_IS_A_THING_REFERENCES +SUMTI_IS_A_THING_GENERATED,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_REPR,SUMTI_IS_A_THING_GENERATED_REFERENCES +SUMTI_IS_A_THING_CHANGED,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_CHANGED_REPR,SUMTI_IS_A_THING_CHANGED_REFERENCES +TAUTOLOGY,TAUTOLOGY_ID,TAUTOLOGY_REPR,SUMTI_IS_A_THING_CHANGED_REFERENCES +THING_IS_A_SUMTI,THING_IS_A_SUMTI_ID,TAUTOLOGY_REPR,THING_IS_A_SUMTI_REFERENCES +GOD,GOD_ID,GOD_REPR,List.of() +HUMAN,HUMAN_ID,HUMAN_REPR,List.of() +MY_MODEL,MY_MODEL_ID,MY_MODEL_REPR,List.of() \ No newline at end of file diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java index 2289aa9..34a1769 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java @@ -18,7 +18,8 @@ import io.github.magwas.inez.storage.repository.SumtiRepository; @Service -public class CreateBridisFromParserOutputService implements Function> { +public class CreateBridisFromParserOutputService + implements Function> { @Autowired SumtiRepository sumtiRepository; @@ -30,28 +31,31 @@ public Stream apply(final ParserOutput parserOutput) { return apply(top, refMap); } - private Stream apply(final String top, final Map> refMap) { + private Stream apply(final String top, + final Map> refMap) { debug("apply(", top, refMap); if (!refMap.containsKey(top)) { - Bridi bridi = new Bridi(getIdOrRepr(top), top, null); + Bridi bridi = new Bridi(getIdOrRepr(top), top, List.of()); debug("bridi->", bridi); return Stream.of(bridi); } List partList = refMap.get(top); - return Stream.of(new Bridi( - getIdOrRepr(top), - top, + return Stream + .of(new Bridi(getIdOrRepr(top), top, partList.stream().map(this::getIdOrRepr).toList())) .mapMulti((topBridi, consumer) -> { consumer.accept(topBridi); - partList.stream().map(x -> apply(x, refMap)).flatMap(x -> x).forEach(consumer::accept); + partList.stream().map(x -> apply(x, refMap)).flatMap(x -> x) + .forEach(consumer::accept); }); } private String getIdOrRepr(final String top) { Set candidates = sumtiRepository.findAllByRepresentation(top); - if (candidates.isEmpty()) return IdUtil.createID(top); - if (candidates.size() > 1) System.err.println("multiple candidates for " + top + ":" + candidates); + if (candidates.isEmpty()) + return IdUtil.createID(top); + if (candidates.size() > 1) + System.err.println("multiple candidates for " + top + ":" + candidates); return candidates.iterator().next().id(); } } From 17041283e08ec001a46b919ee1c25a3195187c78 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Sun, 12 Oct 2025 17:28:30 +0200 Subject: [PATCH 07/11] converted empty stubs in model to indirectly tested --- .../src/main/java/io/github/magwas/inez/InezImplStub.java | 4 +--- .../BridiElementSystemInitializationServiceStub.java | 6 ++---- .../inez/query/CreateBridisFromDefinitionServiceStub.java | 7 ++----- .../query/CreateBridisFromParserOutputServiceStub.java | 6 ++---- .../inez/query/CreateBridisFromQueryServiceStub.java | 7 ++----- .../magwas/inez/query/QueryProcessorServiceStub.java | 6 ++---- .../magwas/inez/storage/AddReferencesServiceStub.java | 6 ++---- .../inez/storage/BridiStoreChangeListenersServiceStub.java | 6 ++---- .../github/magwas/inez/storage/CreateSumtiServiceStub.java | 7 ++----- .../github/magwas/inez/storage/DeleteBridiServiceStub.java | 6 ++---- .../magwas/inez/storage/NotifyStoreChangeServiceStub.java | 6 ++---- .../magwas/inez/storage/RemoveReferencesServiceStub.java | 6 ++---- .../github/magwas/inez/storage/SaveBridiServiceStub.java | 6 ++---- 13 files changed, 25 insertions(+), 54 deletions(-) diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java index 03aeef2..317079c 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java @@ -2,9 +2,7 @@ import static org.mockito.Mockito.mock; -import io.github.magwas.inez.element.BridiElementTestData; - -public class InezImplStub implements BridiElementTestData, BridiTestData { +public class InezImplStub { public static InezImpl stub() { return mock(InezImpl.class); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java index e296633..0d03692 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.element; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class BridiElementSystemInitializationServiceStub { - static BridiElementSystemInitializationService stub() { - return mock(BridiElementSystemInitializationService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java index c3e6d64..1c1bd82 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java @@ -1,10 +1,7 @@ package io.github.magwas.inez.query; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class CreateBridisFromDefinitionServiceStub { - - static CreateBridisFromDefinitionService stub() { - return mock(CreateBridisFromDefinitionService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java index cb912a1..878d4e2 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.query; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class CreateBridisFromParserOutputServiceStub { - static CreateBridisFromParserOutputService stub() { - return mock(CreateBridisFromParserOutputService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java index 6e4331b..fb09bfc 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java @@ -1,10 +1,7 @@ package io.github.magwas.inez.query; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class CreateBridisFromQueryServiceStub { - - static CreateBridisFromQueryService stub() { - return mock(CreateBridisFromQueryService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java index 36e7a30..9dda2c3 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.query; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class QueryProcessorServiceStub { - static QueryProcessorService stub() { - return mock(QueryProcessorService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java index ad51fd0..4b95170 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class AddReferencesServiceStub { - public static AddReferencesService stub() { - return mock(AddReferencesService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java index 543d6fd..7f6238f 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class BridiStoreChangeListenersServiceStub { - public static BridiStoreChangeListenersService stub() { - return mock(BridiStoreChangeListenersService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java index 03b7037..458fe3c 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java @@ -1,10 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class CreateSumtiServiceStub { - - static CreateSumtiService stub() { - return mock(CreateSumtiService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java index c0a3e91..85e8018 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class DeleteBridiServiceStub { - public static DeleteBridiService stub() { - return mock(DeleteBridiService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java index 18bdc2a..cabf8bf 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class NotifyStoreChangeServiceStub { - public static NotifyStoreChangeService stub() { - return mock(NotifyStoreChangeService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java index e1f8866..d943d56 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class RemoveReferencesServiceStub { - public static RemoveReferencesService stub() { - return mock(RemoveReferencesService.class); - } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java index acd8b3f..7613b2a 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java @@ -1,9 +1,7 @@ package io.github.magwas.inez.storage; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; +@IndirectlyTested public class SaveBridiServiceStub { - static SaveBridiService stub() { - return mock(SaveBridiService.class); - } } From 83b1484ebffbb2b10a0fe97de0828b080f84b081 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Mon, 13 Oct 2025 05:31:51 +0200 Subject: [PATCH 08/11] Generating SumtiRepositoryStub and GetRelativeForBridiElementServiceStub closes: #33, #48 --- .../magwas/inez/BridiTestDataGenerator.java | 20 ++++------ .../inez/GeneratorPatternConstants.java | 39 +++++++++++++++++++ ...veForBridiElementServiceStubGenerator.java | 27 +++++++++++++ .../BridiReferenceTestDataGenerator.java | 21 ++-------- .../storage/model/SumtiTestDataGenerator.java | 11 ++++-- .../SumtiRepositoryStubGenerator.java | 27 +++++++++++++ .../magwas/inez/InezProblemTestData.java | 2 +- ...lementSystemInitializationServiceStub.java | 3 +- ...GetRelativeForBridiElementServiceStub.java | 17 -------- ...CreateBridisFromDefinitionServiceStub.java | 3 +- ...eateBridisFromParserOutputServiceStub.java | 3 +- .../CreateBridisFromQueryServiceStub.java | 3 +- .../inez/query/QueryProcessorServiceStub.java | 3 +- .../magwas/inez/query/QueryProcessorTest.java | 33 ++++++---------- .../inez/query/QueryProcessorTestData.java | 8 ++-- .../storage/AddReferencesServiceStub.java | 3 +- .../BridiStoreChangeListenersServiceStub.java | 3 +- .../CreateBridiFromSumtiServiceStub.java | 2 +- .../inez/storage/CreateSumtiServiceStub.java | 3 +- .../inez/storage/DeleteBridiServiceStub.java | 3 +- .../storage/NotifyStoreChangeServiceStub.java | 3 +- .../storage/RemoveReferencesServiceStub.java | 3 +- .../inez/storage/SaveBridiServiceStub.java | 3 +- .../BridiStoreHistoryServiceStub.java | 9 ++--- .../repository/SumtiRepositoryStub.java | 21 ---------- inez.model.tests/src/main/resources/relatives | 4 ++ inez.model.tests/src/main/resources/sumties | 10 ++--- 27 files changed, 153 insertions(+), 134 deletions(-) create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java create mode 100644 inez.model.tests/src/main/resources/relatives diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java index 2bff35a..35db835 100644 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java @@ -7,22 +7,18 @@ import io.github.magwas.runtime.RuntimeConstants; import io.github.magwas.testing.TestUtil; -public class BridiTestDataGenerator implements Supplier { - String BRIDI_PATTERN = "\tBridi {0} = new Bridi({1}, {2},{3});\n"; +public class BridiTestDataGenerator + implements Supplier, GeneratorPatternConstants { @Override public StringBuilder get() { - StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" - import java.util.List; - import io.github.magwas.inez.parse.IdTestData; - import io.github.magwas.inez.parse.IdUtil; - import io.github.magwas.inez.parse.ParserConstants; - import io.github.magwas.inez.parse.ReferenceTestData; - - """, "IdTestData", "ReferenceTestData"); + StringBuilder builder = GeneratorUtil.testDataBoilerPlate( + BRIDI_TEST_DATA_HEADER, "IdTestData", "ReferenceTestData"); String bridies = TestUtil.loadResourceAsString("bridies"); - GeneratorUtil.mapToCode(bridies, line -> MessageFormat.format(BRIDI_PATTERN, - (Object[]) line.split(RuntimeConstants.COMMA, 4)), builder); + GeneratorUtil.mapToCode(bridies, + line -> MessageFormat.format(BRIDI_TEST_DATA_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA, 4)), + builder); return GeneratorUtil.testDataTail(builder); } diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java new file mode 100644 index 0000000..eebacb6 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java @@ -0,0 +1,39 @@ +package io.github.magwas.inez; + +public interface GeneratorPatternConstants { + String GET_RELATIVE_FOR_BRIDI_ELEMENT_PATTERN = "\twhen(mock.apply({0}_ID, {1}_ID, {2}, {3})).thenReturn(Stream.of({4}_ID));\n"; + String BRIDI_TEST_DATA_PATTERN = "\tBridi {0} = new Bridi({1}, {2},{3});\n"; + String BRIDI_TEST_DATA_HEADER = """ + import java.util.List; + import io.github.magwas.inez.parse.IdTestData; + import io.github.magwas.inez.parse.IdUtil; + import io.github.magwas.inez.parse.ParserConstants; + import io.github.magwas.inez.parse.ReferenceTestData; + + """; + String SUMTI_REPOSITORY_STUB_PATTERN = "\twhen(mock.findById({0}_ID)).thenReturn(Optional.of({0}_SUMTI));\n"; + String SUMTI_REPOSITORY_STUB_EXTRA = "\twhen(mock.findAllByRepresentation(GO_REPR)).thenReturn(Set.of(GO_SUMTI, GO2_SUMTI));\n"; + String SUMTI_REPOSITORY_STUB_HEADER = """ + import java.util.Set; + import java.util.Optional; + import io.github.magwas.inez.storage.model.SumtiTestData; + """; + String SUMTI_TESTDATA_PATTERN = "\tSumti {0}_SUMTI = new Sumti({1}, {2});\n"; + String BRIDI_REFERENCE_PATTERN = """ + BridiReference {0}_REFERENCE_0 = new BridiReference( + IdUtil.createID({0}_ID+0), {0}_ID, {1}_ID, 0, {1}_ID); + BridiReference {0}_REFERENCE_1 = new BridiReference( + IdUtil.createID({0}_ID+1), {0}_ID, {1}_ID, 1, {2}_ID); + BridiReference {0}_REFERENCE_2 = new BridiReference( + IdUtil.createID({0}_ID+2), {0}_ID, {1}_ID, 2, {3}_ID); + List {0}_REFERENCELIST = List.of( + {0}_REFERENCE_0, {0}_REFERENCE_1, + {0}_REFERENCE_2); + """; + String BRIDI_REFERENCE_HEADER = """ + import io.github.magwas.inez.parse.IdTestData; + import io.github.magwas.inez.parse.IdUtil; + import java.util.List; + """; + +} diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java new file mode 100644 index 0000000..5c597e3 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java @@ -0,0 +1,27 @@ +package io.github.magwas.inez.element; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.inez.GeneratorPatternConstants; +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class GetRelativeForBridiElementServiceStubGenerator + implements Supplier, GeneratorPatternConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.stubBoilerPlate(""" + import java.util.stream.Stream; + """, "BridiElementTestData"); + String relatives = TestUtil.loadResourceAsString("relatives"); + GeneratorUtil.mapToCode(relatives, + line -> MessageFormat.format(GET_RELATIVE_FOR_BRIDI_ELEMENT_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA)), + builder); + return GeneratorUtil.stubTail(builder); + } + +} diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java index 02c49a5..1127ad8 100644 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java @@ -3,31 +3,18 @@ import java.text.MessageFormat; import java.util.function.Supplier; +import io.github.magwas.inez.GeneratorPatternConstants; import io.github.magwas.runtime.GeneratorUtil; import io.github.magwas.runtime.RuntimeConstants; import io.github.magwas.testing.TestUtil; public class BridiReferenceTestDataGenerator - implements Supplier { - String BRIDI_REFERENCE_PATTERN = """ - BridiReference {0}_REFERENCE_0 = new BridiReference( - IdUtil.createID({0}_ID+0), {0}_ID, {1}_ID, 0, {1}_ID); - BridiReference {0}_REFERENCE_1 = new BridiReference( - IdUtil.createID({0}_ID+1), {0}_ID, {1}_ID, 1, {2}_ID); - BridiReference {0}_REFERENCE_2 = new BridiReference( - IdUtil.createID({0}_ID+2), {0}_ID, {1}_ID, 2, {3}_ID); - List {0}_REFERENCELIST = List.of( - {0}_REFERENCE_0, {0}_REFERENCE_1, - {0}_REFERENCE_2); - """; + implements Supplier, GeneratorPatternConstants { @Override public StringBuilder get() { - StringBuilder builder = GeneratorUtil.testDataBoilerPlate(""" - import io.github.magwas.inez.parse.IdTestData; - import io.github.magwas.inez.parse.IdUtil; - import java.util.List; - """, "IdTestData"); + StringBuilder builder = GeneratorUtil + .testDataBoilerPlate(BRIDI_REFERENCE_HEADER, "IdTestData"); String bridireferences = TestUtil.loadResourceAsString("bridireferences"); GeneratorUtil.mapToCode(bridireferences, line -> MessageFormat.format(BRIDI_REFERENCE_PATTERN, diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java index b180e79..166ba7f 100644 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java @@ -3,20 +3,23 @@ import java.text.MessageFormat; import java.util.function.Supplier; +import io.github.magwas.inez.GeneratorPatternConstants; import io.github.magwas.runtime.GeneratorUtil; import io.github.magwas.runtime.RuntimeConstants; import io.github.magwas.testing.TestUtil; -public class SumtiTestDataGenerator implements Supplier { - String SUMTI_PATTERN = "\tSumti {0} = new Sumti({1}, {2});\n"; +public class SumtiTestDataGenerator + implements Supplier, GeneratorPatternConstants { @Override public StringBuilder get() { StringBuilder builder = GeneratorUtil.testDataBoilerPlate( "import io.github.magwas.inez.parse.IdTestData;", "IdTestData"); String sumties = TestUtil.loadResourceAsString("sumties"); - GeneratorUtil.mapToCode(sumties, line -> MessageFormat.format(SUMTI_PATTERN, - (Object[]) line.split(RuntimeConstants.COMMA)), builder); + GeneratorUtil.mapToCode(sumties, + line -> MessageFormat.format(SUMTI_TESTDATA_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA)), + builder); return GeneratorUtil.testDataTail(builder); } diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java new file mode 100644 index 0000000..568a0e0 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java @@ -0,0 +1,27 @@ +package io.github.magwas.inez.storage.repository; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.inez.GeneratorPatternConstants; +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class SumtiRepositoryStubGenerator + implements Supplier, GeneratorPatternConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil + .stubBoilerPlate(SUMTI_REPOSITORY_STUB_HEADER, "SumtiTestData"); + String sumties = TestUtil.loadResourceAsString("sumties"); + GeneratorUtil.mapToCode(sumties, + line -> MessageFormat.format(SUMTI_REPOSITORY_STUB_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA)), + builder); + builder.append(SUMTI_REPOSITORY_STUB_EXTRA); + return GeneratorUtil.stubTail(builder); + } + +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemTestData.java index d69900d..7c2643a 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemTestData.java @@ -7,6 +7,6 @@ public interface InezProblemTestData extends SumtiTestData { InezProblem PROBLEM = - new InezProblem("each element is within a containerID", "each element is within a container", GO1_SUMTI); + new InezProblem("each element is within a containerID", "each element is within a container", GO_SUMTI); List PROBLEMS = List.of(PROBLEM); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java index 0d03692..849a8a9 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class BridiElementSystemInitializationServiceStub { -} +public class BridiElementSystemInitializationServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java deleted file mode 100644 index f259d42..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStub.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.github.magwas.inez.element; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.stream.Stream; - -public class GetRelativeForBridiElementServiceStub implements BridiElementTestData { - public static GetRelativeForBridiElementService stub() { - GetRelativeForBridiElementService mock = mock(GetRelativeForBridiElementService.class); - when(mock.apply(HUMAN_ID, IS_A_ID, 1, 2)).thenReturn(Stream.of(THING_ID)); - when(mock.apply(ROOT_ID, IS_A_ID, 1, 2)).thenReturn(Stream.of(CONTAINER_ID)); - when(mock.apply(MY_MODEL_ID, IS_A_ID, 1, 2)).thenReturn(Stream.of(FOLDER_ID)); - when(mock.apply(FOLDER_ID, IS_A_ID, 1, 2)).thenReturn(Stream.of(CONTAINER_ID)); - return mock; - } -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java index 1c1bd82..35d4341 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class CreateBridisFromDefinitionServiceStub { -} +public class CreateBridisFromDefinitionServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java index 878d4e2..0abca87 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class CreateBridisFromParserOutputServiceStub { -} +public class CreateBridisFromParserOutputServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java index fb09bfc..419d9f2 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class CreateBridisFromQueryServiceStub { -} +public class CreateBridisFromQueryServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java index 9dda2c3..040ca6d 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class QueryProcessorServiceStub { -} +public class QueryProcessorServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java index f567082..349877f 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java @@ -31,79 +31,70 @@ void test() { @Test @DisplayName("for an existing sumti returns the sumti") void test_1() { - TestUtil.assertStreamEquals(Set.of(THING), - queryProcessor.apply(THING_REPR)); + TestUtil.assertStreamEquals(Set.of(THING), queryProcessor.apply(THING_REPR)); } @Test @DisplayName("if more sumtis exist with the representation, return them all") void test_2() { - TestUtil.assertStreamEquals(Set.of(GO1, GO2), - queryProcessor.apply(GO_REPR)); + TestUtil.assertStreamEquals(Set.of(GO1, GO2), queryProcessor.apply(GO_REPR)); } @Test @DisplayName("for a reference, return the referenced bridi") void test_3() { LogUtil.addDebuggedClass(QueryProcessorService.class); - TestUtil.assertStreamEquals(Set.of(GO1), - queryProcessor.apply(GO1_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(GO1), queryProcessor.apply(GO1_REFERENCE)); } @Test @DisplayName("for a reference to a nonexisting bridi, return an empty list") void test_5() { - TestUtil.assertStreamEquals(Set.of(), - queryProcessor.apply(NONEXISTENT_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONEXISTENT_REFERENCE)); } @Test @DisplayName("for a bridi with the matching representation returns it") void test_4() { - TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), - queryProcessor.apply(SUMTI_IS_A_THING_REPR)); + TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), queryProcessor.apply(SUMTI_IS_A_THING_REPR)); } @Test @DisplayName("for a bridi where the representation does not match, but the selbri and sumties do, finds it") void test_6() { - TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), - queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); + TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); } @Test @DisplayName("'$?' returns a list of the any sumti") void test_7() { - TestUtil.assertStreamEquals(Set.of(ANY), - queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); + TestUtil.assertStreamEquals(Set.of(ANY), queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); } @Test @DisplayName("for a bridi where one of the sumties is '$?', the matching bridies return") void test1() { - TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, - queryProcessor.apply(SIMPLE_INPUT)); + TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, queryProcessor.apply(SIMPLE_INPUT)); } @Test @DisplayName("for a bridi where all of the sumties is '$?', a ParseCancellationException is thrown") void test1_1() { - assertThrows(ParseCancellationException.class, + assertThrows( + ParseCancellationException.class, () -> queryProcessor.apply(ALL_ANY_INPUT).toArray()); } @Test @DisplayName("if no stored bridi matches the query with '$?', and empty list is returned") void test2() { - TestUtil.assertStreamEquals(Set.of(), - queryProcessor.apply(NONMATCHING_INPUT)); + TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONMATCHING_INPUT)); } @Test @DisplayName("query works with the '$?' being deep down in the query") void test3() { Stream actual = queryProcessor.apply(RECURSIVE_INPUT); - TestUtil.assertStreamEquals( - Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); + TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java index f766289..3bbd11b 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java @@ -6,8 +6,7 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.RepresentationTestData; -public interface QueryProcessorTestData - extends RepresentationTestData, BridiTestData { +public interface QueryProcessorTestData extends RepresentationTestData, BridiTestData { String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR + "\n" + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA_REPR + "\n" + ALICE_EATS_CHIPS_REPR + "\n" + BOB_EATS_BANANA_REPR + "\n" @@ -16,7 +15,6 @@ public interface QueryProcessorTestData + TAUTOLOGY_GENERATED_REPR; String SAVE_CLASS_NAME = "io.github.magwas.inez.functions.Save"; - Set SIMPLE_QUERY_OUTPUT = Set.of(TAUTOLOGY, - SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); - + Set SIMPLE_QUERY_OUTPUT = + Set.of(TAUTOLOGY, SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java index 4b95170..3f93ea5 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class AddReferencesServiceStub { -} +public class AddReferencesServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java index 7f6238f..4a9aafe 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class BridiStoreChangeListenersServiceStub { -} +public class BridiStoreChangeListenersServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java index 72fe32b..145a99a 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java @@ -12,7 +12,7 @@ public static CreateBridiFromSumtiService stub() { when(mock.apply(THING_SUMTI)).thenReturn(THING); when(mock.apply(SUMTI_IS_A_THING_CHANGED_SUMTI)).thenReturn(SUMTI_IS_A_THING_CHANGED); when(mock.apply(SUMTI_IS_A_THING_SUMTI)).thenReturn(SUMTI_IS_A_THING); - when(mock.apply(GO1_SUMTI)).thenReturn(GO1); + when(mock.apply(GO_SUMTI)).thenReturn(GO1); when(mock.apply(GO2_SUMTI)).thenReturn(GO2); when(mock.apply(null)).thenThrow(new NullPointerException()); return mock; diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java index 458fe3c..02d6b9a 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class CreateSumtiServiceStub { -} +public class CreateSumtiServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java index 85e8018..9610a94 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class DeleteBridiServiceStub { -} +public class DeleteBridiServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java index cabf8bf..4218ea2 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class NotifyStoreChangeServiceStub { -} +public class NotifyStoreChangeServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java index d943d56..9df413f 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class RemoveReferencesServiceStub { -} +public class RemoveReferencesServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java index 7613b2a..e018b3d 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java @@ -3,5 +3,4 @@ import io.github.magwas.testing.IndirectlyTested; @IndirectlyTested -public class SaveBridiServiceStub { -} +public class SaveBridiServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java index 0fc188e..1f84840 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java @@ -1,9 +1,6 @@ package io.github.magwas.inez.storage.repository; -import static org.mockito.Mockito.mock; +import io.github.magwas.testing.IndirectlyTested; -public class BridiStoreHistoryServiceStub { - public static BridiStoreHistoryRepository stub() { - return mock(BridiStoreHistoryRepository.class); - } -} +@IndirectlyTested +public class BridiStoreHistoryServiceStub {} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java deleted file mode 100644 index f1bc513..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/SumtiRepositoryStub.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.magwas.inez.storage.repository; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.Optional; -import java.util.Set; - -import io.github.magwas.inez.storage.model.SumtiTestData; - -public class SumtiRepositoryStub implements SumtiTestData { - public static SumtiRepository stub() { - SumtiRepository mock = mock(SumtiRepository.class); - when(mock.findById(THING_ID)).thenReturn(Optional.of(THING_SUMTI)); - when(mock.findById(SUMTI_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING_SUMTI)); - when(mock.findById(SUMTI_ID)).thenReturn(Optional.empty()); - - when(mock.findAllByRepresentation(GO_REPR)).thenReturn(Set.of(GO1_SUMTI, GO2_SUMTI)); - return mock; - } -} diff --git a/inez.model.tests/src/main/resources/relatives b/inez.model.tests/src/main/resources/relatives new file mode 100644 index 0000000..293d94e --- /dev/null +++ b/inez.model.tests/src/main/resources/relatives @@ -0,0 +1,4 @@ +HUMAN,IS_A,1,2,THING +ROOT,IS_A,1,2,CONTAINER +MY_MODEL,IS_A,1,2,FOLDER +FOLDER,IS_A,1,2,CONTAINER diff --git a/inez.model.tests/src/main/resources/sumties b/inez.model.tests/src/main/resources/sumties index 053270c..a7513b5 100644 --- a/inez.model.tests/src/main/resources/sumties +++ b/inez.model.tests/src/main/resources/sumties @@ -1,5 +1,5 @@ -THING_SUMTI,THING_ID,THING_REPR -SUMTI_IS_A_THING_SUMTI,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_REPR -SUMTI_IS_A_THING_CHANGED_SUMTI,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_CHANGED_REPR -GO1_SUMTI,GO_ID,GO_REPR -GO2_SUMTI,GO2_ID,GO_REPR +THING,THING_ID,THING_REPR +SUMTI_IS_A_THING,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_REPR +SUMTI_IS_A_THING_CHANGED,SUMTI_IS_A_THING_ID,SUMTI_IS_A_THING_CHANGED_REPR +GO,GO_ID,GO_REPR +GO2,GO2_ID,GO_REPR From fea28763cf3a071cc2afe6e859df92f2e0b6de11 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Mon, 13 Oct 2025 06:27:53 +0200 Subject: [PATCH 09/11] generating FindAllByRepresentationServiceStub, FindAllIdByRepresentationServiceStub closes: #39,47 --- .../inez/GeneratorPatternConstants.java | 8 +++++ ...lByRepresentationServiceStubGenerator.java | 26 +++++++++++++++ ...dByRepresentationServiceStubGenerator.java | 28 ++++++++++++++++ .../magwas/inez/query/QueryProcessorTest.java | 32 ++++++++++++------- .../inez/storage/BridiStoreEndToEndTest.java | 22 +++++++------ .../CreateBridiFromSumtiServiceStub.java | 8 +++-- .../FindAllByRepresentationServiceStub.java | 20 ------------ .../storage/FindAllByRepresentationTest.java | 3 +- .../FindAllIdByRepresentationServiceStub.java | 23 ------------- .../storage/FindBridiByIdServiceStub.java | 17 ++++++---- inez.model.tests/src/main/resources/bridies | 2 +- .../src/main/resources/byrepresentation | 5 +++ inez.parser.tests/src/main/resources/ids | 1 + 13 files changed, 120 insertions(+), 75 deletions(-) create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java create mode 100644 inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java create mode 100644 inez.model.tests/src/main/resources/byrepresentation diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java index eebacb6..8252cc2 100644 --- a/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java @@ -35,5 +35,13 @@ public interface GeneratorPatternConstants { import io.github.magwas.inez.parse.IdUtil; import java.util.List; """; + String FIND_ALL_BY_REPRESENTATION_STUB_HEADER = """ + import java.util.stream.Stream; + + import io.github.magwas.inez.BridiTestData; + import io.github.magwas.inez.parse.ParserConstants; + """; + String FIND_ALL_ID_BY_REPRESENTATION_STUB_PATTERN = "\t\twhen(mock.apply({0})).thenAnswer((args) -> Stream.of({1}));\n"; + String FIND_ALL_BY_REPRESENTATION_STUB_PATTERN = "\t\twhen(mock.apply({0})).thenAnswer((args) -> Stream.of({1}));\n"; } diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java new file mode 100644 index 0000000..d67ff57 --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java @@ -0,0 +1,26 @@ +package io.github.magwas.inez.storage; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.inez.GeneratorPatternConstants; +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class FindAllByRepresentationServiceStubGenerator + implements Supplier, GeneratorPatternConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.stubBoilerPlate( + FIND_ALL_BY_REPRESENTATION_STUB_HEADER, "BridiTestData"); + String sumties = TestUtil.loadResourceAsString("byrepresentation"); + GeneratorUtil.mapToCode(sumties, line -> { + return MessageFormat.format(FIND_ALL_BY_REPRESENTATION_STUB_PATTERN, + (Object[]) line.split(RuntimeConstants.COMMA, 2)); + }, builder); + return GeneratorUtil.stubTail(builder); + } + +} diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java new file mode 100644 index 0000000..2937fec --- /dev/null +++ b/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java @@ -0,0 +1,28 @@ +package io.github.magwas.inez.storage; + +import java.text.MessageFormat; +import java.util.function.Supplier; + +import io.github.magwas.inez.GeneratorPatternConstants; +import io.github.magwas.runtime.GeneratorUtil; +import io.github.magwas.runtime.RuntimeConstants; +import io.github.magwas.testing.TestUtil; + +public class FindAllIdByRepresentationServiceStubGenerator + implements Supplier, GeneratorPatternConstants { + + @Override + public StringBuilder get() { + StringBuilder builder = GeneratorUtil.stubBoilerPlate( + FIND_ALL_BY_REPRESENTATION_STUB_HEADER, "BridiTestData"); + String sumties = TestUtil.loadResourceAsString("byrepresentation"); + GeneratorUtil.mapToCode(sumties, line -> { + String[] parts = line.split(RuntimeConstants.COMMA, 2); + String[] rest = parts[1].split(RuntimeConstants.COMMA); + return MessageFormat.format(FIND_ALL_ID_BY_REPRESENTATION_STUB_PATTERN, + parts[0], parts[1].replaceAll(",", "_ID,").replaceAll("$", "_ID")); + }, builder); + return GeneratorUtil.stubTail(builder); + } + +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java index 349877f..fb1ccd8 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java @@ -31,70 +31,78 @@ void test() { @Test @DisplayName("for an existing sumti returns the sumti") void test_1() { - TestUtil.assertStreamEquals(Set.of(THING), queryProcessor.apply(THING_REPR)); + TestUtil.assertStreamEquals(Set.of(THING), + queryProcessor.apply(THING_REPR)); } @Test @DisplayName("if more sumtis exist with the representation, return them all") void test_2() { - TestUtil.assertStreamEquals(Set.of(GO1, GO2), queryProcessor.apply(GO_REPR)); + TestUtil.assertStreamEquals(Set.of(GO, GO2), queryProcessor.apply(GO_REPR)); } @Test @DisplayName("for a reference, return the referenced bridi") void test_3() { LogUtil.addDebuggedClass(QueryProcessorService.class); - TestUtil.assertStreamEquals(Set.of(GO1), queryProcessor.apply(GO1_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(GO), + queryProcessor.apply(GO1_REFERENCE)); } @Test @DisplayName("for a reference to a nonexisting bridi, return an empty list") void test_5() { - TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONEXISTENT_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(), + queryProcessor.apply(NONEXISTENT_REFERENCE)); } @Test @DisplayName("for a bridi with the matching representation returns it") void test_4() { - TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), queryProcessor.apply(SUMTI_IS_A_THING_REPR)); + TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), + queryProcessor.apply(SUMTI_IS_A_THING_REPR)); } @Test @DisplayName("for a bridi where the representation does not match, but the selbri and sumties do, finds it") void test_6() { - TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); + TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), + queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); } @Test @DisplayName("'$?' returns a list of the any sumti") void test_7() { - TestUtil.assertStreamEquals(Set.of(ANY), queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); + TestUtil.assertStreamEquals(Set.of(ANY), + queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); } @Test @DisplayName("for a bridi where one of the sumties is '$?', the matching bridies return") void test1() { - TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, queryProcessor.apply(SIMPLE_INPUT)); + TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, + queryProcessor.apply(SIMPLE_INPUT)); } @Test @DisplayName("for a bridi where all of the sumties is '$?', a ParseCancellationException is thrown") void test1_1() { - assertThrows( - ParseCancellationException.class, + assertThrows(ParseCancellationException.class, () -> queryProcessor.apply(ALL_ANY_INPUT).toArray()); } @Test @DisplayName("if no stored bridi matches the query with '$?', and empty list is returned") void test2() { - TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONMATCHING_INPUT)); + TestUtil.assertStreamEquals(Set.of(), + queryProcessor.apply(NONMATCHING_INPUT)); } @Test @DisplayName("query works with the '$?' being deep down in the query") void test3() { Stream actual = queryProcessor.apply(RECURSIVE_INPUT); - TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); + TestUtil.assertStreamEquals( + Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java index ede34b5..3bc7833 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java @@ -32,25 +32,29 @@ class BridiStoreEndToEndTest implements QueryProcessorTestData, BridiTestData { @Test void test() { inez.create(TEST_TEXT).toArray(); - assertEquals(List.of(ALICE), inez.findAllByRepresentation("alice").toList()); + assertEquals(List.of(ALICE), + inez.findAllByRepresentation("alice").toList()); - inez.save(Set.of(GO1, GO2)); + inez.save(Set.of(GO, GO2)); inez.findAllByRepresentation(GO_REPR).forEach(x -> LogUtil.debug("go", x)); String CECILE_EATS_BANANA_REPR = "{cecile} {{eats} {banana}}"; String CECILE_LOOKS_AT_BANANA_REPR = "{cecile} {{looks at} {banana}}"; - Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, inez.query(CECILE_EATS_BANANA_REPR)); - Bridi ceclie_looks_at_banana = - assertGotTheBridi(CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); + Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, + inez.query(CECILE_EATS_BANANA_REPR)); + Bridi ceclie_looks_at_banana = assertGotTheBridi( + CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); TestUtil.assertStreamEquals( - Set.of(cecile_eats_banana, ceclie_looks_at_banana), inez.query("{cecile} {{$?} {banana}}")); + Set.of(cecile_eats_banana, ceclie_looks_at_banana), + inez.query("{cecile} {{$?} {banana}}")); - Bridi looks_at_banana = - inez.findById(ceclie_looks_at_banana.references().get(2)).get(); + Bridi looks_at_banana = inez + .findById(ceclie_looks_at_banana.references().get(2)).get(); Bridi looks_at = inez.findById(looks_at_banana.references().get(1)).get(); assertEquals("looks at", looks_at.representation()); } - private Bridi assertGotTheBridi(final String expected, final Stream actual) { + private Bridi assertGotTheBridi(final String expected, + final Stream actual) { List actualList = actual.toList(); assertEquals(1, actualList.size()); Bridi bridi = actualList.get(0); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java index 145a99a..eae3e6b 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java @@ -6,13 +6,15 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.storage.model.SumtiTestData; -public class CreateBridiFromSumtiServiceStub implements BridiTestData, SumtiTestData { +public class CreateBridiFromSumtiServiceStub + implements BridiTestData, SumtiTestData { public static CreateBridiFromSumtiService stub() { CreateBridiFromSumtiService mock = mock(CreateBridiFromSumtiService.class); when(mock.apply(THING_SUMTI)).thenReturn(THING); - when(mock.apply(SUMTI_IS_A_THING_CHANGED_SUMTI)).thenReturn(SUMTI_IS_A_THING_CHANGED); + when(mock.apply(SUMTI_IS_A_THING_CHANGED_SUMTI)) + .thenReturn(SUMTI_IS_A_THING_CHANGED); when(mock.apply(SUMTI_IS_A_THING_SUMTI)).thenReturn(SUMTI_IS_A_THING); - when(mock.apply(GO_SUMTI)).thenReturn(GO1); + when(mock.apply(GO_SUMTI)).thenReturn(GO); when(mock.apply(GO2_SUMTI)).thenReturn(GO2); when(mock.apply(null)).thenThrow(new NullPointerException()); return mock; diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java deleted file mode 100644 index fb15832..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStub.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.github.magwas.inez.storage; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.stream.Stream; - -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.parse.ParserConstants; - -public class FindAllByRepresentationServiceStub implements BridiTestData { - public static FindAllByRepresentationService stub() { - FindAllByRepresentationService mock = mock(FindAllByRepresentationService.class); - when(mock.apply(THING_REPR)).thenAnswer((args) -> Stream.of(THING)); - when(mock.apply(GO_REPR)).thenAnswer((args) -> Stream.of(GO1, GO2)); - when(mock.apply(SUMTI_IS_A_THING_REPR)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING)); - when(mock.apply(ParserConstants.QUERY_BRIDI_ID)).thenAnswer((args) -> Stream.of(ANY)); - return mock; - } -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java index fe7de14..fe66dca 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java @@ -20,6 +20,7 @@ class FindAllByRepresentationTest extends TestBase implements BridiTestData { @Test @DisplayName("finds all bridis based on a representation") void test() { - assertEquals(Set.of(GO1, GO2), findAllByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); + assertEquals(Set.of(GO, GO2), + findAllByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java deleted file mode 100644 index cbefecf..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStub.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.github.magwas.inez.storage; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.stream.Stream; - -import io.github.magwas.inez.BridiTestData; -import io.github.magwas.inez.parse.ParserConstants; - -public class FindAllIdByRepresentationServiceStub implements BridiTestData { - public static FindAllIdByRepresentationService stub() { - FindAllIdByRepresentationService mock = mock(FindAllIdByRepresentationService.class); - when(mock.apply(THING_REPR)).thenAnswer((args) -> Stream.of(THING_ID)); - when(mock.apply(GO_REPR)).thenAnswer((args) -> Stream.of(GO_ID, GO2_ID)); - when(mock.apply(SUMTI_IS_A_THING_REPR)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); - when(mock.apply(ParserConstants.QUERY_BRIDI_ID)) - .thenAnswer((args) -> Stream.of(ParserConstants.QUERY_BRIDI_ID)); - when(mock.apply(IS_A_REPR)).thenAnswer((args) -> Stream.of(IS_A_ID)); - - return mock; - } -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java index 93516e2..3d8a8c6 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java @@ -11,19 +11,24 @@ public class FindBridiByIdServiceStub implements BridiTestData { public static FindBridiByIdService stub() { FindBridiByIdService mock = mock(FindBridiByIdService.class); - when(mock.apply(GO_ID)).thenReturn(Optional.of(GO1)); + when(mock.apply(GO_ID)).thenReturn(Optional.of(GO)); when(mock.apply(GO2_ID)).thenReturn(Optional.of(GO2)); - when(mock.apply(SUMTI_IS_A_THING_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING_IS_A_THING)); - when(mock.apply(TAUTOLOGY_IS_A_THING_ID)).thenReturn(Optional.of(TAUTOLOGY_IS_A_THING)); + when(mock.apply(SUMTI_IS_A_THING_IS_A_THING_ID)) + .thenReturn(Optional.of(SUMTI_IS_A_THING_IS_A_THING)); + when(mock.apply(TAUTOLOGY_IS_A_THING_ID)) + .thenReturn(Optional.of(TAUTOLOGY_IS_A_THING)); when(mock.apply(THING_ID)).thenReturn(Optional.of(THING)); when(mock.apply("thung")).thenReturn(Optional.of(THING_CHANGED)); when(mock.apply(SUMTI_ID)).thenReturn(Optional.of(SUMTI)); when(mock.apply(BRIDI_ID)).thenReturn(Optional.of(BRIDI)); when(mock.apply(IS_A_ID)).thenReturn(Optional.of(IS_A)); - when(mock.apply(ParserConstants.QUERY_BRIDI_ID)).thenReturn(Optional.of(ANY)); - when(mock.apply(SUMTI_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING)); + when(mock.apply(ParserConstants.QUERY_BRIDI_ID)) + .thenReturn(Optional.of(ANY)); + when(mock.apply(SUMTI_IS_A_THING_ID)) + .thenReturn(Optional.of(SUMTI_IS_A_THING)); when(mock.apply(TAUTOLOGY_ID)).thenReturn(Optional.of(TAUTOLOGY)); - when(mock.apply(THING_IS_A_SUMTI_ID)).thenReturn(Optional.of(THING_IS_A_SUMTI)); + when(mock.apply(THING_IS_A_SUMTI_ID)) + .thenReturn(Optional.of(THING_IS_A_SUMTI)); when(mock.apply(GOD_ID)).thenReturn(Optional.of(GOD)); when(mock.apply(HUMAN_ID)).thenReturn(Optional.of(HUMAN)); when(mock.apply(MY_MODEL_ID)).thenReturn(Optional.of(MY_MODEL)); diff --git a/inez.model.tests/src/main/resources/bridies b/inez.model.tests/src/main/resources/bridies index ccb38c2..1cad13f 100644 --- a/inez.model.tests/src/main/resources/bridies +++ b/inez.model.tests/src/main/resources/bridies @@ -1,5 +1,5 @@ ALICE,IdUtil.createID(ALICE_REPR),ALICE_REPR,List.of() -GO1,GO_ID,GO_REPR,List.of() +GO,GO_ID,GO_REPR,List.of() GO2,GO2_ID,GO_REPR,List.of() SUMTI_IS_A_THING_IS_A_THING,SUMTI_IS_A_THING_IS_A_THING_ID,SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR,SUMTI_IS_A_THING_IS_A_THING_REFERENCES TAUTOLOGY_IS_A_THING,TAUTOLOGY_IS_A_THING_ID,TAUTOLOGY_IS_A_THING_REPR,SUMTI_IS_A_THING_IS_A_THING_REFERENCES diff --git a/inez.model.tests/src/main/resources/byrepresentation b/inez.model.tests/src/main/resources/byrepresentation new file mode 100644 index 0000000..acc71fe --- /dev/null +++ b/inez.model.tests/src/main/resources/byrepresentation @@ -0,0 +1,5 @@ +THING_REPR,THING +GO_REPR,GO, GO2 +SUMTI_IS_A_THING_REPR,SUMTI_IS_A_THING +ParserConstants.QUERY_BRIDI_ID,ANY +IS_A_REPR,IS_A diff --git a/inez.parser.tests/src/main/resources/ids b/inez.parser.tests/src/main/resources/ids index f61a9d3..772e21e 100644 --- a/inez.parser.tests/src/main/resources/ids +++ b/inez.parser.tests/src/main/resources/ids @@ -9,3 +9,4 @@ CONTAINS,CONTAINS ROOT,ROOT CONTAINER,CONTAINER STUFF_COULDBE_THING,STUFF_COULDBE_THING +ANY,? \ No newline at end of file From 88065d71dafce59d2ac414b84c4ce551639a347b Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Mon, 13 Oct 2025 06:35:58 +0200 Subject: [PATCH 10/11] fixup: formatting, review suggestions --- .../magwas/inez/query/QueryProcessorTest.java | 30 +++++++------------ .../inez/query/QueryProcessorTestData.java | 25 +++++++++------- .../inez/storage/BridiStoreEndToEndTest.java | 20 +++++-------- .../CreateBridiFromSumtiServiceStub.java | 6 ++-- .../storage/FindAllByRepresentationTest.java | 3 +- .../storage/FindBridiByIdServiceStub.java | 15 ++++------ inez.model.tests/src/main/resources/bridies | 2 +- .../CreateBridisFromParserOutputService.java | 20 +++++-------- .../magwas/inez/parse/ParseTextTest.java | 2 ++ inez.parser.tests/src/main/resources/ids | 2 +- 10 files changed, 54 insertions(+), 71 deletions(-) diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java index fb1ccd8..41fe95d 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java @@ -31,8 +31,7 @@ void test() { @Test @DisplayName("for an existing sumti returns the sumti") void test_1() { - TestUtil.assertStreamEquals(Set.of(THING), - queryProcessor.apply(THING_REPR)); + TestUtil.assertStreamEquals(Set.of(THING), queryProcessor.apply(THING_REPR)); } @Test @@ -45,64 +44,57 @@ void test_2() { @DisplayName("for a reference, return the referenced bridi") void test_3() { LogUtil.addDebuggedClass(QueryProcessorService.class); - TestUtil.assertStreamEquals(Set.of(GO), - queryProcessor.apply(GO1_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(GO), queryProcessor.apply(GO1_REFERENCE)); } @Test @DisplayName("for a reference to a nonexisting bridi, return an empty list") void test_5() { - TestUtil.assertStreamEquals(Set.of(), - queryProcessor.apply(NONEXISTENT_REFERENCE)); + TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONEXISTENT_REFERENCE)); } @Test @DisplayName("for a bridi with the matching representation returns it") void test_4() { - TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), - queryProcessor.apply(SUMTI_IS_A_THING_REPR)); + TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING), queryProcessor.apply(SUMTI_IS_A_THING_REPR)); } @Test @DisplayName("for a bridi where the representation does not match, but the selbri and sumties do, finds it") void test_6() { - TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), - queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); + TestUtil.assertStreamEquals(Set.of(TAUTOLOGY), queryProcessor.apply(TAUTOLOGY_GENERATED_REPR)); } @Test @DisplayName("'$?' returns a list of the any sumti") void test_7() { - TestUtil.assertStreamEquals(Set.of(ANY), - queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); + TestUtil.assertStreamEquals(Set.of(ANY), queryProcessor.apply(ParserConstants.QUERY_BRIDI_ID)); } @Test @DisplayName("for a bridi where one of the sumties is '$?', the matching bridies return") void test1() { - TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, - queryProcessor.apply(SIMPLE_INPUT)); + TestUtil.assertStreamEquals(SIMPLE_QUERY_OUTPUT, queryProcessor.apply(SIMPLE_INPUT)); } @Test @DisplayName("for a bridi where all of the sumties is '$?', a ParseCancellationException is thrown") void test1_1() { - assertThrows(ParseCancellationException.class, + assertThrows( + ParseCancellationException.class, () -> queryProcessor.apply(ALL_ANY_INPUT).toArray()); } @Test @DisplayName("if no stored bridi matches the query with '$?', and empty list is returned") void test2() { - TestUtil.assertStreamEquals(Set.of(), - queryProcessor.apply(NONMATCHING_INPUT)); + TestUtil.assertStreamEquals(Set.of(), queryProcessor.apply(NONMATCHING_INPUT)); } @Test @DisplayName("query works with the '$?' being deep down in the query") void test3() { Stream actual = queryProcessor.apply(RECURSIVE_INPUT); - TestUtil.assertStreamEquals( - Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); + TestUtil.assertStreamEquals(Set.of(SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING), actual); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java index 3bbd11b..75cc7cd 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java @@ -6,15 +6,20 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.RepresentationTestData; -public interface QueryProcessorTestData extends RepresentationTestData, BridiTestData { - String TEST_TEXT = SUMTI_IS_A_THING_IS_A_THING_NOREFERENCE_REPR + "\n" - + TAUTOLOGY_IS_A_THING_REPR + "\n" + ALICE_EATS_BANANA_REPR + "\n" - + ALICE_EATS_CHIPS_REPR + "\n" + BOB_EATS_BANANA_REPR + "\n" - + BOB_EATS_CHIPS_REPR + "\n" + CECILE_EATS_BANANA_REPR + "\n" - + CECILE_LOOKS_AT_BANANA_REPR + "\n" + SUMTI_IS_A_THING_REPR + "\n" - + TAUTOLOGY_GENERATED_REPR; - +public interface QueryProcessorTestData + extends RepresentationTestData, BridiTestData { + String TEST_TEXT = """ + {{sumti} is a {THING}} is a {THING} + {{THING} is a {THING}} is a {THING} + {alice} {{eats} {banana}} + {alice} {{eats} {chips}} + {bob} {{eats} {banana}} + {bob} {{eats} {chips}} + {cecile} {{eats} {banana}} + {cecile} {{looks at} {banana}} + {sumti} is a {THING} + {THING} is a {THING}"""; String SAVE_CLASS_NAME = "io.github.magwas.inez.functions.Save"; - Set SIMPLE_QUERY_OUTPUT = - Set.of(TAUTOLOGY, SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); + Set SIMPLE_QUERY_OUTPUT = Set.of(TAUTOLOGY, + SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java index 3bc7833..985aa84 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java @@ -32,29 +32,25 @@ class BridiStoreEndToEndTest implements QueryProcessorTestData, BridiTestData { @Test void test() { inez.create(TEST_TEXT).toArray(); - assertEquals(List.of(ALICE), - inez.findAllByRepresentation("alice").toList()); + assertEquals(List.of(ALICE), inez.findAllByRepresentation("alice").toList()); inez.save(Set.of(GO, GO2)); inez.findAllByRepresentation(GO_REPR).forEach(x -> LogUtil.debug("go", x)); String CECILE_EATS_BANANA_REPR = "{cecile} {{eats} {banana}}"; String CECILE_LOOKS_AT_BANANA_REPR = "{cecile} {{looks at} {banana}}"; - Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, - inez.query(CECILE_EATS_BANANA_REPR)); - Bridi ceclie_looks_at_banana = assertGotTheBridi( - CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); + Bridi cecile_eats_banana = assertGotTheBridi(CECILE_EATS_BANANA_REPR, inez.query(CECILE_EATS_BANANA_REPR)); + Bridi ceclie_looks_at_banana = + assertGotTheBridi(CECILE_LOOKS_AT_BANANA_REPR, inez.query(CECILE_LOOKS_AT_BANANA_REPR)); TestUtil.assertStreamEquals( - Set.of(cecile_eats_banana, ceclie_looks_at_banana), - inez.query("{cecile} {{$?} {banana}}")); + Set.of(cecile_eats_banana, ceclie_looks_at_banana), inez.query("{cecile} {{$?} {banana}}")); - Bridi looks_at_banana = inez - .findById(ceclie_looks_at_banana.references().get(2)).get(); + Bridi looks_at_banana = + inez.findById(ceclie_looks_at_banana.references().get(2)).get(); Bridi looks_at = inez.findById(looks_at_banana.references().get(1)).get(); assertEquals("looks at", looks_at.representation()); } - private Bridi assertGotTheBridi(final String expected, - final Stream actual) { + private Bridi assertGotTheBridi(final String expected, final Stream actual) { List actualList = actual.toList(); assertEquals(1, actualList.size()); Bridi bridi = actualList.get(0); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java index eae3e6b..974b528 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java @@ -6,13 +6,11 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.storage.model.SumtiTestData; -public class CreateBridiFromSumtiServiceStub - implements BridiTestData, SumtiTestData { +public class CreateBridiFromSumtiServiceStub implements BridiTestData, SumtiTestData { public static CreateBridiFromSumtiService stub() { CreateBridiFromSumtiService mock = mock(CreateBridiFromSumtiService.class); when(mock.apply(THING_SUMTI)).thenReturn(THING); - when(mock.apply(SUMTI_IS_A_THING_CHANGED_SUMTI)) - .thenReturn(SUMTI_IS_A_THING_CHANGED); + when(mock.apply(SUMTI_IS_A_THING_CHANGED_SUMTI)).thenReturn(SUMTI_IS_A_THING_CHANGED); when(mock.apply(SUMTI_IS_A_THING_SUMTI)).thenReturn(SUMTI_IS_A_THING); when(mock.apply(GO_SUMTI)).thenReturn(GO); when(mock.apply(GO2_SUMTI)).thenReturn(GO2); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java index fe66dca..989a247 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java @@ -20,7 +20,6 @@ class FindAllByRepresentationTest extends TestBase implements BridiTestData { @Test @DisplayName("finds all bridis based on a representation") void test() { - assertEquals(Set.of(GO, GO2), - findAllByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); + assertEquals(Set.of(GO, GO2), findAllByRepresentation.apply(GO_REPR).collect(Collectors.toSet())); } } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java index 3d8a8c6..fdbe7d2 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java +++ b/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java @@ -13,22 +13,17 @@ public static FindBridiByIdService stub() { FindBridiByIdService mock = mock(FindBridiByIdService.class); when(mock.apply(GO_ID)).thenReturn(Optional.of(GO)); when(mock.apply(GO2_ID)).thenReturn(Optional.of(GO2)); - when(mock.apply(SUMTI_IS_A_THING_IS_A_THING_ID)) - .thenReturn(Optional.of(SUMTI_IS_A_THING_IS_A_THING)); - when(mock.apply(TAUTOLOGY_IS_A_THING_ID)) - .thenReturn(Optional.of(TAUTOLOGY_IS_A_THING)); + when(mock.apply(SUMTI_IS_A_THING_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING_IS_A_THING)); + when(mock.apply(TAUTOLOGY_IS_A_THING_ID)).thenReturn(Optional.of(TAUTOLOGY_IS_A_THING)); when(mock.apply(THING_ID)).thenReturn(Optional.of(THING)); when(mock.apply("thung")).thenReturn(Optional.of(THING_CHANGED)); when(mock.apply(SUMTI_ID)).thenReturn(Optional.of(SUMTI)); when(mock.apply(BRIDI_ID)).thenReturn(Optional.of(BRIDI)); when(mock.apply(IS_A_ID)).thenReturn(Optional.of(IS_A)); - when(mock.apply(ParserConstants.QUERY_BRIDI_ID)) - .thenReturn(Optional.of(ANY)); - when(mock.apply(SUMTI_IS_A_THING_ID)) - .thenReturn(Optional.of(SUMTI_IS_A_THING)); + when(mock.apply(ParserConstants.QUERY_BRIDI_ID)).thenReturn(Optional.of(ANY)); + when(mock.apply(SUMTI_IS_A_THING_ID)).thenReturn(Optional.of(SUMTI_IS_A_THING)); when(mock.apply(TAUTOLOGY_ID)).thenReturn(Optional.of(TAUTOLOGY)); - when(mock.apply(THING_IS_A_SUMTI_ID)) - .thenReturn(Optional.of(THING_IS_A_SUMTI)); + when(mock.apply(THING_IS_A_SUMTI_ID)).thenReturn(Optional.of(THING_IS_A_SUMTI)); when(mock.apply(GOD_ID)).thenReturn(Optional.of(GOD)); when(mock.apply(HUMAN_ID)).thenReturn(Optional.of(HUMAN)); when(mock.apply(MY_MODEL_ID)).thenReturn(Optional.of(MY_MODEL)); diff --git a/inez.model.tests/src/main/resources/bridies b/inez.model.tests/src/main/resources/bridies index 1cad13f..380949a 100644 --- a/inez.model.tests/src/main/resources/bridies +++ b/inez.model.tests/src/main/resources/bridies @@ -19,4 +19,4 @@ TAUTOLOGY,TAUTOLOGY_ID,TAUTOLOGY_REPR,SUMTI_IS_A_THING_CHANGED_REFERENCES THING_IS_A_SUMTI,THING_IS_A_SUMTI_ID,TAUTOLOGY_REPR,THING_IS_A_SUMTI_REFERENCES GOD,GOD_ID,GOD_REPR,List.of() HUMAN,HUMAN_ID,HUMAN_REPR,List.of() -MY_MODEL,MY_MODEL_ID,MY_MODEL_REPR,List.of() \ No newline at end of file +MY_MODEL,MY_MODEL_ID,MY_MODEL_REPR,List.of() diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java index 34a1769..aafecfd 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputService.java @@ -18,8 +18,7 @@ import io.github.magwas.inez.storage.repository.SumtiRepository; @Service -public class CreateBridisFromParserOutputService - implements Function> { +public class CreateBridisFromParserOutputService implements Function> { @Autowired SumtiRepository sumtiRepository; @@ -31,8 +30,7 @@ public Stream apply(final ParserOutput parserOutput) { return apply(top, refMap); } - private Stream apply(final String top, - final Map> refMap) { + private Stream apply(final String top, final Map> refMap) { debug("apply(", top, refMap); if (!refMap.containsKey(top)) { Bridi bridi = new Bridi(getIdOrRepr(top), top, List.of()); @@ -40,22 +38,20 @@ private Stream apply(final String top, return Stream.of(bridi); } List partList = refMap.get(top); - return Stream - .of(new Bridi(getIdOrRepr(top), top, + return Stream.of(new Bridi( + getIdOrRepr(top), + top, partList.stream().map(this::getIdOrRepr).toList())) .mapMulti((topBridi, consumer) -> { consumer.accept(topBridi); - partList.stream().map(x -> apply(x, refMap)).flatMap(x -> x) - .forEach(consumer::accept); + partList.stream().map(x -> apply(x, refMap)).flatMap(x -> x).forEach(consumer::accept); }); } private String getIdOrRepr(final String top) { Set candidates = sumtiRepository.findAllByRepresentation(top); - if (candidates.isEmpty()) - return IdUtil.createID(top); - if (candidates.size() > 1) - System.err.println("multiple candidates for " + top + ":" + candidates); + if (candidates.isEmpty()) return IdUtil.createID(top); + if (candidates.size() > 1) System.err.println("multiple candidates for " + top + ":" + candidates); return candidates.iterator().next().id(); } } diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java index f85fdc7..2562595 100644 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java +++ b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java @@ -8,11 +8,13 @@ import org.antlr.v4.runtime.misc.ParseCancellationException; import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import io.github.magwas.testing.TestBase; +@Tag("unit") class ParseTextTest extends TestBase implements ParserOutputTestData { @InjectMocks diff --git a/inez.parser.tests/src/main/resources/ids b/inez.parser.tests/src/main/resources/ids index 772e21e..6da9c53 100644 --- a/inez.parser.tests/src/main/resources/ids +++ b/inez.parser.tests/src/main/resources/ids @@ -9,4 +9,4 @@ CONTAINS,CONTAINS ROOT,ROOT CONTAINER,CONTAINER STUFF_COULDBE_THING,STUFF_COULDBE_THING -ANY,? \ No newline at end of file +ANY,? From 7efa8c911d9c13994bac359e1bedfe6e2d628312 Mon Sep 17 00:00:00 2001 From: Arpad Magosanyi Date: Tue, 14 Oct 2025 12:09:22 +0200 Subject: [PATCH 11/11] got rid of tycho, restructured also deleted the ui. nothing of value have been lost :) --- inez.model.tests/.classpath | 14 - inez.model.tests/.eclipse-pmd | 8 - inez.model.tests/.project | 40 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 524 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 151 ----- inez.model.tests/META-INF/MANIFEST.MF | 35 -- inez.model.tests/README | 1 - inez.model.tests/build.properties | 6 - inez.model.tests/pom.xml | 75 --- .../io/github/magwas/inez/InezPluginTest.java | 25 - .../osgi/SpringBootBundleActivatorStub.java | 9 - inez.model/.classpath | 17 +- inez.model/.project | 6 - inez.model/META-INF/MANIFEST.MF | 34 -- ...ot.autoconfigure.AutoConfiguration.imports | 1 - inez.model/pom.xml | 52 +- .../magwas/inez/osgi/MyBeanRegistrar.java | 27 - .../inez/osgi/SpringBootBundleActivator.java | 66 --- .../inez/query/GetServiceByNameService.java | 27 + .../inez/query/QueryProcessorService.java | 14 +- .../magwas/inez/BridiTestDataGenerator.java | 0 .../inez/GeneratorPatternConstants.java | 0 ...veForBridiElementServiceStubGenerator.java | 0 ...lByRepresentationServiceStubGenerator.java | 0 ...dByRepresentationServiceStubGenerator.java | 0 .../BridiReferenceTestDataGenerator.java | 0 .../storage/model/SumtiTestDataGenerator.java | 0 .../SumtiRepositoryStubGenerator.java | 0 .../io/github/magwas/inez/InezImplStub.java | 0 .../magwas/inez/InezProblemTestData.java | 0 .../github/magwas/inez/InezProblemsTest.java | 0 .../io/github/magwas/inez/TestConfig.java | 0 .../element/BridiElementEndToEndTest.java | 0 .../inez/element/BridiElementFactoryStub.java | 0 ...lementSystemInitializationServiceStub.java | 0 ...lementSystemInitializationServiceTest.java | 0 .../inez/element/BridiElementTestData.java | 0 .../CreateBridiElementServiceTest.java | 0 .../inez/element/IsInstanceServiceTest.java | 0 ...CreateBridisFromDefinitionServiceStub.java | 0 ...eateBridisFromParserOutputServiceStub.java | 0 .../CreateBridisFromParserOutputTest.java | 0 .../CreateBridisFromQueryServiceStub.java | 0 .../query/GetServiceByNameServiceStub.java | 17 + .../query/QueryProcessorEndToEndTest.java | 12 +- .../inez/query/QueryProcessorServiceStub.java | 0 .../magwas/inez/query/QueryProcessorTest.java | 0 .../inez/query/QueryProcessorTestData.java | 10 +- .../storage/AddReferencesServiceStub.java | 0 .../storage/AddReferencesServiceTest.java | 0 .../inez/storage/AddReferencesTest.java | 0 .../BridiStoreChangeListenersServiceStub.java | 0 .../inez/storage/BridiStoreEndToEndTest.java | 0 .../CreateBridiFromSumtiServiceStub.java | 0 .../storage/CreateBridiFromSumtiTest.java | 0 .../inez/storage/CreateSumtiServiceStub.java | 0 .../inez/storage/DeleteBridiServiceStub.java | 0 .../magwas/inez/storage/DeleteBridiTest.java | 0 .../storage/FindAllByRepresentationTest.java | 0 .../FindAllIdByRepresentationTest.java | 0 .../storage/FindBridiByIdServiceStub.java | 0 .../inez/storage/FindBridiByIdTest.java | 0 ...BridiIdBySelbriAndSumtiIdsServiceStub.java | 12 +- .../GetBridiIdBySelbriAndSumtiIdsTest.java | 0 .../storage/NotifyStoreChangeServiceStub.java | 0 .../storage/RemoveReferencesServiceStub.java | 0 .../inez/storage/RemoveReferencesTest.java | 0 .../inez/storage/SaveBridiServiceStub.java | 0 .../magwas/inez/storage/SaveBridiTest.java | 0 .../BridiReferenceRepositoryStub.java | 0 .../BridiStoreHistoryRepositoryStub.java | 0 .../BridiStoreHistoryServiceStub.java | 0 .../repository/ProblemRepositoryStub.java | 0 .../src/test}/resources/bridies | 0 .../src/test}/resources/bridireferences | 0 .../src/test}/resources/byrepresentation | 0 .../src/test}/resources/mymodel.definition | 0 .../src/test}/resources/mymodel.xml | 0 .../src/test}/resources/relatives | 0 .../src/test}/resources/root.xml | 0 .../src/test}/resources/sumties | 0 .../src/test}/resources/test.properties | 0 inez.parser.tests/.classpath | 14 - inez.parser.tests/.eclipse-pmd | 8 - inez.parser.tests/.project | 40 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 524 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 151 ----- inez.parser.tests/META-INF/MANIFEST.MF | 28 - inez.parser.tests/README | 1 - inez.parser.tests/build.properties | 6 - inez.parser.tests/pom.xml | 74 --- .../inez/parse/ParseTextPluginTest.java | 25 - inez.parser/.classpath | 19 +- inez.parser/.project | 8 +- .../org.eclipse.core.resources.prefs | 2 + inez.parser/META-INF/MANIFEST.MF | 23 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - inez.parser/build.properties | 3 - inez.parser/pom.xml | 82 +-- .../inez/parse/ParserBundleActivator.java | 45 -- .../inez/parse/IdTestDataGenerator.java | 0 .../inez/parse/InputTestDataGenerator.java | 0 .../parse/ParseTextServiceStubGenerator.java | 0 .../parse/ParserOutputTestDataGenerator.java | 0 .../parse/ReferenceTestDataGenerator.java | 0 .../RepresentationTestDataGenerator.java | 0 .../parse/TestDataGeneratorConstants.java | 0 .../CreateParserFromTokensServiceStub.java | 0 .../magwas/inez/parse/ParseTextTest.java | 0 .../src/test}/resources/idreferences | 0 .../src/test}/resources/ids | 0 .../src/test}/resources/inputs | 0 .../src/test}/resources/outputs | 0 .../src/test}/resources/parse_text_stubdata | 0 .../src/test}/resources/references | 0 .../src/test}/resources/representations | 0 inez.target/.project | 11 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 524 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 151 ----- inez.target/README | 1 - inez.target/hooks/initialize | 45 -- inez.target/inez.target | 170 ------ inez.target/pom.xml | 102 ---- inez.ui.product/.classpath | 5 - inez.ui.product/.gitignore | 1 - inez.ui.product/.project | 34 -- .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.jdt.core.prefs | 524 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 151 ----- .../.settings/org.eclipse.m2e.core.prefs | 4 - inez.ui.product/Inez.product | 171 ------ inez.ui.product/README | 2 - inez.ui.product/hooks/pre-site | 6 - inez.ui.product/hooks/site-deploy | 5 - inez.ui.product/hooks/validate | 7 - inez.ui.product/icons/eclipse128.png | Bin 6861 -> 0 bytes inez.ui.product/icons/eclipse16.png | Bin 664 -> 0 bytes inez.ui.product/icons/eclipse256.png | Bin 13511 -> 0 bytes inez.ui.product/icons/eclipse32.png | Bin 2233 -> 0 bytes inez.ui.product/icons/eclipse48.png | Bin 2909 -> 0 bytes inez.ui.product/icons/eclipse512.png | Bin 29447 -> 0 bytes inez.ui.product/icons/eclipse64.png | Bin 3682 -> 0 bytes inez.ui.product/pom.xml | 135 ----- inez.ui.product/src/site/site.xml | 18 - inez.ui.tests/.classpath | 13 - inez.ui.tests/.eclipse-pmd | 8 - inez.ui.tests/.project | 40 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 524 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 151 ----- inez.ui.tests/META-INF/MANIFEST.MF | 14 - inez.ui.tests/README | 1 - inez.ui.tests/build.properties | 6 - inez.ui.tests/pom.xml | 72 --- .../inez/ui/tree/MyEditorInputTest.java | 21 - inez.ui/.classpath | 19 - inez.ui/.eclipse-pmd | 8 - inez.ui/.project | 40 -- .../org.eclipse.core.resources.prefs | 6 - inez.ui/.settings/org.eclipse.jdt.core.prefs | 524 ------------------ inez.ui/.settings/org.eclipse.jdt.ui.prefs | 151 ----- inez.ui/.settings/org.eclipse.m2e.core.prefs | 4 - inez.ui/META-INF/MANIFEST.MF | 30 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - inez.ui/README | 2 - inez.ui/build.properties | 5 - inez.ui/icons/eclipse128.png | Bin 6861 -> 0 bytes inez.ui/icons/eclipse16.png | Bin 664 -> 0 bytes inez.ui/icons/eclipse256.png | Bin 13511 -> 0 bytes inez.ui/icons/eclipse32.png | Bin 2233 -> 0 bytes inez.ui/icons/eclipse48.png | Bin 2909 -> 0 bytes inez.ui/icons/eclipse512.png | Bin 29447 -> 0 bytes inez.ui/icons/eclipse64.png | Bin 3682 -> 0 bytes inez.ui/plugin.xml | 99 ---- inez.ui/pom.xml | 61 -- .../io/github/magwas/inez/ui/Application.java | 40 -- .../inez/ui/ApplicationActionBarAdvisor.java | 22 - .../inez/ui/ApplicationWorkbenchAdvisor.java | 20 - .../ui/ApplicationWorkbenchWindowAdvisor.java | 30 - .../io/github/magwas/inez/ui/Perspective.java | 54 -- .../inez/ui/editor/ModelEditorView.java | 88 --- .../inez/ui/mindmap/AbstractMindMapItem.java | 20 - .../inez/ui/mindmap/MindMapConnection.java | 55 -- .../magwas/inez/ui/mindmap/MindMapNode.java | 108 ---- .../magwas/inez/ui/mindmap/SimpleMindMap.java | 32 -- .../mindmap/SimpleMindMapExampleFactory.java | 67 --- .../inez/ui/mindmap/visuals/ArrowHead.java | 9 - .../visuals/MindMapConnectionVisual.java | 14 - .../ui/mindmap/visuals/MindMapNodeVisual.java | 125 ----- .../ui/tree/ModelTreeContentProvider.java | 37 -- .../inez/ui/tree/ModelTreeLabelProvider.java | 53 -- .../magwas/inez/ui/tree/MyEditorInput.java | 49 -- .../magwas/inez/ui/tree/NewDiagramAction.java | 55 -- .../ui/tree/TreeModelDragSourceLIstener.java | 39 -- .../ui/tree/TreeModelDropTargetListener.java | 44 -- .../magwas/inez/ui/tree/TreeModelView.java | 69 --- pom.xml | 39 +- 200 files changed, 158 insertions(+), 7029 deletions(-) delete mode 100644 inez.model.tests/.classpath delete mode 100644 inez.model.tests/.eclipse-pmd delete mode 100644 inez.model.tests/.project delete mode 100644 inez.model.tests/.settings/org.eclipse.core.resources.prefs delete mode 100644 inez.model.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 inez.model.tests/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 inez.model.tests/META-INF/MANIFEST.MF delete mode 100644 inez.model.tests/README delete mode 100644 inez.model.tests/build.properties delete mode 100644 inez.model.tests/pom.xml delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/InezPluginTest.java delete mode 100644 inez.model.tests/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java delete mode 100644 inez.model/META-INF/MANIFEST.MF delete mode 100644 inez.model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 inez.model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java delete mode 100644 inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java create mode 100644 inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java (100%) rename {inez.model.tests/src => inez.model/src/test}/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/InezImplStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/InezProblemTestData.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/InezProblemsTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/TestConfig.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/BridiElementFactoryStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/BridiElementTestData.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/element/IsInstanceServiceTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java (100%) create mode 100644 inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java (83%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/QueryProcessorTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/query/QueryProcessorTestData.java (70%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/AddReferencesTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/DeleteBridiTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/FindBridiByIdTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java (59%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/RemoveReferencesTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/SaveBridiTest.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/bridies (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/bridireferences (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/byrepresentation (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/mymodel.definition (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/mymodel.xml (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/relatives (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/root.xml (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/sumties (100%) rename {inez.model.tests/src/main => inez.model/src/test}/resources/test.properties (100%) delete mode 100644 inez.parser.tests/.classpath delete mode 100644 inez.parser.tests/.eclipse-pmd delete mode 100644 inez.parser.tests/.project delete mode 100644 inez.parser.tests/.settings/org.eclipse.core.resources.prefs delete mode 100644 inez.parser.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 inez.parser.tests/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 inez.parser.tests/META-INF/MANIFEST.MF delete mode 100644 inez.parser.tests/README delete mode 100644 inez.parser.tests/build.properties delete mode 100644 inez.parser.tests/pom.xml delete mode 100644 inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextPluginTest.java delete mode 100644 inez.parser/META-INF/MANIFEST.MF delete mode 100644 inez.parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 inez.parser/build.properties delete mode 100644 inez.parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java (100%) rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java (100%) rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java (100%) rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java (100%) rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java (100%) rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java (100%) rename {inez.parser.tests/src => inez.parser/src/test}/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/java/io/github/magwas/inez/parse/ParseTextTest.java (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/idreferences (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/ids (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/inputs (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/outputs (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/parse_text_stubdata (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/references (100%) rename {inez.parser.tests/src/main => inez.parser/src/test}/resources/representations (100%) delete mode 100644 inez.target/.project delete mode 100644 inez.target/.settings/org.eclipse.core.resources.prefs delete mode 100644 inez.target/.settings/org.eclipse.jdt.core.prefs delete mode 100644 inez.target/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 inez.target/README delete mode 100755 inez.target/hooks/initialize delete mode 100644 inez.target/inez.target delete mode 100644 inez.target/pom.xml delete mode 100644 inez.ui.product/.classpath delete mode 100644 inez.ui.product/.gitignore delete mode 100644 inez.ui.product/.project delete mode 100644 inez.ui.product/.settings/org.eclipse.core.resources.prefs delete mode 100644 inez.ui.product/.settings/org.eclipse.jdt.core.prefs delete mode 100644 inez.ui.product/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 inez.ui.product/.settings/org.eclipse.m2e.core.prefs delete mode 100644 inez.ui.product/Inez.product delete mode 100644 inez.ui.product/README delete mode 100755 inez.ui.product/hooks/pre-site delete mode 100755 inez.ui.product/hooks/site-deploy delete mode 100755 inez.ui.product/hooks/validate delete mode 100644 inez.ui.product/icons/eclipse128.png delete mode 100644 inez.ui.product/icons/eclipse16.png delete mode 100644 inez.ui.product/icons/eclipse256.png delete mode 100644 inez.ui.product/icons/eclipse32.png delete mode 100644 inez.ui.product/icons/eclipse48.png delete mode 100644 inez.ui.product/icons/eclipse512.png delete mode 100644 inez.ui.product/icons/eclipse64.png delete mode 100644 inez.ui.product/pom.xml delete mode 100644 inez.ui.product/src/site/site.xml delete mode 100644 inez.ui.tests/.classpath delete mode 100644 inez.ui.tests/.eclipse-pmd delete mode 100644 inez.ui.tests/.project delete mode 100644 inez.ui.tests/.settings/org.eclipse.core.resources.prefs delete mode 100644 inez.ui.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 inez.ui.tests/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 inez.ui.tests/META-INF/MANIFEST.MF delete mode 100644 inez.ui.tests/README delete mode 100644 inez.ui.tests/build.properties delete mode 100644 inez.ui.tests/pom.xml delete mode 100644 inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java delete mode 100644 inez.ui/.classpath delete mode 100644 inez.ui/.eclipse-pmd delete mode 100644 inez.ui/.project delete mode 100644 inez.ui/.settings/org.eclipse.core.resources.prefs delete mode 100644 inez.ui/.settings/org.eclipse.jdt.core.prefs delete mode 100644 inez.ui/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 inez.ui/.settings/org.eclipse.m2e.core.prefs delete mode 100644 inez.ui/META-INF/MANIFEST.MF delete mode 100644 inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 inez.ui/README delete mode 100644 inez.ui/build.properties delete mode 100644 inez.ui/icons/eclipse128.png delete mode 100644 inez.ui/icons/eclipse16.png delete mode 100644 inez.ui/icons/eclipse256.png delete mode 100644 inez.ui/icons/eclipse32.png delete mode 100644 inez.ui/icons/eclipse48.png delete mode 100644 inez.ui/icons/eclipse512.png delete mode 100644 inez.ui/icons/eclipse64.png delete mode 100644 inez.ui/plugin.xml delete mode 100644 inez.ui/pom.xml delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/Application.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/Perspective.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/ArrowHead.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java delete mode 100644 inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java diff --git a/inez.model.tests/.classpath b/inez.model.tests/.classpath deleted file mode 100644 index b0fcce7..0000000 --- a/inez.model.tests/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/inez.model.tests/.eclipse-pmd b/inez.model.tests/.eclipse-pmd deleted file mode 100644 index 5324655..0000000 --- a/inez.model.tests/.eclipse-pmd +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/inez.model.tests/.project b/inez.model.tests/.project deleted file mode 100644 index a5c1cc5..0000000 --- a/inez.model.tests/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - inez.model.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - ch.acanda.eclipse.pmd.builder.PMDBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - ch.acanda.eclipse.pmd.builder.PMDNature - - diff --git a/inez.model.tests/.settings/org.eclipse.core.resources.prefs b/inez.model.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/inez.model.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/inez.model.tests/.settings/org.eclipse.jdt.core.prefs b/inez.model.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b52662..0000000 --- a/inez.model.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,524 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning -org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 -org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=20 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_line_comments=false -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/inez.model.tests/.settings/org.eclipse.jdt.ui.prefs b/inez.model.tests/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a6d063b..0000000 --- a/inez.model.tests/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,151 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_mag -formatter_settings_version=23 -sp_cleanup.add_all=false -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.also_simplify_lambda=true -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.array_with_curly=false -sp_cleanup.arrays_fill=false -sp_cleanup.bitwise_conditional_expression=false -sp_cleanup.boolean_literal=false -sp_cleanup.boolean_value_rather_than_comparison=false -sp_cleanup.break_loop=false -sp_cleanup.collection_cloning=false -sp_cleanup.comparing_on_criteria=false -sp_cleanup.comparison_statement=false -sp_cleanup.controlflow_merge=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -sp_cleanup.convert_to_switch_expressions=false -sp_cleanup.correct_indentation=false -sp_cleanup.do_while_rather_than_while=false -sp_cleanup.double_negation=false -sp_cleanup.else_if=false -sp_cleanup.embedded_if=false -sp_cleanup.evaluate_nullable=false -sp_cleanup.extract_increment=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.hash=false -sp_cleanup.if_condition=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.instanceof=false -sp_cleanup.instanceof_keyword=false -sp_cleanup.invert_equals=false -sp_cleanup.join=false -sp_cleanup.lazy_logical_operator=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.map_cloning=false -sp_cleanup.merge_conditional_blocks=false -sp_cleanup.multi_catch=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.no_string_creation=false -sp_cleanup.no_super=false -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false -sp_cleanup.operand_factorization=false -sp_cleanup.organize_imports=true -sp_cleanup.overridden_assignment=false -sp_cleanup.overridden_assignment_move_decl=true -sp_cleanup.plain_replacement=false -sp_cleanup.precompile_regex=false -sp_cleanup.primitive_comparison=false -sp_cleanup.primitive_parsing=false -sp_cleanup.primitive_rather_than_wrapper=false -sp_cleanup.primitive_serialization=false -sp_cleanup.pull_out_if_from_if_else=false -sp_cleanup.pull_up_assignment=false -sp_cleanup.push_down_negation=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.reduce_indentation=false -sp_cleanup.redundant_comparator=false -sp_cleanup.redundant_falling_through_block_end=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_method_parameters=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.replace_deprecated_calls=false -sp_cleanup.return_expression=false -sp_cleanup.simplify_boolean_if_else=false -sp_cleanup.simplify_lambda_expression_and_method_ref=false -sp_cleanup.single_used_field=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.standard_comparison=false -sp_cleanup.static_inner_class=false -sp_cleanup.strictly_equal_or_different=false -sp_cleanup.stringbuffer_to_stringbuilder=false -sp_cleanup.stringbuilder=false -sp_cleanup.stringbuilder_for_local_vars=true -sp_cleanup.stringconcat_stringbuffer_stringbuilder=false -sp_cleanup.stringconcat_to_textblock=false -sp_cleanup.substring=false -sp_cleanup.switch=false -sp_cleanup.switch_for_instanceof_pattern=false -sp_cleanup.system_property=false -sp_cleanup.system_property_boolean=false -sp_cleanup.system_property_file_encoding=false -sp_cleanup.system_property_file_separator=false -sp_cleanup.system_property_javaspecversion=false -sp_cleanup.system_property_javaversion=false -sp_cleanup.system_property_line_separator=false -sp_cleanup.system_property_path_separator=false -sp_cleanup.ternary_operator=false -sp_cleanup.try_with_resource=false -sp_cleanup.unlooped_while=false -sp_cleanup.unreachable_block=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_string_is_blank=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false -sp_cleanup.useless_continue=false -sp_cleanup.useless_return=false -sp_cleanup.valueof_rather_than_instantiation=false diff --git a/inez.model.tests/META-INF/MANIFEST.MF b/inez.model.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 2c5af8c..0000000 --- a/inez.model.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,35 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Testing -Bundle-SymbolicName: io.github.magwas.inez.model.tests -Bundle-Version: 0.0.1 -Export-Package: io.github.magwas.inez, - io.github.magwas.inez.element, - io.github.magwas.inez.osgi, - io.github.magwas.inez.query, - io.github.magwas.inez.storage, - io.github.magwas.inez.storage.model, - io.github.magwas.inez.storage.repository -Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", - wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", - wrapped.org.springframework.data.spring-data-commons;bundle-version="3.5.1", - wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1", - wrapped.org.springframework.spring-aop;bundle-version="6.2.8", - wrapped.org.springframework.spring-core;bundle-version="6.2.8", - wrapped.org.springframework.spring-tx;bundle-version="6.2.8", - wrapped.org.springframework.spring-beans;bundle-version="6.2.8", - wrapped.org.springframework.spring-context;bundle-version="6.2.8", - wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", - org.antlr.antlr4-runtime;bundle-version="4.13.2", - org.eclipse.core.runtime;bundle-version="3.12.0", - wrapped.org.springframework.spring-test;bundle-version="6.2.9", - wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", - junit-jupiter-api;bundle-version="5.11.4", - org.osgi.test.common;bundle-version="1.3.0", - org.osgi.test.junit5;bundle-version="1.3.0", - io.github.magwas.inez.model, - io.github.magwas.inez.parser, - io.github.magwas.inez.parser.tests -Automatic-Module-Name: io.github.magwas.inez.model.tests -Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.model.tests/README b/inez.model.tests/README deleted file mode 100644 index a72d96e..0000000 --- a/inez.model.tests/README +++ /dev/null @@ -1 +0,0 @@ -tests for inez model diff --git a/inez.model.tests/build.properties b/inez.model.tests/build.properties deleted file mode 100644 index 991fbde..0000000 --- a/inez.model.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/main/java/,\ - src/generators-java,\ - target/generated-sources -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/inez.model.tests/pom.xml b/inez.model.tests/pom.xml deleted file mode 100644 index c2fe960..0000000 --- a/inez.model.tests/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - - io.github.magwas - inez - 0.0.1 - ../pom.xml - - io.github.magwas.inez.model.tests - eclipse-test-plugin - ${project.artifactId} - model layer for Inez - https://github.com/kode-konveyor/inez-server.git - - - GPL affero - https://www.gnu.org/licenses/agpl-3.0.en.html - GNU Affero General Public License - - - - - Árpád Magosányi - m4gw4s@gmail.com - - - - scm:git:https://github.com/kode-konveyor/inez-server.git - scm:git:https://github.com/kode-konveyor/inez-server.git - https://github.com/kode-konveyor/inez-server.git - - - github - https://github.com/kode-konveyor/inez-server/issues - - - - website - Project site - https://repo.kodekonveyor.com/${project.artifactId} - - - - - io.github.magwas - io.github.magwas.inez.parser.tests - ${project.version} - - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${version.tycho} - - true - - - io.github.magwas.inez.parser - 1 - true - - - io.github.magwas.inez.model - 2 - true - - - - - - - diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/InezPluginTest.java b/inez.model.tests/src/main/java/io/github/magwas/inez/InezPluginTest.java deleted file mode 100644 index 15643fa..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/InezPluginTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.github.magwas.inez; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.osgi.test.common.annotation.InjectService; -import org.osgi.test.junit5.service.ServiceExtension; - -import io.github.magwas.inez.storage.model.Sumti; - -@ExtendWith(ServiceExtension.class) -@Tag("plugin") -class InezPluginTest { - - @InjectService - Inez inez; - - @Test - void test() { - Sumti actual = inez.createSumti("hello", "world"); - assertEquals(new Sumti("hello", "world"), actual); - } -} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java b/inez.model.tests/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java deleted file mode 100644 index 40dee48..0000000 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivatorStub.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.magwas.inez.osgi; - -import static org.mockito.Mockito.mock; - -public class SpringBootBundleActivatorStub { - public static SpringBootBundleActivator stub() { - return mock(SpringBootBundleActivator.class); - } -} diff --git a/inez.model/.classpath b/inez.model/.classpath index a010343..b2e532c 100644 --- a/inez.model/.classpath +++ b/inez.model/.classpath @@ -5,8 +5,23 @@ - + + + + + + + + + + + + + + + + diff --git a/inez.model/.project b/inez.model/.project index a41a282..e6c5488 100644 --- a/inez.model/.project +++ b/inez.model/.project @@ -15,11 +15,6 @@ - - org.eclipse.pde.ManifestBuilder - - - org.eclipse.pde.SchemaBuilder @@ -35,6 +30,5 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature ch.acanda.eclipse.pmd.builder.PMDNature - org.eclipse.pde.PluginNature diff --git a/inez.model/META-INF/MANIFEST.MF b/inez.model/META-INF/MANIFEST.MF deleted file mode 100644 index fec4935..0000000 --- a/inez.model/META-INF/MANIFEST.MF +++ /dev/null @@ -1,34 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Main-Class: io.github.magwas.inez.Main -Bundle-Name: io.github.magwas.inez.model -Bundle-SymbolicName: io.github.magwas.inez.model;singleton:=true -Spring-Context: *;create-asynchronously:=false -Bundle-Activator: io.github.magwas.inez.osgi.SpringBootBundleActivator -Bundle-Version: 0.0.1 -Bundle-Vendor: Árpád Magosányi -Export-Package: io.github.magwas.inez, - io.github.magwas.inez.element, - io.github.magwas.inez.functions;x-friends:="io.github.magwas.inez.model.tests", - io.github.magwas.inez.osgi, - io.github.magwas.inez.query;x-friends:="io.github.magwas.inez.model.tests", - io.github.magwas.inez.storage;x-friends:="io.github.magwas.inez.model.tests", - io.github.magwas.inez.storage.model;x-friends:="io.github.magwas.inez.model.tests", - io.github.magwas.inez.storage.repository;x-friends:="io.github.magwas.inez.model.tests" -Require-Bundle: wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", - wrapped.org.springframework.data.spring-data-commons;bundle-version="3.5.1", - wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1", - wrapped.org.springframework.spring-aop;bundle-version="6.2.8", - wrapped.org.springframework.spring-core;bundle-version="6.2.8", - wrapped.org.springframework.spring-tx;bundle-version="6.2.8", - wrapped.org.springframework.spring-beans;bundle-version="6.2.8", - wrapped.org.springframework.spring-context;bundle-version="6.2.8", - wrapped.io.github.magwas.konveyor-base;bundle-version="0.3.0", - org.antlr.antlr4-runtime;bundle-version="4.13.2", - io.github.magwas.inez.parser, - org.eclipse.core.runtime;bundle-version="3.12.0" -Bundle-RequiredExecutionEnvironment: JavaSE-21 -Automatic-Module-Name: io.github.magwas.inez.model -Bundle-ClassPath: ., - target/classes diff --git a/inez.model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inez.model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c5b8c83..0000000 --- a/inez.model/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -io.github.magwas.inez.osgi.SpringBootBundleActivator diff --git a/inez.model/pom.xml b/inez.model/pom.xml index ed0667d..0825354 100644 --- a/inez.model/pom.xml +++ b/inez.model/pom.xml @@ -7,8 +7,9 @@ 0.0.1 ../pom.xml - io.github.magwas.inez.model - eclipse-plugin + io.github.magwas + inez.model + ${project.version} ${project.artifactId} model layer for Inez https://github.com/kode-konveyor/inez-server.git @@ -41,19 +42,36 @@ https://repo.kodekonveyor.com/${project.artifactId} - - 6.0.0 - - - - - org.eclipse.tycho - tycho-packaging-plugin - - - org.eclipse.tycho - tycho-maven-plugin - - - + + + io.github.magwas + konveyor.base + ${version.konveyor} + runtime + + + io.github.magwas + konveyor.base + ${version.konveyor} + testing + test + + + io.github.magwas + inez.parser + 0.0.1 + + + io.github.magwas + inez.parser + ${project.version} + testing + test + + + org.springframework.data + spring-data-keyvalue + ${version.spring-data} + + diff --git a/inez.model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java b/inez.model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java deleted file mode 100644 index 8331bc6..0000000 --- a/inez.model/src/main/java/io/github/magwas/inez/osgi/MyBeanRegistrar.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.github.magwas.inez.osgi; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; - -import io.github.magwas.inez.parse.ParseTextService; -import io.github.magwas.kodekonveyorannotations.Glue; -import io.github.magwas.runtime.LoggerService; - -@Glue -public class MyBeanRegistrar implements BeanDefinitionRegistryPostProcessor { - @Override - public void postProcessBeanDefinitionRegistry(final BeanDefinitionRegistry registry) {} - - @Override - public void postProcessBeanFactory(final ConfigurableListableBeanFactory beanFactory) { - BundleContext bundleContext = SpringBootBundleActivator.bundleContext; - ServiceReference ref = bundleContext.getServiceReference(ParseTextService.class); - ParseTextService parseText = bundleContext.getService(ref); - beanFactory.registerSingleton("parseTextService", parseText); - LoggerService logger = new LoggerService(); - beanFactory.registerSingleton("loggerService", logger); - } -} diff --git a/inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java b/inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java deleted file mode 100644 index 9d85653..0000000 --- a/inez.model/src/main/java/io/github/magwas/inez/osgi/SpringBootBundleActivator.java +++ /dev/null @@ -1,66 +0,0 @@ -package io.github.magwas.inez.osgi; - -import java.io.IOException; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.map.repository.config.EnableMapRepositories; - -import io.github.magwas.inez.Inez; -import io.github.magwas.inez.InezImpl; -import io.github.magwas.inez.query.BridiFunction; -import io.github.magwas.kodekonveyorannotations.Glue; - -@SpringBootApplication -@EnableMapRepositories("io.github.magwas.inez.storage") -@ComponentScan(basePackages = {"io.github.magwas"}) -@Glue -public class SpringBootBundleActivator implements BundleActivator { - - public static BundleContext bundleContext; - - ConfigurableApplicationContext appContext; - - @Autowired - InezImpl inez; - - @Autowired - AutowireCapableBeanFactory autowireCapableBeanFactory; - - @Override - public void start(final BundleContext bundleContext) throws IOException { - SpringBootBundleActivator.bundleContext = bundleContext; - Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader()); - appContext = new AnnotationConfigApplicationContext(SpringBootBundleActivator.class, MyBeanRegistrar.class); - inez = appContext.getBean(InezImpl.class); - inez.initialize(); - - bundleContext.registerService(Inez.class, inez, null); - System.err.println("registered service"); - } - - @Override - public void stop(final BundleContext bundleContext) { - SpringApplication.exit(appContext, () -> 0); - } - - public static void main(final String[] args) { - SpringApplication.run(SpringBootBundleActivator.class); - } - - public BridiFunction obtainAndWireOSGIService(final String relname) { - ServiceReference ref = - (ServiceReference) bundleContext.getServiceReference(relname); - BridiFunction fun = bundleContext.getService(ref); - autowireCapableBeanFactory.autowireBean(fun); - return fun; - } -} diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java b/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java new file mode 100644 index 0000000..318be9d --- /dev/null +++ b/inez.model/src/main/java/io/github/magwas/inez/query/GetServiceByNameService.java @@ -0,0 +1,27 @@ +package io.github.magwas.inez.query; + +import java.util.Arrays; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; + +import io.github.magwas.runtime.LoggerService; + +@Service +public class GetServiceByNameService { + + @Autowired + private ApplicationContext applicationContext; + + @Autowired + LoggerService logger; + + public BridiFunction apply(final String serviceName) throws BeansException, ClassNotFoundException { + logger.debug(serviceName); + + Arrays.asList(applicationContext.getBeanDefinitionNames()).forEach(logger::debug); + return (BridiFunction) applicationContext.getBean(Class.forName(serviceName)); + } +} diff --git a/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java b/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java index 0cc5a34..17b7517 100644 --- a/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java +++ b/inez.model/src/main/java/io/github/magwas/inez/query/QueryProcessorService.java @@ -14,13 +14,13 @@ import java.util.stream.Stream; import org.antlr.v4.runtime.misc.ParseCancellationException; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import io.github.magwas.inez.Bridi; import io.github.magwas.inez.element.ElementConstants; import io.github.magwas.inez.element.GetRelativeForBridiElementService; -import io.github.magwas.inez.osgi.SpringBootBundleActivator; import io.github.magwas.inez.parse.ParseTextService; import io.github.magwas.inez.parse.ParserConstants; import io.github.magwas.inez.parse.ParserOutput; @@ -51,7 +51,7 @@ public class QueryProcessorService implements Function apply(final String query) { return parseText.apply(query).map(x -> apply(x)).flatMap(x -> x); @@ -126,8 +126,14 @@ private BridiFunction functionFor(final List partList) { debug("rels", rels); if (rels.isEmpty()) return null; if (rels.size() != 1) throw new Error("multiple functions for " + partList); - String relname = rels.get(0); - return springBootBundleActivator.obtainAndWireOSGIService(relname); + String serviceName = rels.get(0); + BridiFunction service; + try { + service = getServiceByName.apply(serviceName); + } catch (BeansException | ClassNotFoundException e) { + throw new Error(serviceName + " not found for " + partList, e); + } + return service; } private Stream findCandidates( diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/BridiTestDataGenerator.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java b/inez.model/src/test/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/GeneratorPatternConstants.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/element/GetRelativeForBridiElementServiceStubGenerator.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllByRepresentationServiceStubGenerator.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/FindAllIdByRepresentationServiceStubGenerator.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/BridiReferenceTestDataGenerator.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/model/SumtiTestDataGenerator.java diff --git a/inez.model.tests/src/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java b/inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java similarity index 100% rename from inez.model.tests/src/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java rename to inez.model/src/test/generators-java/io/github/magwas/inez/storage/repository/SumtiRepositoryStubGenerator.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java b/inez.model/src/test/java/io/github/magwas/inez/InezImplStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/InezImplStub.java rename to inez.model/src/test/java/io/github/magwas/inez/InezImplStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemTestData.java b/inez.model/src/test/java/io/github/magwas/inez/InezProblemTestData.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemTestData.java rename to inez.model/src/test/java/io/github/magwas/inez/InezProblemTestData.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemsTest.java b/inez.model/src/test/java/io/github/magwas/inez/InezProblemsTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/InezProblemsTest.java rename to inez.model/src/test/java/io/github/magwas/inez/InezProblemsTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/TestConfig.java b/inez.model/src/test/java/io/github/magwas/inez/TestConfig.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/TestConfig.java rename to inez.model/src/test/java/io/github/magwas/inez/TestConfig.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/BridiElementEndToEndTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementFactoryStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementFactoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/element/BridiElementFactoryStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/BridiElementSystemInitializationServiceTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java b/inez.model/src/test/java/io/github/magwas/inez/element/BridiElementTestData.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/BridiElementTestData.java rename to inez.model/src/test/java/io/github/magwas/inez/element/BridiElementTestData.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/CreateBridiElementServiceTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/element/IsInstanceServiceTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/element/IsInstanceServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/element/IsInstanceServiceTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromDefinitionServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java rename to inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromParserOutputTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/query/CreateBridisFromQueryServiceStub.java diff --git a/inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java new file mode 100644 index 0000000..a98495c --- /dev/null +++ b/inez.model/src/test/java/io/github/magwas/inez/query/GetServiceByNameServiceStub.java @@ -0,0 +1,17 @@ +package io.github.magwas.inez.query; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import org.springframework.beans.BeansException; + +import io.github.magwas.inez.element.ElementConstants; + +public class GetServiceByNameServiceStub implements ElementConstants { + public static GetServiceByNameService stub() throws BeansException, ClassNotFoundException { + GetServiceByNameService mock = mock(GetServiceByNameService.class); + BridiFunction save = mock(BridiFunction.class); + when(mock.apply(SAVE_FUNCTION_REF_ID)).thenReturn(save); + return mock; + } +} diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java similarity index 83% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java rename to inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java index 16e8f7c..3704e0e 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorEndToEndTest.java @@ -1,8 +1,6 @@ package io.github.magwas.inez.query; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import java.io.IOException; import java.util.List; @@ -13,8 +11,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -23,8 +19,6 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.InezImpl; import io.github.magwas.inez.TestConfig; -import io.github.magwas.inez.functions.Save; -import io.github.magwas.inez.osgi.SpringBootBundleActivator; import io.github.magwas.inez.parse.InputTestData; import io.github.magwas.runtime.LogUtil; import io.github.magwas.testing.TestUtil; @@ -39,11 +33,6 @@ class QueryProcessorEndToEndTest implements QueryProcessorTestData, InputTestDat @BeforeEach void setUp() throws IOException { - ServiceReference sr = mock(ServiceReference.class); - BundleContext ctx = mock(BundleContext.class); - when((ServiceReference) ctx.getServiceReference(SAVE_CLASS_NAME)).thenReturn(sr); - when(ctx.getService(sr)).thenReturn(new Save()); - SpringBootBundleActivator.bundleContext = ctx; inez.initialize(); } @@ -57,6 +46,7 @@ void test1() { Set.of(ALICE_EATS_BANANA_REPR, BOB_EATS_BANANA_REPR, CECILE_EATS_BANANA_REPR), WHO_EATS_BANANA_INPUT); assertQuery(Set.of(CECILE_EATS_BANANA_REPR, CECILE_LOOKS_AT_BANANA_REPR), CECILE_WHAT_BANANA_INPUT); assertQuery(Set.of(ALICE_EATS_BANANA_REPR, ALICE_EATS_CHIPS_REPR), ALICE_EATS_WHAT_INPUT); + LogUtil.addDebuggedClass(GetServiceByNameService.class); assertQuery(Set.of(PUTTY_REPR), DO_SAVE_PUTTY_INPUT); assertEquals(1, inez.findAllByRepresentation(PUTTY_REPR).count()); List putty = inez.findAllByRepresentation(PUTTY_REPR).toList(); diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTest.java rename to inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTestData.java similarity index 70% rename from inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java rename to inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTestData.java index 75cc7cd..83746ef 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/query/QueryProcessorTestData.java +++ b/inez.model/src/test/java/io/github/magwas/inez/query/QueryProcessorTestData.java @@ -6,9 +6,9 @@ import io.github.magwas.inez.BridiTestData; import io.github.magwas.inez.parse.RepresentationTestData; -public interface QueryProcessorTestData - extends RepresentationTestData, BridiTestData { - String TEST_TEXT = """ +public interface QueryProcessorTestData extends RepresentationTestData, BridiTestData { + String TEST_TEXT = + """ {{sumti} is a {THING}} is a {THING} {{THING} is a {THING}} is a {THING} {alice} {{eats} {banana}} @@ -20,6 +20,6 @@ public interface QueryProcessorTestData {sumti} is a {THING} {THING} is a {THING}"""; String SAVE_CLASS_NAME = "io.github.magwas.inez.functions.Save"; - Set SIMPLE_QUERY_OUTPUT = Set.of(TAUTOLOGY, - SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); + Set SIMPLE_QUERY_OUTPUT = + Set.of(TAUTOLOGY, SUMTI_IS_A_THING_IS_A_THING, TAUTOLOGY_IS_A_THING, SUMTI_IS_A_THING); } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesServiceTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/AddReferencesTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/AddReferencesTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreChangeListenersServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/BridiStoreEndToEndTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/CreateBridiFromSumtiTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/CreateSumtiServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/DeleteBridiTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/DeleteBridiTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/FindAllByRepresentationTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/FindAllIdByRepresentationTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/FindBridiByIdTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/FindBridiByIdTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java similarity index 59% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java index 1993573..ab6e537 100644 --- a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java +++ b/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsServiceStub.java @@ -10,16 +10,16 @@ public class GetBridiIdBySelbriAndSumtiIdsServiceStub implements IdTestData { public static GetBridiIdBySelbriAndSumtiIdsService stub() { GetBridiIdBySelbriAndSumtiIdsService mock = mock(GetBridiIdBySelbriAndSumtiIdsService.class); - when(mock.apply(IS_A_ID, THING_ID, 1)).thenAnswer((args) -> Stream.of(TAUTOLOGY_ID, THING_IS_A_SUMTI_ID)); + when(mock.apply(IS_A_ID, THING_ID, 1)).thenAnswer(args -> Stream.of(TAUTOLOGY_ID, THING_IS_A_SUMTI_ID)); when(mock.apply(IS_A_ID, THING_ID, 2)) - .thenAnswer((args) -> Stream.of( + .thenAnswer(args -> Stream.of( TAUTOLOGY_ID, SUMTI_IS_A_THING_IS_A_THING_ID, SUMTI_IS_A_THING_ID, TAUTOLOGY_IS_A_THING_ID)); when(mock.apply(IS_A_ID, IS_A_ID, 0)) - .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_ID)); + .thenAnswer(args -> Stream.of(SUMTI_IS_A_THING_ID, SUMTI_IS_A_THING_IS_A_THING_ID)); when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_IS_A_THING_ID, 1)) - .thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_IS_A_THING_ID)); - when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_ID, 1)).thenAnswer((args) -> Stream.of(SUMTI_IS_A_THING_ID)); - when(mock.apply(IS_A_ID, GOD_ID, 2)).thenAnswer((args) -> Stream.of()); + .thenAnswer(args -> Stream.of(SUMTI_IS_A_THING_IS_A_THING_ID)); + when(mock.apply(IS_A_ID, SUMTI_IS_A_THING_ID, 1)).thenAnswer(args -> Stream.of(SUMTI_IS_A_THING_ID)); + when(mock.apply(IS_A_ID, GOD_ID, 2)).thenAnswer(args -> Stream.of()); return mock; } diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/GetBridiIdBySelbriAndSumtiIdsTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/NotifyStoreChangeServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/RemoveReferencesTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/RemoveReferencesTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java b/inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiTest.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/SaveBridiTest.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/SaveBridiTest.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiReferenceRepositoryStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryRepositoryStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/BridiStoreHistoryServiceStub.java diff --git a/inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java b/inez.model/src/test/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java similarity index 100% rename from inez.model.tests/src/main/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java rename to inez.model/src/test/java/io/github/magwas/inez/storage/repository/ProblemRepositoryStub.java diff --git a/inez.model.tests/src/main/resources/bridies b/inez.model/src/test/resources/bridies similarity index 100% rename from inez.model.tests/src/main/resources/bridies rename to inez.model/src/test/resources/bridies diff --git a/inez.model.tests/src/main/resources/bridireferences b/inez.model/src/test/resources/bridireferences similarity index 100% rename from inez.model.tests/src/main/resources/bridireferences rename to inez.model/src/test/resources/bridireferences diff --git a/inez.model.tests/src/main/resources/byrepresentation b/inez.model/src/test/resources/byrepresentation similarity index 100% rename from inez.model.tests/src/main/resources/byrepresentation rename to inez.model/src/test/resources/byrepresentation diff --git a/inez.model.tests/src/main/resources/mymodel.definition b/inez.model/src/test/resources/mymodel.definition similarity index 100% rename from inez.model.tests/src/main/resources/mymodel.definition rename to inez.model/src/test/resources/mymodel.definition diff --git a/inez.model.tests/src/main/resources/mymodel.xml b/inez.model/src/test/resources/mymodel.xml similarity index 100% rename from inez.model.tests/src/main/resources/mymodel.xml rename to inez.model/src/test/resources/mymodel.xml diff --git a/inez.model.tests/src/main/resources/relatives b/inez.model/src/test/resources/relatives similarity index 100% rename from inez.model.tests/src/main/resources/relatives rename to inez.model/src/test/resources/relatives diff --git a/inez.model.tests/src/main/resources/root.xml b/inez.model/src/test/resources/root.xml similarity index 100% rename from inez.model.tests/src/main/resources/root.xml rename to inez.model/src/test/resources/root.xml diff --git a/inez.model.tests/src/main/resources/sumties b/inez.model/src/test/resources/sumties similarity index 100% rename from inez.model.tests/src/main/resources/sumties rename to inez.model/src/test/resources/sumties diff --git a/inez.model.tests/src/main/resources/test.properties b/inez.model/src/test/resources/test.properties similarity index 100% rename from inez.model.tests/src/main/resources/test.properties rename to inez.model/src/test/resources/test.properties diff --git a/inez.parser.tests/.classpath b/inez.parser.tests/.classpath deleted file mode 100644 index b0fcce7..0000000 --- a/inez.parser.tests/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/inez.parser.tests/.eclipse-pmd b/inez.parser.tests/.eclipse-pmd deleted file mode 100644 index 5324655..0000000 --- a/inez.parser.tests/.eclipse-pmd +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/inez.parser.tests/.project b/inez.parser.tests/.project deleted file mode 100644 index bad35e8..0000000 --- a/inez.parser.tests/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - inez.parser.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - ch.acanda.eclipse.pmd.builder.PMDBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - ch.acanda.eclipse.pmd.builder.PMDNature - - diff --git a/inez.parser.tests/.settings/org.eclipse.core.resources.prefs b/inez.parser.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/inez.parser.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/inez.parser.tests/.settings/org.eclipse.jdt.core.prefs b/inez.parser.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b52662..0000000 --- a/inez.parser.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,524 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning -org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 -org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=20 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_line_comments=false -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/inez.parser.tests/.settings/org.eclipse.jdt.ui.prefs b/inez.parser.tests/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a6d063b..0000000 --- a/inez.parser.tests/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,151 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_mag -formatter_settings_version=23 -sp_cleanup.add_all=false -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.also_simplify_lambda=true -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.array_with_curly=false -sp_cleanup.arrays_fill=false -sp_cleanup.bitwise_conditional_expression=false -sp_cleanup.boolean_literal=false -sp_cleanup.boolean_value_rather_than_comparison=false -sp_cleanup.break_loop=false -sp_cleanup.collection_cloning=false -sp_cleanup.comparing_on_criteria=false -sp_cleanup.comparison_statement=false -sp_cleanup.controlflow_merge=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -sp_cleanup.convert_to_switch_expressions=false -sp_cleanup.correct_indentation=false -sp_cleanup.do_while_rather_than_while=false -sp_cleanup.double_negation=false -sp_cleanup.else_if=false -sp_cleanup.embedded_if=false -sp_cleanup.evaluate_nullable=false -sp_cleanup.extract_increment=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.hash=false -sp_cleanup.if_condition=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.instanceof=false -sp_cleanup.instanceof_keyword=false -sp_cleanup.invert_equals=false -sp_cleanup.join=false -sp_cleanup.lazy_logical_operator=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.map_cloning=false -sp_cleanup.merge_conditional_blocks=false -sp_cleanup.multi_catch=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.no_string_creation=false -sp_cleanup.no_super=false -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false -sp_cleanup.operand_factorization=false -sp_cleanup.organize_imports=true -sp_cleanup.overridden_assignment=false -sp_cleanup.overridden_assignment_move_decl=true -sp_cleanup.plain_replacement=false -sp_cleanup.precompile_regex=false -sp_cleanup.primitive_comparison=false -sp_cleanup.primitive_parsing=false -sp_cleanup.primitive_rather_than_wrapper=false -sp_cleanup.primitive_serialization=false -sp_cleanup.pull_out_if_from_if_else=false -sp_cleanup.pull_up_assignment=false -sp_cleanup.push_down_negation=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.reduce_indentation=false -sp_cleanup.redundant_comparator=false -sp_cleanup.redundant_falling_through_block_end=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_method_parameters=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.replace_deprecated_calls=false -sp_cleanup.return_expression=false -sp_cleanup.simplify_boolean_if_else=false -sp_cleanup.simplify_lambda_expression_and_method_ref=false -sp_cleanup.single_used_field=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.standard_comparison=false -sp_cleanup.static_inner_class=false -sp_cleanup.strictly_equal_or_different=false -sp_cleanup.stringbuffer_to_stringbuilder=false -sp_cleanup.stringbuilder=false -sp_cleanup.stringbuilder_for_local_vars=true -sp_cleanup.stringconcat_stringbuffer_stringbuilder=false -sp_cleanup.stringconcat_to_textblock=false -sp_cleanup.substring=false -sp_cleanup.switch=false -sp_cleanup.switch_for_instanceof_pattern=false -sp_cleanup.system_property=false -sp_cleanup.system_property_boolean=false -sp_cleanup.system_property_file_encoding=false -sp_cleanup.system_property_file_separator=false -sp_cleanup.system_property_javaspecversion=false -sp_cleanup.system_property_javaversion=false -sp_cleanup.system_property_line_separator=false -sp_cleanup.system_property_path_separator=false -sp_cleanup.ternary_operator=false -sp_cleanup.try_with_resource=false -sp_cleanup.unlooped_while=false -sp_cleanup.unreachable_block=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_string_is_blank=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false -sp_cleanup.useless_continue=false -sp_cleanup.useless_return=false -sp_cleanup.valueof_rather_than_instantiation=false diff --git a/inez.parser.tests/META-INF/MANIFEST.MF b/inez.parser.tests/META-INF/MANIFEST.MF deleted file mode 100644 index e7b48f8..0000000 --- a/inez.parser.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Testing -Bundle-SymbolicName: io.github.magwas.inez.parser.tests -Bundle-Version: 0.0.1 -Export-Package: io.github.magwas.inez.parse -Require-Bundle: wrapped.io.github.magwas.konveyor-base-testing;bundle-version="0.4.0", - io.github.magwas.inez.parser, - org.antlr.antlr4-runtime;bundle-version="4.13.2", - wrapped.io.github.magwas.konveyor-base, - org.osgi.test.junit5;bundle-version="1.3.0", - org.osgi.test.common;bundle-version="1.3.0", - net.bytebuddy.byte-buddy-agent;bundle-version="1.17.7", - net.bytebuddy.byte-buddy;bundle-version="1.17.7", - org.objenesis;bundle-version="3.4.0", - org.mockito.mockito-core;bundle-version="5.19.0", - org.eclipse.jdt.junit5.runtime;bundle-version="1.1.300", - junit-jupiter-api;bundle-version="5.11.4", - junit-platform-commons;bundle-version="1.11.4", - wrapped.org.springframework.spring-aop;bundle-version="6.2.8", - wrapped.org.springframework.spring-expression;bundle-version="6.2.8", - wrapped.org.springframework.spring-context;bundle-version="6.2.8", - wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", - wrapped.org.springframework.spring-beans;bundle-version="6.2.8", - wrapped.org.springframework.spring-core;bundle-version="6.2.8", - wrapped.org.springframework.data.spring-data-keyvalue;bundle-version="3.5.1" -Automatic-Module-Name: io.github.magwas.inez.parser.tests -Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.parser.tests/README b/inez.parser.tests/README deleted file mode 100644 index 751997c..0000000 --- a/inez.parser.tests/README +++ /dev/null @@ -1 +0,0 @@ -tests for inez parser diff --git a/inez.parser.tests/build.properties b/inez.parser.tests/build.properties deleted file mode 100644 index 991fbde..0000000 --- a/inez.parser.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/main/java/,\ - src/generators-java,\ - target/generated-sources -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/inez.parser.tests/pom.xml b/inez.parser.tests/pom.xml deleted file mode 100644 index 1fc1e1f..0000000 --- a/inez.parser.tests/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - - io.github.magwas - inez - 0.0.1 - ../pom.xml - - io.github.magwas.inez.parser.tests - eclipse-test-plugin - ${project.artifactId} - Parser for Inez - https://github.com/kode-konveyor/inez-server.git - - - GPL affero - https://www.gnu.org/licenses/agpl-3.0.en.html - GNU Affero General Public License - - - - - Árpád Magosányi - m4gw4s@gmail.com - - - - scm:git:https://github.com/kode-konveyor/inez-server.git - scm:git:https://github.com/kode-konveyor/inez-server.git - https://github.com/kode-konveyor/inez-server.git - - - github - https://github.com/kode-konveyor/inez-server/issues - - - - website - Project site - https://repo.kodekonveyor.com/${project.artifactId} - - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${version.tycho} - - true - - - io.github.magwas.inez.parser - 1 - true - - - - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - true - - - - - diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextPluginTest.java b/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextPluginTest.java deleted file mode 100644 index 23f4c61..0000000 --- a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextPluginTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.github.magwas.inez.parse; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Map; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.osgi.test.common.annotation.InjectService; -import org.osgi.test.junit5.service.ServiceExtension; - -@ExtendWith(ServiceExtension.class) -@Tag("plugin") -class ParseTextPluginTest { - - @InjectService - ParseTextService parseText; - - @Test - void test() { - ParserOutput actual = parseText.apply("alice").toList().get(0); - assertEquals(new ParserOutput("alice", Map.of()), actual); - } -} diff --git a/inez.parser/.classpath b/inez.parser/.classpath index 284032a..80a432d 100644 --- a/inez.parser/.classpath +++ b/inez.parser/.classpath @@ -5,9 +5,24 @@ - - + + + + + + + + + + + + + + + + + diff --git a/inez.parser/.project b/inez.parser/.project index 5eef9cf..08f241e 100644 --- a/inez.parser/.project +++ b/inez.parser/.project @@ -16,7 +16,7 @@ - org.eclipse.pde.SchemaBuilder + ch.acanda.eclipse.pmd.builder.PMDBuilder @@ -25,16 +25,10 @@ - - ch.acanda.eclipse.pmd.builder.PMDBuilder - - - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature ch.acanda.eclipse.pmd.builder.PMDNature diff --git a/inez.parser/.settings/org.eclipse.core.resources.prefs b/inez.parser/.settings/org.eclipse.core.resources.prefs index e9441bb..cdfe4f1 100644 --- a/inez.parser/.settings/org.eclipse.core.resources.prefs +++ b/inez.parser/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/inez.parser/META-INF/MANIFEST.MF b/inez.parser/META-INF/MANIFEST.MF deleted file mode 100644 index 950671c..0000000 --- a/inez.parser/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: io.github.magwas.inez.parser -Bundle-SymbolicName: io.github.magwas.inez.parser;singleton:=true -Spring-Context: *;create-asynchronously:=false -Bundle-Activator: io.github.magwas.inez.parse.ParserBundleActivator -Bundle-Version: 0.0.1 -Bundle-Vendor: Árpád Magosányi -Export-Package: io.github.magwas.inez.parse, - io.github.magwas.inez.parser -Require-Bundle: org.antlr.antlr4-runtime;bundle-version="4.13.2", - wrapped.org.springframework.boot.spring-boot;bundle-version="3.5.3", - wrapped.org.springframework.boot.spring-boot-autoconfigure;bundle-version="3.5.3", - wrapped.org.springframework.spring-context;bundle-version="6.2.8", - wrapped.org.springframework.spring-core;bundle-version="6.2.8", - wrapped.org.springframework.spring-beans;bundle-version="6.2.8", - io.github.magwas.inez.parser, - org.eclipse.core.runtime;bundle-version="3.12.0", - wrapped.io.github.magwas.konveyor-base;bundle-version="0.4.7" -Bundle-RequiredExecutionEnvironment: JavaSE-21 -Automatic-Module-Name: io.github.magwas.inez.parser -Bundle-ClassPath: ., - target/classes diff --git a/inez.parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inez.parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 854467a..0000000 --- a/inez.parser/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -io.github.magwas.inez.parse.ParserBundleActivator diff --git a/inez.parser/build.properties b/inez.parser/build.properties deleted file mode 100644 index 74d495a..0000000 --- a/inez.parser/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -bin.includes = META-INF/,. -output.. = target/classes/ -source.. = src/main/java, target/generated-sources/antlr4 diff --git a/inez.parser/pom.xml b/inez.parser/pom.xml index fda1674..d448f56 100644 --- a/inez.parser/pom.xml +++ b/inez.parser/pom.xml @@ -7,8 +7,9 @@ 0.0.1 ../pom.xml - io.github.magwas.inez.parser - eclipse-plugin + io.github.magwas + inez.parser + ${project.version} ${project.artifactId} Parser for Inez https://github.com/kode-konveyor/inez-server.git @@ -43,66 +44,40 @@ true + 4.13.2 org.antlr antlr4-maven-plugin - 4.13.2 + ${version.antlr4} + + + org.antlr + antlr4-runtime + ${version.antlr4} org.springframework.boot spring-boot-autoconfigure - 3.5.3 + ${version.spring-boot} io.github.magwas - konveyor-base + konveyor.base ${version.konveyor} runtime io.github.magwas - konveyor-base-testing + konveyor.base ${version.konveyor} + testing test - - org.osgi - osgi.core - 6.0.0 - provided - - - org.eclipse.tycho - tycho-packaging-plugin - - - org.eclipse.tycho - tycho-maven-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - - copy-dependencies - - initialize - - true - - - - - - org.apache.maven.plugins - maven-source-plugin - org.antlr antlr4-maven-plugin @@ -113,39 +88,16 @@ antlr4 generate-sources + + ${project.build.directory}/generated-sources/main + - - org.apache.maven.plugins - maven-pmd-plugin - - true - - org.codehaus.mojo exec-maven-plugin - - - pre-site - - true - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - true - - - - diff --git a/inez.parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java b/inez.parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java deleted file mode 100644 index 14d38fa..0000000 --- a/inez.parser/src/main/java/io/github/magwas/inez/parse/ParserBundleActivator.java +++ /dev/null @@ -1,45 +0,0 @@ -package io.github.magwas.inez.parse; - -import java.util.Hashtable; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.wiring.BundleWiring; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.util.Assert; - -@SpringBootApplication -@ComponentScan(basePackages = {"io.github.magwas"}) -public class ParserBundleActivator implements BundleActivator { - - ConfigurableApplicationContext appContext; - - @Autowired - ParseTextService parseText; - - @Override - public void start(final BundleContext bundleContext) { - Bundle bundle = bundleContext.getBundle(); - BundleWiring bundleWiring = bundle.adapt(BundleWiring.class); - ClassLoader classLoader = bundleWiring.getClassLoader(); - Thread.currentThread().setContextClassLoader(classLoader); - appContext = new AnnotationConfigApplicationContext(ParserBundleActivator.class); - parseText = appContext.getBean(ParseTextService.class); - Assert.notNull(parseText, "parseText is null"); - ServiceRegistration registration = - bundleContext.registerService(ParseTextService.class, parseText, new Hashtable()); - System.err.println("registered ParseTextService:" + registration); - } - - @Override - public void stop(final BundleContext bundleContext) { - SpringApplication.exit(appContext, () -> 0); - } -} diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/IdTestDataGenerator.java diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/InputTestDataGenerator.java diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParseTextServiceStubGenerator.java diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ParserOutputTestDataGenerator.java diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/ReferenceTestDataGenerator.java diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/RepresentationTestDataGenerator.java diff --git a/inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java b/inez.parser/src/test/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java similarity index 100% rename from inez.parser.tests/src/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java rename to inez.parser/src/test/generators-java/io/github/magwas/inez/parse/TestDataGeneratorConstants.java diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java b/inez.parser/src/test/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java similarity index 100% rename from inez.parser.tests/src/main/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java rename to inez.parser/src/test/java/io/github/magwas/inez/parse/CreateParserFromTokensServiceStub.java diff --git a/inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java b/inez.parser/src/test/java/io/github/magwas/inez/parse/ParseTextTest.java similarity index 100% rename from inez.parser.tests/src/main/java/io/github/magwas/inez/parse/ParseTextTest.java rename to inez.parser/src/test/java/io/github/magwas/inez/parse/ParseTextTest.java diff --git a/inez.parser.tests/src/main/resources/idreferences b/inez.parser/src/test/resources/idreferences similarity index 100% rename from inez.parser.tests/src/main/resources/idreferences rename to inez.parser/src/test/resources/idreferences diff --git a/inez.parser.tests/src/main/resources/ids b/inez.parser/src/test/resources/ids similarity index 100% rename from inez.parser.tests/src/main/resources/ids rename to inez.parser/src/test/resources/ids diff --git a/inez.parser.tests/src/main/resources/inputs b/inez.parser/src/test/resources/inputs similarity index 100% rename from inez.parser.tests/src/main/resources/inputs rename to inez.parser/src/test/resources/inputs diff --git a/inez.parser.tests/src/main/resources/outputs b/inez.parser/src/test/resources/outputs similarity index 100% rename from inez.parser.tests/src/main/resources/outputs rename to inez.parser/src/test/resources/outputs diff --git a/inez.parser.tests/src/main/resources/parse_text_stubdata b/inez.parser/src/test/resources/parse_text_stubdata similarity index 100% rename from inez.parser.tests/src/main/resources/parse_text_stubdata rename to inez.parser/src/test/resources/parse_text_stubdata diff --git a/inez.parser.tests/src/main/resources/references b/inez.parser/src/test/resources/references similarity index 100% rename from inez.parser.tests/src/main/resources/references rename to inez.parser/src/test/resources/references diff --git a/inez.parser.tests/src/main/resources/representations b/inez.parser/src/test/resources/representations similarity index 100% rename from inez.parser.tests/src/main/resources/representations rename to inez.parser/src/test/resources/representations diff --git a/inez.target/.project b/inez.target/.project deleted file mode 100644 index 7b71985..0000000 --- a/inez.target/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - inez.target - - - - - - - - diff --git a/inez.target/.settings/org.eclipse.core.resources.prefs b/inez.target/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/inez.target/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/inez.target/.settings/org.eclipse.jdt.core.prefs b/inez.target/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b52662..0000000 --- a/inez.target/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,524 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning -org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 -org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=20 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_line_comments=false -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/inez.target/.settings/org.eclipse.jdt.ui.prefs b/inez.target/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a6d063b..0000000 --- a/inez.target/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,151 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_mag -formatter_settings_version=23 -sp_cleanup.add_all=false -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.also_simplify_lambda=true -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.array_with_curly=false -sp_cleanup.arrays_fill=false -sp_cleanup.bitwise_conditional_expression=false -sp_cleanup.boolean_literal=false -sp_cleanup.boolean_value_rather_than_comparison=false -sp_cleanup.break_loop=false -sp_cleanup.collection_cloning=false -sp_cleanup.comparing_on_criteria=false -sp_cleanup.comparison_statement=false -sp_cleanup.controlflow_merge=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -sp_cleanup.convert_to_switch_expressions=false -sp_cleanup.correct_indentation=false -sp_cleanup.do_while_rather_than_while=false -sp_cleanup.double_negation=false -sp_cleanup.else_if=false -sp_cleanup.embedded_if=false -sp_cleanup.evaluate_nullable=false -sp_cleanup.extract_increment=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.hash=false -sp_cleanup.if_condition=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.instanceof=false -sp_cleanup.instanceof_keyword=false -sp_cleanup.invert_equals=false -sp_cleanup.join=false -sp_cleanup.lazy_logical_operator=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.map_cloning=false -sp_cleanup.merge_conditional_blocks=false -sp_cleanup.multi_catch=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.no_string_creation=false -sp_cleanup.no_super=false -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false -sp_cleanup.operand_factorization=false -sp_cleanup.organize_imports=true -sp_cleanup.overridden_assignment=false -sp_cleanup.overridden_assignment_move_decl=true -sp_cleanup.plain_replacement=false -sp_cleanup.precompile_regex=false -sp_cleanup.primitive_comparison=false -sp_cleanup.primitive_parsing=false -sp_cleanup.primitive_rather_than_wrapper=false -sp_cleanup.primitive_serialization=false -sp_cleanup.pull_out_if_from_if_else=false -sp_cleanup.pull_up_assignment=false -sp_cleanup.push_down_negation=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.reduce_indentation=false -sp_cleanup.redundant_comparator=false -sp_cleanup.redundant_falling_through_block_end=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_method_parameters=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.replace_deprecated_calls=false -sp_cleanup.return_expression=false -sp_cleanup.simplify_boolean_if_else=false -sp_cleanup.simplify_lambda_expression_and_method_ref=false -sp_cleanup.single_used_field=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.standard_comparison=false -sp_cleanup.static_inner_class=false -sp_cleanup.strictly_equal_or_different=false -sp_cleanup.stringbuffer_to_stringbuilder=false -sp_cleanup.stringbuilder=false -sp_cleanup.stringbuilder_for_local_vars=true -sp_cleanup.stringconcat_stringbuffer_stringbuilder=false -sp_cleanup.stringconcat_to_textblock=false -sp_cleanup.substring=false -sp_cleanup.switch=false -sp_cleanup.switch_for_instanceof_pattern=false -sp_cleanup.system_property=false -sp_cleanup.system_property_boolean=false -sp_cleanup.system_property_file_encoding=false -sp_cleanup.system_property_file_separator=false -sp_cleanup.system_property_javaspecversion=false -sp_cleanup.system_property_javaversion=false -sp_cleanup.system_property_line_separator=false -sp_cleanup.system_property_path_separator=false -sp_cleanup.ternary_operator=false -sp_cleanup.try_with_resource=false -sp_cleanup.unlooped_while=false -sp_cleanup.unreachable_block=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_string_is_blank=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false -sp_cleanup.useless_continue=false -sp_cleanup.useless_return=false -sp_cleanup.valueof_rather_than_instantiation=false diff --git a/inez.target/README b/inez.target/README deleted file mode 100644 index 9fae6fb..0000000 --- a/inez.target/README +++ /dev/null @@ -1 +0,0 @@ -the target definition of inez diff --git a/inez.target/hooks/initialize b/inez.target/hooks/initialize deleted file mode 100755 index fdaa68e..0000000 --- a/inez.target/hooks/initialize +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -xe -pwd - -JFX_VERSION=21.0.8 -JFX_BASE=https://download2.gluonhq.com/openjfx/${JFX_VERSION}/openjfx-${JFX_VERSION} -JFX_CACHE=~/.m2/repository/openjfx - -ZIP_LINUX=${JFX_CACHE}/openjfx-linux_x64.zip -ZIP_MAC_X64=${JFX_CACHE}/openjfx-osx_x64.zip -ZIP_WIN=${JFX_CACHE}/openjfx-windows_x64.zip - -TARGET_BASE=target/javafx -TARGET_LINUX=${TARGET_BASE}/linux_x64 -TARGET_MAC_X64=${TARGET_BASE}/osx_x64 -TARGET_WIN=${TARGET_BASE}/windows_x64 - -mkdir -p ${JFX_CACHE} - -if [ ! -e ${ZIP_LINUX} ]; then - wget -q ${JFX_BASE}_linux-x64_bin-sdk.zip -O ${ZIP_LINUX} -fi - -if [ ! -e ${ZIP_MAC_X64} ]; then - wget -q ${JFX_BASE}_osx-x64_bin-sdk.zip -O ${ZIP_MAC_X64} -fi - -if [ ! -e ${ZIP_WIN} ]; then - wget -q ${JFX_BASE}_windows-x64_bin-sdk.zip -O ${ZIP_WIN} -fi - -if [ ! -e ${TARGET_WIN} ] -then - mkdir -p ${TARGET_LINUX} - mkdir -p ${TARGET_MAC_X64} - mkdir -p ${TARGET_WIN} - - unzip -d ${TARGET_LINUX} ${ZIP_LINUX} - unzip -d ${TARGET_MAC_X64} ${ZIP_MAC_X64} - unzip -d ${TARGET_WIN} ${ZIP_WIN} -fi - -mkdir -p ../inez.ui/target/dependency -cp ${TARGET_LINUX}/javafx-sdk-${JFX_VERSION}/lib/*.jar ../inez.ui/target/dependency diff --git a/inez.target/inez.target b/inez.target/inez.target deleted file mode 100644 index 3b4d34e..0000000 --- a/inez.target/inez.target +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - io.github.magwas - konveyor-base-testing - 0.4.38 - jar - - - io.github.magwas - konveyor-base - 0.4.38 - jar - - - io.micrometer - micrometer-commons - 1.14.8 - jar - - - io.micrometer - micrometer-observation - 1.14.8 - jar - - - net.bytebuddy - byte-buddy-agent - 1.17.7 - jar - - - net.bytebuddy - byte-buddy - 1.17.7 - jar - - - org.antlr - antlr4-runtime - 4.13.2 - jar - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.7 - jar - - - org.mockito - mockito-core - 5.19.0 - jar - - - org.objenesis - objenesis - 3.4 - jar - - - org.osgi - org.osgi.test.common - 1.3.0 - jar - - - org.osgi - org.osgi.test.junit5 - 1.3.0 - jar - - - org.springframework.boot - spring-boot-autoconfigure - 3.5.3 - jar - - - org.springframework.boot - spring-boot - 3.5.3 - jar - - - org.springframework.data - spring-data-commons - 3.5.1 - jar - - - org.springframework.data - spring-data-keyvalue - 3.5.1 - jar - - - org.springframework - spring-aop - 6.2.8 - jar - - - org.springframework - spring-beans - 6.2.8 - jar - - - org.springframework - spring-context - 6.2.8 - jar - - - org.springframework - spring-core - 6.2.8 - jar - - - org.springframework - spring-expression - 6.2.8 - jar - - - org.springframework - spring-jcl - 6.2.8 - jar - - - org.springframework - spring-test - 6.2.9 - jar - - - org.springframework - spring-tx - 6.2.8 - jar - - - - - diff --git a/inez.target/pom.xml b/inez.target/pom.xml deleted file mode 100644 index e1873ee..0000000 --- a/inez.target/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - 4.0.0 - - io.github.magwas - inez - 0.0.1 - ../pom.xml - - io.github.magwas.inez.target - eclipse-target-definition - ${project.artifactId} - Eclipse target description for Inez - https://github.com/kode-konveyor/inez-server.git - - - GPL affero - https://www.gnu.org/licenses/agpl-3.0.en.html - GNU Affero General Public License - - - - - Árpád Magosányi - m4gw4s@gmail.com - - - - scm:git:https://github.com/kode-konveyor/inez-server.git - scm:git:https://github.com/kode-konveyor/inez-server.git - https://github.com/kode-konveyor/inez-server.git - - - github - https://github.com/kode-konveyor/inez-server/issues - - - - website - Project site - https://repo.kodekonveyor.com/${project.artifactId} - - - - - org.osgi - osgi.core - 6.0.0 - provided - - - org.openjfx - javafx-graphics - 21.0.8 - - - org.openjfx - javafx-controls - 21.0.8 - - - io.github.magwas - konveyor-base-testing - ${version.konveyor} - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${version.tycho} - true - - - org.eclipse.tycho - target-platform-configuration - ${version.tycho} - - - inez.target - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - copy-dependencies - - initialize - - true - - - - - - - diff --git a/inez.ui.product/.classpath b/inez.ui.product/.classpath deleted file mode 100644 index aa6ee38..0000000 --- a/inez.ui.product/.classpath +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/inez.ui.product/.gitignore b/inez.ui.product/.gitignore deleted file mode 100644 index e660fd9..0000000 --- a/inez.ui.product/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bin/ diff --git a/inez.ui.product/.project b/inez.ui.product/.project deleted file mode 100644 index 9c89f41..0000000 --- a/inez.ui.product/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - inez.ui.product - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/inez.ui.product/.settings/org.eclipse.core.resources.prefs b/inez.ui.product/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99..0000000 --- a/inez.ui.product/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/inez.ui.product/.settings/org.eclipse.jdt.core.prefs b/inez.ui.product/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b52662..0000000 --- a/inez.ui.product/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,524 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning -org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 -org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=20 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_line_comments=false -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/inez.ui.product/.settings/org.eclipse.jdt.ui.prefs b/inez.ui.product/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a6d063b..0000000 --- a/inez.ui.product/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,151 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_mag -formatter_settings_version=23 -sp_cleanup.add_all=false -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.also_simplify_lambda=true -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.array_with_curly=false -sp_cleanup.arrays_fill=false -sp_cleanup.bitwise_conditional_expression=false -sp_cleanup.boolean_literal=false -sp_cleanup.boolean_value_rather_than_comparison=false -sp_cleanup.break_loop=false -sp_cleanup.collection_cloning=false -sp_cleanup.comparing_on_criteria=false -sp_cleanup.comparison_statement=false -sp_cleanup.controlflow_merge=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -sp_cleanup.convert_to_switch_expressions=false -sp_cleanup.correct_indentation=false -sp_cleanup.do_while_rather_than_while=false -sp_cleanup.double_negation=false -sp_cleanup.else_if=false -sp_cleanup.embedded_if=false -sp_cleanup.evaluate_nullable=false -sp_cleanup.extract_increment=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.hash=false -sp_cleanup.if_condition=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.instanceof=false -sp_cleanup.instanceof_keyword=false -sp_cleanup.invert_equals=false -sp_cleanup.join=false -sp_cleanup.lazy_logical_operator=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.map_cloning=false -sp_cleanup.merge_conditional_blocks=false -sp_cleanup.multi_catch=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.no_string_creation=false -sp_cleanup.no_super=false -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false -sp_cleanup.operand_factorization=false -sp_cleanup.organize_imports=true -sp_cleanup.overridden_assignment=false -sp_cleanup.overridden_assignment_move_decl=true -sp_cleanup.plain_replacement=false -sp_cleanup.precompile_regex=false -sp_cleanup.primitive_comparison=false -sp_cleanup.primitive_parsing=false -sp_cleanup.primitive_rather_than_wrapper=false -sp_cleanup.primitive_serialization=false -sp_cleanup.pull_out_if_from_if_else=false -sp_cleanup.pull_up_assignment=false -sp_cleanup.push_down_negation=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.reduce_indentation=false -sp_cleanup.redundant_comparator=false -sp_cleanup.redundant_falling_through_block_end=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_method_parameters=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.replace_deprecated_calls=false -sp_cleanup.return_expression=false -sp_cleanup.simplify_boolean_if_else=false -sp_cleanup.simplify_lambda_expression_and_method_ref=false -sp_cleanup.single_used_field=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.standard_comparison=false -sp_cleanup.static_inner_class=false -sp_cleanup.strictly_equal_or_different=false -sp_cleanup.stringbuffer_to_stringbuilder=false -sp_cleanup.stringbuilder=false -sp_cleanup.stringbuilder_for_local_vars=true -sp_cleanup.stringconcat_stringbuffer_stringbuilder=false -sp_cleanup.stringconcat_to_textblock=false -sp_cleanup.substring=false -sp_cleanup.switch=false -sp_cleanup.switch_for_instanceof_pattern=false -sp_cleanup.system_property=false -sp_cleanup.system_property_boolean=false -sp_cleanup.system_property_file_encoding=false -sp_cleanup.system_property_file_separator=false -sp_cleanup.system_property_javaspecversion=false -sp_cleanup.system_property_javaversion=false -sp_cleanup.system_property_line_separator=false -sp_cleanup.system_property_path_separator=false -sp_cleanup.ternary_operator=false -sp_cleanup.try_with_resource=false -sp_cleanup.unlooped_while=false -sp_cleanup.unreachable_block=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_string_is_blank=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false -sp_cleanup.useless_continue=false -sp_cleanup.useless_return=false -sp_cleanup.valueof_rather_than_instantiation=false diff --git a/inez.ui.product/.settings/org.eclipse.m2e.core.prefs b/inez.ui.product/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/inez.ui.product/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/inez.ui.product/Inez.product b/inez.ui.product/Inez.product deleted file mode 100644 index b4fce7a..0000000 --- a/inez.ui.product/Inez.product +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - -consoleLog - - -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --Dosgi.framework.extensions=org.eclipse.fx.osgi --Defxclipse.java-modules.dir=/usr/local/lib/javafx-sdk-21.0.8/lib - - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - - - - - - - - - - - - - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/inez.ui.product/README b/inez.ui.product/README deleted file mode 100644 index e04bd1a..0000000 --- a/inez.ui.product/README +++ /dev/null @@ -1,2 +0,0 @@ -Product definition for the UI of Inez. - diff --git a/inez.ui.product/hooks/pre-site b/inez.ui.product/hooks/pre-site deleted file mode 100755 index 0a821da..0000000 --- a/inez.ui.product/hooks/pre-site +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -xe -rm -rf .konveyor/generated-site -mkdir -p .konveyor/generated-site/markdown .konveyor/generated-site/resources .konveyor/generated-site/resources/download -cp README .konveyor/generated-site/markdown/index.md -cp pom.xml .konveyor/generated-site/resources diff --git a/inez.ui.product/hooks/site-deploy b/inez.ui.product/hooks/site-deploy deleted file mode 100755 index 66de866..0000000 --- a/inez.ui.product/hooks/site-deploy +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -xe -.konveyor/tools/deploySite.sh $1 -rsync -rv .konveyor/generated-site/resources/download $1 - diff --git a/inez.ui.product/hooks/validate b/inez.ui.product/hooks/validate deleted file mode 100755 index 10433df..0000000 --- a/inez.ui.product/hooks/validate +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -if [ -d target/products ] -then - rm -rf .konveyor/generated-site/resources/download - mkdir -p .konveyor/generated-site/resources/download - #cp target/products/*.* .konveyor/generated-site/resources/download -fi diff --git a/inez.ui.product/icons/eclipse128.png b/inez.ui.product/icons/eclipse128.png deleted file mode 100644 index 11b6f46ce1ec1433f44a097885e9d607f945bd25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6861 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 diff --git a/inez.ui.product/icons/eclipse16.png b/inez.ui.product/icons/eclipse16.png deleted file mode 100644 index 7fc69518a814edec2c39377e5ac29df73833087e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 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 ZU?lVyPp|l^_@ARinz!{-tCVe{{};nLi2MKm diff --git a/inez.ui.product/icons/eclipse32.png b/inez.ui.product/icons/eclipse32.png deleted file mode 100644 index bf856800755a9452f85c8d5948adf5334706c8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2233 zcmbVOX;c&E8Xl0XAc&}-h!O${qFE*@nUY{gf&>X=Q=kZ#Wq=6D#AJX#3tpCjQiUrD z7cju7B2@5zQl(V3iXfus<+_wALS?C3mqH6F_260dJw?5jyjdxkA*P(e5vg2bXJVl@nKWrzgE2^HcvI2abo zQup@3o&c~!DGv=t!$tm(6j2bxdL5!xp~BDr;OV7RiKPiJij%-`awQu--P(!A$z^PO z7+pjbsd#X_+&4`Phol9BO4AagEE(R5gY(ov7=Z#t#W<}ZQK^BnZ2UW32;1wANqF2l z6*Pg3fA3VdC=ka()G&@tBom}$1{ucyi6E86WHPtlC}faKB2!2pg#a=kDg`2waSIO~ zv!<5CLcx5W1zVWJ#>bL0~+BBAR$a zh2w?LaU!u)uGGu=61|U@53A+Lu*^q|C~)s`49P!YpXx*BQfX8HPk=e^0fHWUZ*MM* z!sqko6dsLB!7pHC|8L$%m_sCell)K9EFNKUlG&z&dBlbVax0 zg{0$N{6{9w^RmtvbHCX={$^>nWHRNGvnYln4~Q=-O+#P(Zv$wuD1B~=g6ObdmLe$s|WmR8&A9(Xz_}h z_%Y9G0}zIsls1N$4j-9sb92qA+h`Lwp6_O|el-Ba?p@>U40Q4KRc9lG4QG^-naVJM zb7(O$@z0>3hnaR$TPfdJmmCfCGF(G62cUg+|1eN@lnxk1#dLc%{d7Aj?6up^iW|qh z+jP3z__3Y7cdDa}Z0^|rkZbFUBeQ2u^`9J>zS&Vze&Y14p!pwDOLiDcU4D~wuz&91 zwoA=rv&_!gSJ%&Pvv+Lbvkx3LD@wSBPW3(1SvRzM1uzHElKU)Hc|w7N@4!2FX_WQqO4$ye zMsq^PnU7e#H>|m`L3R77-}pD+y7>esJpcGF)ZpDy8F$+p>t5rE<-_yOz_n4$_3Ows zRsPl0Zr5bOZ3Pb$FRxy-o$gHxS=+KJ;0##raMI13(5Xdd9p7Flzjd>3mUd{mbY*0^ ziRc#h4(*D}MMe5oLnm^uY6B1;i+Q@X_}UjYI)KJ!ZAOLc5tDO=Mv8}BR~Wv6I0o#- z*U9DJrxo0e)aZoauwTqHDYj0u z|5+>h8t=%~f?2uU5lz*TjE8q0&;7F^+qLbt2gzXuf*D`MTT^P4=~q+rkKIjc-d1Ec znsgdi00ong$gs|sYi(%*IVAfp3Ar%v#N9BE>kIE5jdqZnU1b3}$ju9WpJdzC7v@ zv#eZ_o!(StUr~6!XCS5P;)^9d_6+wP?_lNTj=!h)8drlo+qZ-J`BNerV09L|eo$rpEDKq)E%Yo4!8TW7&L&S9z2Z~Ol%F#@yr{dT0Y@y z+7jN;YoWo(N=&TioKBrcwU1$*?yBR|rtdX+t~;MTw(aJaI_SnKks*f_C+C!JyoBG! zJ}7gzV&{@$DrIHm2)JX{2aT4780@%_9$r}~x+(&k+GRlV&dfwJo1?MoBGP?-6*gJ4 z=v*h=T1jkX>F?j)X8*d$#oza9;$}@|MTFfc_n$mQzpnE$_ETN|L11TVbJB&zUv+6h z=lSJ~`sPqe?~`HwTqMc5Y<)!K7=*yBO z)`Hr=lE(Wk?YSPy>^?2kF^w%!o;!lS&wQ`z-7)f@zU!hdIoi;Y3P_+ h%lPOsapB}!3o?-0Ch6$S^m+F;Aru7g8@zXC{RfC%fX@H` diff --git a/inez.ui.product/icons/eclipse48.png b/inez.ui.product/icons/eclipse48.png deleted file mode 100644 index f9706a7ccecb1b8c57108b15fe7bcab652e42a42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2909 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 diff --git a/inez.ui.product/icons/eclipse512.png b/inez.ui.product/icons/eclipse512.png deleted file mode 100644 index 825137fb99328f9cdf3bff8ba3366e5cbc591379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29447 zcmbTdby(Ej(?9&)r5mKXR1ieEK{^Bp5lJcOMrjas0YRk^1S~)h=~B8DK|*N}K@gUd z?%0K`-v^~?Hs{RDnR(5eIdjfFH#OFyq2!+&jb$a9qXt?-4aOJz@>*Vfg=IZ1U{_vZt3IGuKd74`V zSsC3{a`yMV;dDWBBg{7d91Q>}YGDCRфd=FgRJ^fS#_Sz5ve4Z|<0+zBy5=H@9 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 diff --git a/inez.ui.product/icons/eclipse64.png b/inez.ui.product/icons/eclipse64.png deleted file mode 100644 index 5a5df2dcf224893be82973352127297a839692e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3682 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 z - - 4.0.0 - - io.github.magwas - inez - 0.0.1 - ../pom.xml - - io.github.magwas.inez.ui.product - eclipse-repository - ${project.artifactId} - Packaging of the Inez ui - https://github.com/kode-konveyor/inez-server.git - - - GPL affero - https://www.gnu.org/licenses/agpl-3.0.en.html - GNU Affero General Public License - - - - - Árpád Magosányi - m4gw4s@gmail.com - - - - scm:git:https://github.com/kode-konveyor/inez-server.git - scm:git:https://github.com/kode-konveyor/inez-server.git - https://github.com/kode-konveyor/inez-server.git - - - github - https://github.com/kode-konveyor/inez-server/issues - - - - website - Project site - https://repo.kodekonveyor.com/${project.artifactId} - - - - true - - - - - - maven-pmd-plugin - - true - - - - maven-dependency-plugin - - - org.codehaus.mojo - exec-maven-plugin - - - - - - org.eclipse.tycho - target-platform-configuration - ${version.tycho} - - ${jdk.version.full} - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - macosx - cocoa - x86_64 - - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${version.tycho} - - - - Inez - Inez - - - - - - materialize-products - - materialize-products - - - - archive-products - - archive-products - - - - - - org.eclipse.tycho - tycho-packaging-plugin - - - org.eclipse.tycho - tycho-maven-plugin - - - org.codehaus.mojo - exec-maven-plugin - - - maven-dependency-plugin - - - - diff --git a/inez.ui.product/src/site/site.xml b/inez.ui.product/src/site/site.xml deleted file mode 100644 index f5ed1aa..0000000 --- a/inez.ui.product/src/site/site.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - org.apache.maven.skins - maven-fluido-skin - 1.5 - - - - - - - - - diff --git a/inez.ui.tests/.classpath b/inez.ui.tests/.classpath deleted file mode 100644 index 030981d..0000000 --- a/inez.ui.tests/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/inez.ui.tests/.eclipse-pmd b/inez.ui.tests/.eclipse-pmd deleted file mode 100644 index 5324655..0000000 --- a/inez.ui.tests/.eclipse-pmd +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/inez.ui.tests/.project b/inez.ui.tests/.project deleted file mode 100644 index 976f5e1..0000000 --- a/inez.ui.tests/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - inez.ui.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - ch.acanda.eclipse.pmd.builder.PMDBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - ch.acanda.eclipse.pmd.builder.PMDNature - - diff --git a/inez.ui.tests/.settings/org.eclipse.core.resources.prefs b/inez.ui.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/inez.ui.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/inez.ui.tests/.settings/org.eclipse.jdt.core.prefs b/inez.ui.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b52662..0000000 --- a/inez.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,524 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning -org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 -org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=20 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_line_comments=false -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/inez.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/inez.ui.tests/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a6d063b..0000000 --- a/inez.ui.tests/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,151 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_mag -formatter_settings_version=23 -sp_cleanup.add_all=false -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.also_simplify_lambda=true -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.array_with_curly=false -sp_cleanup.arrays_fill=false -sp_cleanup.bitwise_conditional_expression=false -sp_cleanup.boolean_literal=false -sp_cleanup.boolean_value_rather_than_comparison=false -sp_cleanup.break_loop=false -sp_cleanup.collection_cloning=false -sp_cleanup.comparing_on_criteria=false -sp_cleanup.comparison_statement=false -sp_cleanup.controlflow_merge=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -sp_cleanup.convert_to_switch_expressions=false -sp_cleanup.correct_indentation=false -sp_cleanup.do_while_rather_than_while=false -sp_cleanup.double_negation=false -sp_cleanup.else_if=false -sp_cleanup.embedded_if=false -sp_cleanup.evaluate_nullable=false -sp_cleanup.extract_increment=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.hash=false -sp_cleanup.if_condition=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.instanceof=false -sp_cleanup.instanceof_keyword=false -sp_cleanup.invert_equals=false -sp_cleanup.join=false -sp_cleanup.lazy_logical_operator=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.map_cloning=false -sp_cleanup.merge_conditional_blocks=false -sp_cleanup.multi_catch=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.no_string_creation=false -sp_cleanup.no_super=false -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false -sp_cleanup.operand_factorization=false -sp_cleanup.organize_imports=true -sp_cleanup.overridden_assignment=false -sp_cleanup.overridden_assignment_move_decl=true -sp_cleanup.plain_replacement=false -sp_cleanup.precompile_regex=false -sp_cleanup.primitive_comparison=false -sp_cleanup.primitive_parsing=false -sp_cleanup.primitive_rather_than_wrapper=false -sp_cleanup.primitive_serialization=false -sp_cleanup.pull_out_if_from_if_else=false -sp_cleanup.pull_up_assignment=false -sp_cleanup.push_down_negation=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.reduce_indentation=false -sp_cleanup.redundant_comparator=false -sp_cleanup.redundant_falling_through_block_end=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_method_parameters=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.replace_deprecated_calls=false -sp_cleanup.return_expression=false -sp_cleanup.simplify_boolean_if_else=false -sp_cleanup.simplify_lambda_expression_and_method_ref=false -sp_cleanup.single_used_field=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.standard_comparison=false -sp_cleanup.static_inner_class=false -sp_cleanup.strictly_equal_or_different=false -sp_cleanup.stringbuffer_to_stringbuilder=false -sp_cleanup.stringbuilder=false -sp_cleanup.stringbuilder_for_local_vars=true -sp_cleanup.stringconcat_stringbuffer_stringbuilder=false -sp_cleanup.stringconcat_to_textblock=false -sp_cleanup.substring=false -sp_cleanup.switch=false -sp_cleanup.switch_for_instanceof_pattern=false -sp_cleanup.system_property=false -sp_cleanup.system_property_boolean=false -sp_cleanup.system_property_file_encoding=false -sp_cleanup.system_property_file_separator=false -sp_cleanup.system_property_javaspecversion=false -sp_cleanup.system_property_javaversion=false -sp_cleanup.system_property_line_separator=false -sp_cleanup.system_property_path_separator=false -sp_cleanup.ternary_operator=false -sp_cleanup.try_with_resource=false -sp_cleanup.unlooped_while=false -sp_cleanup.unreachable_block=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_string_is_blank=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false -sp_cleanup.useless_continue=false -sp_cleanup.useless_return=false -sp_cleanup.valueof_rather_than_instantiation=false diff --git a/inez.ui.tests/META-INF/MANIFEST.MF b/inez.ui.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 22a513e..0000000 --- a/inez.ui.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Tests -Bundle-SymbolicName: io.github.magwas.inez.ui.tests -Bundle-Version: 0.0.1 -Require-Bundle: org.mockito.mockito-core;bundle-version="5.18.0", - junit-jupiter-api;bundle-version="5.11.4", - io.github.magwas.inez.parser, - io.github.magwas.inez.model, - io.github.magwas.inez.model.tests;bundle-version="0.0.1", - io.github.magwas.inez.parser.tests;bundle-version="0.0.1", - io.github.magwas.inez.ui;bundle-version="0.0.1" -Automatic-Module-Name: io.github.magwas.inez.ui.tests -Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/inez.ui.tests/README b/inez.ui.tests/README deleted file mode 100644 index af27ef7..0000000 --- a/inez.ui.tests/README +++ /dev/null @@ -1 +0,0 @@ -UI tests for inez diff --git a/inez.ui.tests/build.properties b/inez.ui.tests/build.properties deleted file mode 100644 index 991fbde..0000000 --- a/inez.ui.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/main/java/,\ - src/generators-java,\ - target/generated-sources -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/inez.ui.tests/pom.xml b/inez.ui.tests/pom.xml deleted file mode 100644 index 5bc5992..0000000 --- a/inez.ui.tests/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - - io.github.magwas - inez - 0.0.1 - ../pom.xml - - io.github.magwas.inez.ui.tests - eclipse-test-plugin - ${project.artifactId} - model layer for Inez - https://github.com/kode-konveyor/inez-server.git - - - GPL affero - https://www.gnu.org/licenses/agpl-3.0.en.html - GNU Affero General Public License - - - - - Árpád Magosányi - m4gw4s@gmail.com - - - - scm:git:https://github.com/kode-konveyor/inez-server.git - scm:git:https://github.com/kode-konveyor/inez-server.git - https://github.com/kode-konveyor/inez-server.git - - - github - https://github.com/kode-konveyor/inez-server/issues - - - - website - Project site - https://repo.kodekonveyor.com/${project.artifactId} - - - - - - org.eclipse.tycho - tycho-surefire-plugin - - true - - - io.github.magwas.inez.parser - 1 - true - - - io.github.magwas.inez.model - 2 - true - - - io.github.magwas.inez.ui - 3 - true - - - - - - - diff --git a/inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java b/inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java deleted file mode 100644 index f48cf29..0000000 --- a/inez.ui.tests/src/main/java/io/github/magwas/inez/ui/tree/MyEditorInputTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import io.github.magwas.inez.element.BridiElement; -import io.github.magwas.inez.element.BridiElementTestData; - -class MyEditorInputTest implements BridiElementTestData { - - @Test - @DisplayName("exists") - void test() { - BridiElement mock = Mockito.mock(BridiElement.class); - MyEditorInput e = new MyEditorInput(mock); - assertTrue(e.exists()); - } -} diff --git a/inez.ui/.classpath b/inez.ui/.classpath deleted file mode 100644 index a89833a..0000000 --- a/inez.ui/.classpath +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/inez.ui/.eclipse-pmd b/inez.ui/.eclipse-pmd deleted file mode 100644 index 5324655..0000000 --- a/inez.ui/.eclipse-pmd +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/inez.ui/.project b/inez.ui/.project deleted file mode 100644 index b8972d1..0000000 --- a/inez.ui/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - inez.ui - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - ch.acanda.eclipse.pmd.builder.PMDBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - ch.acanda.eclipse.pmd.builder.PMDNature - - diff --git a/inez.ui/.settings/org.eclipse.core.resources.prefs b/inez.ui/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99..0000000 --- a/inez.ui/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/inez.ui/.settings/org.eclipse.jdt.core.prefs b/inez.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b52662..0000000 --- a/inez.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,524 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning -org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 -org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 -org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=20 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_line_comments=false -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/inez.ui/.settings/org.eclipse.jdt.ui.prefs b/inez.ui/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index a6d063b..0000000 --- a/inez.ui/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,151 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_mag -formatter_settings_version=23 -sp_cleanup.add_all=false -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.also_simplify_lambda=true -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.array_with_curly=false -sp_cleanup.arrays_fill=false -sp_cleanup.bitwise_conditional_expression=false -sp_cleanup.boolean_literal=false -sp_cleanup.boolean_value_rather_than_comparison=false -sp_cleanup.break_loop=false -sp_cleanup.collection_cloning=false -sp_cleanup.comparing_on_criteria=false -sp_cleanup.comparison_statement=false -sp_cleanup.controlflow_merge=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -sp_cleanup.convert_to_switch_expressions=false -sp_cleanup.correct_indentation=false -sp_cleanup.do_while_rather_than_while=false -sp_cleanup.double_negation=false -sp_cleanup.else_if=false -sp_cleanup.embedded_if=false -sp_cleanup.evaluate_nullable=false -sp_cleanup.extract_increment=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.hash=false -sp_cleanup.if_condition=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.instanceof=false -sp_cleanup.instanceof_keyword=false -sp_cleanup.invert_equals=false -sp_cleanup.join=false -sp_cleanup.lazy_logical_operator=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.map_cloning=false -sp_cleanup.merge_conditional_blocks=false -sp_cleanup.multi_catch=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.no_string_creation=false -sp_cleanup.no_super=false -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false -sp_cleanup.operand_factorization=false -sp_cleanup.organize_imports=true -sp_cleanup.overridden_assignment=false -sp_cleanup.overridden_assignment_move_decl=true -sp_cleanup.plain_replacement=false -sp_cleanup.precompile_regex=false -sp_cleanup.primitive_comparison=false -sp_cleanup.primitive_parsing=false -sp_cleanup.primitive_rather_than_wrapper=false -sp_cleanup.primitive_serialization=false -sp_cleanup.pull_out_if_from_if_else=false -sp_cleanup.pull_up_assignment=false -sp_cleanup.push_down_negation=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.reduce_indentation=false -sp_cleanup.redundant_comparator=false -sp_cleanup.redundant_falling_through_block_end=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_method_parameters=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.replace_deprecated_calls=false -sp_cleanup.return_expression=false -sp_cleanup.simplify_boolean_if_else=false -sp_cleanup.simplify_lambda_expression_and_method_ref=false -sp_cleanup.single_used_field=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.standard_comparison=false -sp_cleanup.static_inner_class=false -sp_cleanup.strictly_equal_or_different=false -sp_cleanup.stringbuffer_to_stringbuilder=false -sp_cleanup.stringbuilder=false -sp_cleanup.stringbuilder_for_local_vars=true -sp_cleanup.stringconcat_stringbuffer_stringbuilder=false -sp_cleanup.stringconcat_to_textblock=false -sp_cleanup.substring=false -sp_cleanup.switch=false -sp_cleanup.switch_for_instanceof_pattern=false -sp_cleanup.system_property=false -sp_cleanup.system_property_boolean=false -sp_cleanup.system_property_file_encoding=false -sp_cleanup.system_property_file_separator=false -sp_cleanup.system_property_javaspecversion=false -sp_cleanup.system_property_javaversion=false -sp_cleanup.system_property_line_separator=false -sp_cleanup.system_property_path_separator=false -sp_cleanup.ternary_operator=false -sp_cleanup.try_with_resource=false -sp_cleanup.unlooped_while=false -sp_cleanup.unreachable_block=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_string_is_blank=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false -sp_cleanup.useless_continue=false -sp_cleanup.useless_return=false -sp_cleanup.valueof_rather_than_instantiation=false diff --git a/inez.ui/.settings/org.eclipse.m2e.core.prefs b/inez.ui/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/inez.ui/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/inez.ui/META-INF/MANIFEST.MF b/inez.ui/META-INF/MANIFEST.MF deleted file mode 100644 index a6ee79e..0000000 --- a/inez.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Ui -Bundle-SymbolicName: io.github.magwas.inez.ui;singleton:=true -Bundle-Version: 0.0.1 -Require-Bundle: io.github.magwas.inez.model, - org.eclipse.ui;bundle-version="3.108.1", - org.eclipse.equinox.app;bundle-version="1.3.400", - org.eclipse.gef.geometry;bundle-version="5.0.0", - org.eclipse.e4.core.commands;bundle-version="0.11.100", - org.eclipse.e4.core.contexts;bundle-version="1.5.1", - org.eclipse.e4.core.di;bundle-version="1.6.1", - org.eclipse.e4.core.di.annotations;bundle-version="1.5.0", - org.eclipse.e4.core.di.extensions;bundle-version="0.14.0", - org.eclipse.e4.core.services;bundle-version="2.0.100", - org.eclipse.gef.zest.fx;bundle-version="5.1.1", - org.eclipse.gef.zest.fx.jface;bundle-version="5.1.1", - org.eclipse.gef.zest.fx.ui;bundle-version="5.0.3", - org.eclipse.gef.mvc.fx;bundle-version="5.2.0", - org.eclipse.gef.mvc.fx.ui;bundle-version="5.1.1", - org.eclipse.gef.fx;bundle-version="5.0.5", - org.eclipse.gef.fx.jface;bundle-version="5.0.2", - org.eclipse.gef.fx.swt;bundle-version="5.0.2", - org.eclipse.gef.geometry.convert.fx;bundle-version="5.0.0", - jakarta.inject.jakarta.inject-api;bundle-version="2.0.1", - com.google.inject;bundle-version="5.0.1", - org.eclipse.core.runtime;bundle-version="3.33.0" -Bundle-RequiredExecutionEnvironment: JavaSE-21 -Automatic-Module-Name: io.github.magwas.inez.ui -Export-Package: io.github.magwas.inez.ui.tree;x-friends:="io.github.magwas.inez.ui.tests" diff --git a/inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 660d641..0000000 --- a/inez.ui/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -io.github.magwas.inez.ui.Application diff --git a/inez.ui/README b/inez.ui/README deleted file mode 100644 index 1278b14..0000000 --- a/inez.ui/README +++ /dev/null @@ -1,2 +0,0 @@ -Inez graphical modeller - diff --git a/inez.ui/build.properties b/inez.ui/build.properties deleted file mode 100644 index 4eaea8e..0000000 --- a/inez.ui/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = target/classes -bin.includes = plugin.xml,\ - META-INF/,\ - . diff --git a/inez.ui/icons/eclipse128.png b/inez.ui/icons/eclipse128.png deleted file mode 100644 index 11b6f46ce1ec1433f44a097885e9d607f945bd25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6861 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 diff --git a/inez.ui/icons/eclipse16.png b/inez.ui/icons/eclipse16.png deleted file mode 100644 index 7fc69518a814edec2c39377e5ac29df73833087e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 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 ZU?lVyPp|l^_@ARinz!{-tCVe{{};nLi2MKm diff --git a/inez.ui/icons/eclipse32.png b/inez.ui/icons/eclipse32.png deleted file mode 100644 index bf856800755a9452f85c8d5948adf5334706c8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2233 zcmbVOX;c&E8Xl0XAc&}-h!O${qFE*@nUY{gf&>X=Q=kZ#Wq=6D#AJX#3tpCjQiUrD z7cju7B2@5zQl(V3iXfus<+_wALS?C3mqH6F_260dJw?5jyjdxkA*P(e5vg2bXJVl@nKWrzgE2^HcvI2abo zQup@3o&c~!DGv=t!$tm(6j2bxdL5!xp~BDr;OV7RiKPiJij%-`awQu--P(!A$z^PO z7+pjbsd#X_+&4`Phol9BO4AagEE(R5gY(ov7=Z#t#W<}ZQK^BnZ2UW32;1wANqF2l z6*Pg3fA3VdC=ka()G&@tBom}$1{ucyi6E86WHPtlC}faKB2!2pg#a=kDg`2waSIO~ zv!<5CLcx5W1zVWJ#>bL0~+BBAR$a zh2w?LaU!u)uGGu=61|U@53A+Lu*^q|C~)s`49P!YpXx*BQfX8HPk=e^0fHWUZ*MM* z!sqko6dsLB!7pHC|8L$%m_sCell)K9EFNKUlG&z&dBlbVax0 zg{0$N{6{9w^RmtvbHCX={$^>nWHRNGvnYln4~Q=-O+#P(Zv$wuD1B~=g6ObdmLe$s|WmR8&A9(Xz_}h z_%Y9G0}zIsls1N$4j-9sb92qA+h`Lwp6_O|el-Ba?p@>U40Q4KRc9lG4QG^-naVJM zb7(O$@z0>3hnaR$TPfdJmmCfCGF(G62cUg+|1eN@lnxk1#dLc%{d7Aj?6up^iW|qh z+jP3z__3Y7cdDa}Z0^|rkZbFUBeQ2u^`9J>zS&Vze&Y14p!pwDOLiDcU4D~wuz&91 zwoA=rv&_!gSJ%&Pvv+Lbvkx3LD@wSBPW3(1SvRzM1uzHElKU)Hc|w7N@4!2FX_WQqO4$ye zMsq^PnU7e#H>|m`L3R77-}pD+y7>esJpcGF)ZpDy8F$+p>t5rE<-_yOz_n4$_3Ows zRsPl0Zr5bOZ3Pb$FRxy-o$gHxS=+KJ;0##raMI13(5Xdd9p7Flzjd>3mUd{mbY*0^ ziRc#h4(*D}MMe5oLnm^uY6B1;i+Q@X_}UjYI)KJ!ZAOLc5tDO=Mv8}BR~Wv6I0o#- z*U9DJrxo0e)aZoauwTqHDYj0u z|5+>h8t=%~f?2uU5lz*TjE8q0&;7F^+qLbt2gzXuf*D`MTT^P4=~q+rkKIjc-d1Ec znsgdi00ong$gs|sYi(%*IVAfp3Ar%v#N9BE>kIE5jdqZnU1b3}$ju9WpJdzC7v@ zv#eZ_o!(StUr~6!XCS5P;)^9d_6+wP?_lNTj=!h)8drlo+qZ-J`BNerV09L|eo$rpEDKq)E%Yo4!8TW7&L&S9z2Z~Ol%F#@yr{dT0Y@y z+7jN;YoWo(N=&TioKBrcwU1$*?yBR|rtdX+t~;MTw(aJaI_SnKks*f_C+C!JyoBG! zJ}7gzV&{@$DrIHm2)JX{2aT4780@%_9$r}~x+(&k+GRlV&dfwJo1?MoBGP?-6*gJ4 z=v*h=T1jkX>F?j)X8*d$#oza9;$}@|MTFfc_n$mQzpnE$_ETN|L11TVbJB&zUv+6h z=lSJ~`sPqe?~`HwTqMc5Y<)!K7=*yBO z)`Hr=lE(Wk?YSPy>^?2kF^w%!o;!lS&wQ`z-7)f@zU!hdIoi;Y3P_+ h%lPOsapB}!3o?-0Ch6$S^m+F;Aru7g8@zXC{RfC%fX@H` diff --git a/inez.ui/icons/eclipse48.png b/inez.ui/icons/eclipse48.png deleted file mode 100644 index f9706a7ccecb1b8c57108b15fe7bcab652e42a42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2909 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 diff --git a/inez.ui/icons/eclipse512.png b/inez.ui/icons/eclipse512.png deleted file mode 100644 index 825137fb99328f9cdf3bff8ba3366e5cbc591379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29447 zcmbTdby(Ej(?9&)r5mKXR1ieEK{^Bp5lJcOMrjas0YRk^1S~)h=~B8DK|*N}K@gUd z?%0K`-v^~?Hs{RDnR(5eIdjfFH#OFyq2!+&jb$a9qXt?-4aOJz@>*Vfg=IZ1U{_vZt3IGuKd74`V zSsC3{a`yMV;dDWBBg{7d91Q>}YGDCRфd=FgRJ^fS#_Sz5ve4Z|<0+zBy5=H@9 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 diff --git a/inez.ui/icons/eclipse64.png b/inez.ui/icons/eclipse64.png deleted file mode 100644 index 5a5df2dcf224893be82973352127297a839692e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3682 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 z - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/inez.ui/pom.xml b/inez.ui/pom.xml deleted file mode 100644 index b086fb8..0000000 --- a/inez.ui/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - io.github.magwas - inez - 0.0.1 - ../pom.xml - - io.github.magwas.inez.ui - eclipse-plugin - ${project.artifactId} - Inez GUI - https://github.com/kode-konveyor/inez-server.git - - - GPL affero - https://www.gnu.org/licenses/agpl-3.0.en.html - GNU Affero General Public License - - - - - Árpád Magosányi - m4gw4s@gmail.com - - - - scm:git:https://github.com/kode-konveyor/inez-server.git - scm:git:https://github.com/kode-konveyor/inez-server.git - https://github.com/kode-konveyor/inez-server.git - - - github - https://github.com/kode-konveyor/inez-server/issues - - - - website - Project site - https://repo.kodekonveyor.com/${project.artifactId} - - - - - - org.eclipse.tycho - tycho-packaging-plugin - - - org.eclipse.tycho - tycho-maven-plugin - - - org.eclipse.tycho - tycho-compiler-plugin - ${version.tycho} - - - - diff --git a/inez.ui/src/io/github/magwas/inez/ui/Application.java b/inez.ui/src/io/github/magwas/inez/ui/Application.java deleted file mode 100644 index 8b7b152..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/Application.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.github.magwas.inez.ui; - -import org.eclipse.e4.core.di.IInjector; -import org.eclipse.e4.core.di.InjectorFactory; -import org.eclipse.equinox.app.IApplication; -import org.eclipse.equinox.app.IApplicationContext; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; - -import io.github.magwas.inez.ui.tree.ModelTreeContentProvider; -import io.github.magwas.inez.ui.tree.ModelTreeLabelProvider; -import io.github.magwas.inez.ui.tree.NewDiagramAction; - -public class Application implements IApplication { - - @Override - public Object start(IApplicationContext context) { - System.err.println("appStart"); - IInjector injector = InjectorFactory.getDefault(); - injector.addBinding(ModelTreeContentProvider.class); - injector.addBinding(ModelTreeLabelProvider.class); - injector.addBinding(NewDiagramAction.class); - Display display = PlatformUI.createDisplay(); - try { - int returnCode = PlatformUI.createAndRunWorkbench(display, - new ApplicationWorkbenchAdvisor()); - if (returnCode == PlatformUI.RETURN_RESTART) { - return EXIT_RESTART; - } - return EXIT_OK; - } finally { - display.dispose(); - } - } - - @Override - public void stop() { - System.err.println("appStop"); - } -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java b/inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java deleted file mode 100644 index eec1b7c..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/ApplicationActionBarAdvisor.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.github.magwas.inez.ui; - -import org.eclipse.ui.application.ActionBarAdvisor; -import org.eclipse.ui.application.IActionBarConfigurer; - -/** - * An action bar advisor is responsible for creating, adding, and disposing of - * the actions added to a workbench window. Each window will be populated with - * new actions. - */ -public class ApplicationActionBarAdvisor extends ActionBarAdvisor { - - // Actions - important to allocate these only in makeActions, and then use - // them - // in the fill methods. This ensures that the actions aren't recreated - // when fillActionBars is called with FILL_PROXY. - - public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) { - super(configurer); - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java b/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java deleted file mode 100644 index 3b9af74..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchAdvisor.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.github.magwas.inez.ui; - -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.application.WorkbenchAdvisor; -import org.eclipse.ui.application.WorkbenchWindowAdvisor; - -public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { - - @Override - public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor( - IWorkbenchWindowConfigurer configurer) { - return new ApplicationWorkbenchWindowAdvisor(configurer); - } - - @Override - public String getInitialWindowPerspectiveId() { - return Perspective.ID; - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java b/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java deleted file mode 100644 index 0166c4c..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/ApplicationWorkbenchWindowAdvisor.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.magwas.inez.ui; - -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.application.ActionBarAdvisor; -import org.eclipse.ui.application.IActionBarConfigurer; -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.application.WorkbenchWindowAdvisor; - -public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { - - public ApplicationWorkbenchWindowAdvisor( - IWorkbenchWindowConfigurer configurer) { - super(configurer); - } - - @Override - public ActionBarAdvisor createActionBarAdvisor( - IActionBarConfigurer configurer) { - return new ApplicationActionBarAdvisor(configurer); - } - - @Override - public void preWindowOpen() { - IWorkbenchWindowConfigurer configurer = getWindowConfigurer(); - configurer.setInitialSize(new Point(400, 300)); - configurer.setShowCoolBar(false); - configurer.setShowStatusLine(false); - configurer.setTitle("Inez UI"); - } -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/Perspective.java b/inez.ui/src/io/github/magwas/inez/ui/Perspective.java deleted file mode 100644 index 11e43e6..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/Perspective.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.github.magwas.inez.ui; - -import org.eclipse.ui.IFolderLayout; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; -import org.eclipse.ui.IPlaceholderFolderLayout; - -import io.github.magwas.inez.ui.editor.ModelEditorView; -import io.github.magwas.inez.ui.tree.TreeModelView; - -public class Perspective implements IPerspectiveFactory { - - public static final String ID = "io.github.magwas.inez.ui.perspective"; - - private static final String LEFT_TOP = "Left top"; - - private IFolderLayout folderLayoutLeftTop; - private IFolderLayout folderLayoutLeftBottom; - private IPlaceholderFolderLayout folderLayoutRight; - private IFolderLayout folderLayoutBottom; - - @Override - public void createInitialLayout(IPageLayout layout) { - layout.setEditorAreaVisible(true); - layout.setFixed(true); - - folderLayoutLeftTop = layout.createFolder(LEFT_TOP, IPageLayout.LEFT, .23f, - IPageLayout.ID_EDITOR_AREA); - folderLayoutLeftBottom = layout.createFolder("Left bottom", - IPageLayout.BOTTOM, .6f, LEFT_TOP); - folderLayoutRight = layout.createPlaceholderFolder("right", - IPageLayout.RIGHT, .85f, IPageLayout.ID_EDITOR_AREA); - folderLayoutBottom = layout.createFolder("bottom", IPageLayout.BOTTOM, .7f, - IPageLayout.ID_EDITOR_AREA); - - folderLayoutLeftTop.addView(TreeModelView.ID); - - folderLayoutBottom.addView(ModelEditorView.ID); - - // Outline View -// folderLayoutLeftBottom.addView(ViewManager.OUTLINE_VIEW); - - // Navigator View - // folderLayoutLeftBottom.addView(INavigatorView.ID); - - // Palette View - folderLayoutRight.addPlaceholder("org.eclipse.gef.ui.palette_view"); //$NON-NLS-1$ - - // Placeholder for all other views - folderLayoutBottom.addPlaceholder("*"); //$NON-NLS-1$ - - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java b/inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java deleted file mode 100644 index edbcb50..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/editor/ModelEditorView.java +++ /dev/null @@ -1,88 +0,0 @@ -package io.github.magwas.inez.ui.editor; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.gef.fx.anchors.ChopBoxStrategy; -import org.eclipse.gef.fx.anchors.DynamicAnchor; -import org.eclipse.gef.fx.nodes.Connection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.part.EditorPart; - -import io.github.magwas.inez.ui.mindmap.visuals.MindMapConnectionVisual; -import io.github.magwas.inez.ui.mindmap.visuals.MindMapNodeVisual; -import javafx.embed.swt.FXCanvas; -import javafx.scene.Scene; -import javafx.scene.layout.Pane; -import javafx.scene.paint.Color; - -public class ModelEditorView extends EditorPart { - - public static String ID = "io.github.magwas.inez.ui.editor"; - - @Override - public void createPartControl(Composite parent) { - final FXCanvas fxCanvas = new FXCanvas(parent, SWT.NONE); - Pane root = new Pane(); - - // create state visuals - MindMapNodeVisual node = new MindMapNodeVisual(); - node.setTitle("Test Node"); - node.setDescription("This is just a test node, to see, how it looks :)"); - node.relocate(50, 50); - - MindMapNodeVisual node2 = new MindMapNodeVisual(); - node2.setTitle("Test Node 2"); - node2.setDescription("This is just a test node, to see, how it looks :)"); - node2.relocate(150, 250); - node2.setColor(Color.ALICEBLUE); - - Connection conn = new MindMapConnectionVisual(); - conn.setStartAnchor(new DynamicAnchor(node, new ChopBoxStrategy())); - conn.setEndAnchor(new DynamicAnchor(node2, new ChopBoxStrategy())); - - root.getChildren().addAll(conn, node, node2); - - fxCanvas.setScene(new Scene(root, 1024, 768)); - } - - @Override - public void doSave(IProgressMonitor monitor) { - // TODO Auto-generated method stub - - } - - @Override - public void doSaveAs() { - // TODO Auto-generated method stub - - } - - @Override - public boolean isSaveAsAllowed() { - // TODO Auto-generated method stub - return false; - } - - @Override - public void init(IEditorSite site, IEditorInput input) - throws PartInitException { - setSite(site); - setInput(input); - } - - @Override - public boolean isDirty() { - // TODO Auto-generated method stub - return false; - } - - @Override - public void setFocus() { - // TODO Auto-generated method stub - - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java deleted file mode 100644 index a7d0417..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/AbstractMindMapItem.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.github.magwas.inez.ui.mindmap; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.Serializable; - -public class AbstractMindMapItem implements Serializable { - - private static final long serialVersionUID = -2558628513984118991L; - - protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java deleted file mode 100644 index 3477f47..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapConnection.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.github.magwas.inez.ui.mindmap; - -public class MindMapConnection extends AbstractMindMapItem { - - /** - * Generated UUID - */ - private static final long serialVersionUID = 6065237357753406466L; - - private MindMapNode source; - private MindMapNode target; - private boolean connected; - - public void connect(MindMapNode source, MindMapNode target) { - if (source == null || target == null || source == target) { - throw new IllegalArgumentException(); - } - disconnect(); - this.source = source; - this.target = target; - reconnect(); - } - - public void disconnect() { - if (connected) { - source.removeOutgoingConnection(this); - target.removeIncomingConnection(this); - connected = false; - } - } - - public MindMapNode getSource() { - return source; - } - - public MindMapNode getTarget() { - return target; - } - - public void reconnect() { - if (!connected) { - source.addOutgoingConnection(this); - target.addIncomingConnection(this); - connected = true; - } - } - - public void setSource(MindMapNode source) { - this.source = source; - } - - public void setTarget(MindMapNode target) { - this.target = target; - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java deleted file mode 100644 index 1110907..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/MindMapNode.java +++ /dev/null @@ -1,108 +0,0 @@ -package io.github.magwas.inez.ui.mindmap; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.gef.geometry.planar.Rectangle; -import org.eclipse.swt.graphics.Color; - -public class MindMapNode extends AbstractMindMapItem implements Serializable { - - /** - * Generated UUID - */ - private static final long serialVersionUID = 8875579454539897410L; - - public static final String PROP_TITLE = "title"; - public static final String PROP_DESCRIPTION = "description"; - public static final String PROP_COLOR = "color"; - public static final String PROP_BOUNDS = "bounds"; - public static final String PROP_INCOMING_CONNECTIONS = "incomingConnections"; - public static final String PROP_OUTGOGING_CONNECTIONS = "outgoingConnections"; - - /** - * The title of the node - */ - private String title; - - /** - * he description of the node, which is optional - */ - private String description; - - /** - * The background color of the node - */ - private Color color; - - /** - * The size and position of the visual representation - */ - private Rectangle bounds; - - private List incomingConnections = new ArrayList<>(); - private List outgoingConnections = new ArrayList<>(); - - public void addIncomingConnection(MindMapConnection conn) { - incomingConnections.add(conn); - pcs.firePropertyChange(PROP_INCOMING_CONNECTIONS, null, conn); - } - - public void addOutgoingConnection(MindMapConnection conn) { - outgoingConnections.add(conn); - pcs.firePropertyChange(PROP_OUTGOGING_CONNECTIONS, null, conn); - } - - public Rectangle getBounds() { - return bounds; - } - - public Color getColor() { - return color; - } - - public String getDescription() { - return description; - } - - public List getIncomingConnections() { - return incomingConnections; - } - - public List getOutgoingConnections() { - return outgoingConnections; - } - - public String getTitle() { - return title; - } - - public void removeIncomingConnection(MindMapConnection conn) { - incomingConnections.remove(conn); - pcs.firePropertyChange(PROP_INCOMING_CONNECTIONS, conn, null); - } - - public void removeOutgoingConnection(MindMapConnection conn) { - outgoingConnections.remove(conn); - pcs.firePropertyChange(PROP_OUTGOGING_CONNECTIONS, conn, null); - } - - public void setBounds(Rectangle bounds) { - pcs.firePropertyChange(PROP_BOUNDS, this.bounds, - this.bounds = bounds.getCopy()); - } - - public void setColor(Color color) { - pcs.firePropertyChange(PROP_COLOR, this.color, this.color = color); - } - - public void setDescription(String description) { - pcs.firePropertyChange(PROP_DESCRIPTION, this.description, - this.description = description); - } - - public void setTitle(String title) { - pcs.firePropertyChange(PROP_TITLE, this.title, this.title = title); - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java deleted file mode 100644 index 43190fa..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMap.java +++ /dev/null @@ -1,32 +0,0 @@ -package io.github.magwas.inez.ui.mindmap; - -import java.util.ArrayList; -import java.util.List; - -public class SimpleMindMap extends AbstractMindMapItem { - - private static final long serialVersionUID = 4667064215236604843L; - - public static final String PROP_CHILD_ELEMENTS = "childElements"; - - private List childElements = new ArrayList<>(); - - public void addChildElement(AbstractMindMapItem node) { - childElements.add(node); - pcs.firePropertyChange(PROP_CHILD_ELEMENTS, null, node); - } - - public void addChildElement(AbstractMindMapItem node, int idx) { - childElements.add(idx, node); - pcs.firePropertyChange(PROP_CHILD_ELEMENTS, null, node); - } - - public List getChildElements() { - return childElements; - } - - public void removeChildElement(AbstractMindMapItem node) { - childElements.remove(node); - pcs.firePropertyChange(PROP_CHILD_ELEMENTS, node, null); - } -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java deleted file mode 100644 index 12c11a2..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/SimpleMindMapExampleFactory.java +++ /dev/null @@ -1,67 +0,0 @@ -package io.github.magwas.inez.ui.mindmap; - -import org.eclipse.gef.geometry.planar.Rectangle; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Display; - -public class SimpleMindMapExampleFactory { - - private static final double WIDTH = 150; - - public SimpleMindMap createComplexExample() { - SimpleMindMap mindMap = new SimpleMindMap(); - - MindMapNode center = new MindMapNode(); - center.setTitle("The Core Idea"); - center.setDescription("This is my Core idea"); - Display display = Display.getCurrent(); - center.setColor(display.getSystemColor(SWT.COLOR_GREEN)); - center.setBounds(new Rectangle(250, 50, WIDTH, 100)); - - mindMap.addChildElement(center); - - MindMapNode child = null; - for (int i = 0; i < 5; i++) { - child = new MindMapNode(); - child.setTitle("Association #" + i); - child - .setDescription("I just realized, this is related to the core idea!"); - child.setColor(display.getSystemColor(SWT.COLOR_BLUE)); - - child.setBounds(new Rectangle(50 + (i * 200), 250, WIDTH, 100)); - mindMap.addChildElement(child); - - MindMapConnection conn = new MindMapConnection(); - conn.connect(center, child); - mindMap.addChildElement(conn); - } - - MindMapNode child2 = new MindMapNode(); - child2.setTitle("Association #4-2"); - child2.setDescription("I just realized, this is related to the last idea!"); - child2.setColor(display.getSystemColor(SWT.COLOR_GRAY)); - child2.setBounds(new Rectangle(250, 550, WIDTH, 100)); - mindMap.addChildElement(child2); - - MindMapConnection conn = new MindMapConnection(); - conn.connect(child, child2); - mindMap.addChildElement(conn); - - return mindMap; - } - - public SimpleMindMap createSingleNodeExample() { - SimpleMindMap mindMap = new SimpleMindMap(); - - MindMapNode center = new MindMapNode(); - center.setTitle("The Core Idea"); - center.setDescription( - "This is my Core idea. I need a larger Explanation to it, so I can test the warpping."); - center.setColor(Display.getCurrent().getSystemColor(SWT.COLOR_YELLOW)); - center.setBounds(new Rectangle(20, 50, WIDTH, 100)); - - mindMap.addChildElement(center); - - return mindMap; - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/ArrowHead.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/ArrowHead.java deleted file mode 100644 index 9da79af..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/ArrowHead.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.magwas.inez.ui.mindmap.visuals; - -import javafx.scene.shape.Polygon; - -public class ArrowHead extends Polygon { - public ArrowHead() { - super(0, 0, 10, 3, 10, -3); - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java deleted file mode 100644 index 8e8e16c..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapConnectionVisual.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.magwas.inez.ui.mindmap.visuals; - -import org.eclipse.gef.fx.nodes.Connection; - -import javafx.scene.paint.Color; - -public class MindMapConnectionVisual extends Connection { - - public MindMapConnectionVisual() { - ArrowHead endDecoration = new ArrowHead(); - endDecoration.setFill(Color.BLACK); - setEndDecoration(endDecoration); - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java b/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java deleted file mode 100644 index 7fe4a80..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/mindmap/visuals/MindMapNodeVisual.java +++ /dev/null @@ -1,125 +0,0 @@ -package io.github.magwas.inez.ui.mindmap.visuals; - -import org.eclipse.gef.fx.nodes.GeometryNode; -import org.eclipse.gef.geometry.planar.RoundedRectangle; - -import javafx.geometry.Insets; -import javafx.geometry.Orientation; -import javafx.geometry.VPos; -import javafx.scene.Group; -import javafx.scene.layout.Region; -import javafx.scene.layout.VBox; -import javafx.scene.paint.Color; -import javafx.scene.text.Text; -import javafx.scene.text.TextFlow; - -public class MindMapNodeVisual extends Region { - - private static final double HORIZONTAL_PADDING = 20d; - private static final double VERTICAL_PADDING = 10d; - private static final double VERTICAL_SPACING = 5d; - - private Text titleText; - private TextFlow descriptionFlow; - private Text descriptionText; - private GeometryNode shape; - private VBox labelVBox; - - public MindMapNodeVisual() { - // create background shape - shape = new GeometryNode<>(new RoundedRectangle(0, 0, 70, 30, 8, 8)); - shape.setFill(Color.LIGHTGREEN); - shape.setStroke(Color.BLACK); - - // create vertical box for title and description - labelVBox = new VBox(VERTICAL_SPACING); - labelVBox.setPadding(new Insets(VERTICAL_PADDING, HORIZONTAL_PADDING, - VERTICAL_PADDING, HORIZONTAL_PADDING)); - - // ensure shape and labels are resized to fit this visual - shape.prefWidthProperty().bind(widthProperty()); - shape.prefHeightProperty().bind(heightProperty()); - labelVBox.prefWidthProperty().bind(widthProperty()); - labelVBox.prefHeightProperty().bind(heightProperty()); - - // create title text - titleText = new Text(); - titleText.setTextOrigin(VPos.TOP); - - // create description text - descriptionText = new Text(); - descriptionText.setTextOrigin(VPos.TOP); - - // use TextFlow to enable wrapping of the description text within the - // label bounds - descriptionFlow = new TextFlow(descriptionText); - // only constrain the width, so that the height is computed in - // dependence on the width - descriptionFlow.maxWidthProperty() - .bind(shape.widthProperty().subtract(HORIZONTAL_PADDING * 2)); - - // vertically lay out title and description - labelVBox.getChildren().addAll(titleText, descriptionFlow); - - // ensure title is always visible (see also #computeMinWidth(double) and - // #computeMinHeight(double) methods) - setMinSize(USE_COMPUTED_SIZE, USE_COMPUTED_SIZE); - - // wrap shape and VBox in Groups so that their bounds-in-parent is - // considered when determining the layout-bounds of this visual - getChildren().addAll(new Group(shape), new Group(labelVBox)); - } - - @Override - public double computeMinHeight(double width) { - // ensure title is always visible - // descriptionFlow.minHeight(width) + - // titleText.getLayoutBounds().getHeight() + VERTICAL_PADDING * 2; - return labelVBox.minHeight(width); - } - - @Override - public double computeMinWidth(double height) { - // ensure title is always visible - return titleText.getLayoutBounds().getWidth() + HORIZONTAL_PADDING * 2; - } - - @Override - protected double computePrefHeight(double width) { - return minHeight(width); - } - - @Override - protected double computePrefWidth(double height) { - return minWidth(height); - } - - @Override - public Orientation getContentBias() { - return Orientation.HORIZONTAL; - } - - public Text getDescriptionText() { - return descriptionText; - } - - public GeometryNode getGeometryNode() { - return shape; - } - - public Text getTitleText() { - return titleText; - } - - public void setColor(Color color) { - shape.setFill(color); - } - - public void setDescription(String description) { - this.descriptionText.setText(description); - } - - public void setTitle(String title) { - this.titleText.setText(title); - } -} \ No newline at end of file diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java b/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java deleted file mode 100644 index 86a130c..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeContentProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.jface.viewers.ITreeContentProvider; - -import io.github.magwas.inez.Inez; -import io.github.magwas.inez.element.BridiElement; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - -@Singleton -public class ModelTreeContentProvider implements ITreeContentProvider { - - @Inject - Inez inez; - - @Override - public Object[] getElements(Object inputElement) { - System.out.println("getElements " + inputElement); - return inez.root().getChildren().toArray(); - } - - @Override - public Object[] getChildren(Object parentElement) { - return ((BridiElement) parentElement).getChildren().toArray(); - } - - @Override - public Object getParent(Object element) { - return ((BridiElement) element).getParent(); - } - - @Override - public boolean hasChildren(Object element) { - return !((BridiElement) element).getChildren().toList().isEmpty(); - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java b/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java deleted file mode 100644 index 95bf2c9..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/ModelTreeLabelProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.e4.core.di.annotations.Optional; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.IWorkbench; - -import io.github.magwas.inez.element.BridiElement; -import jakarta.inject.Inject; - -public class ModelTreeLabelProvider implements ILabelProvider { - - @Inject - @Optional - IWorkbench workbench; - - @Override - public void addListener(ILabelProviderListener listener) { - // TODO Auto-generated method stub - - } - - @Override - public void dispose() { - // TODO Auto-generated method stub - - } - - @Override - public boolean isLabelProperty(Object element, String property) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void removeListener(ILabelProviderListener listener) { - // TODO Auto-generated method stub - - } - - @Override - public Image getImage(Object element) { - return workbench.getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT); - } - - @Override - public String getText(Object element) { - return ((BridiElement) element).getRepresentation(); - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java b/inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java deleted file mode 100644 index a7cd319..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/MyEditorInput.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IPersistableElement; - -import io.github.magwas.inez.element.BridiElement; - -public class MyEditorInput implements IEditorInput { - - private BridiElement model; - - MyEditorInput(BridiElement model) { - this.model = model; - } - - @Override - public T getAdapter(Class adapter) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean exists() { - return true; - } - - @Override - public ImageDescriptor getImageDescriptor() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getName() { - return model.getRepresentation(); - } - - @Override - public IPersistableElement getPersistable() { - return null; - } - - @Override - public String getToolTipText() { - return model.getRepresentation(); - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java b/inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java deleted file mode 100644 index d37c79c..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/NewDiagramAction.java +++ /dev/null @@ -1,55 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; - -import io.github.magwas.inez.element.BridiElement; -import io.github.magwas.inez.element.ElementConstants; -import io.github.magwas.inez.ui.editor.ModelEditorView; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - -@Singleton -public class NewDiagramAction extends Action { - - @Inject - IWorkbench workbench; - - IStructuredSelection selection; - - String applicableType = "CONTAINER"; - - NewDiagramAction() { - super("New model"); - } - - void setSelection(IStructuredSelection selection) { - this.selection = selection; - } - - @Override - public void run() { - BridiElement selectedElement = (BridiElement) selection.getFirstElement(); - if (!selectedElement.isInstance(BridiElement.CONTAINER_ID)) - selectedElement = selectedElement.getParent(); - BridiElement model = selectedElement.create(selectedElement.id, - ElementConstants.DIAGRAM_ID, - "DiagramModel of " + selectedElement.getRepresentation()); - System.out.println("action on " + selectedElement); - System.out.println("model:" + model); - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getActivePage(); - MyEditorInput input = new MyEditorInput(model); - try { - page.openEditor(input, ModelEditorView.ID); - } catch (PartInitException e) { - throw new Error(e); - } - - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java b/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java deleted file mode 100644 index bd3ef17..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDragSourceLIstener.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.jface.util.LocalSelectionTransfer; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.dnd.DragSourceEvent; -import org.eclipse.swt.dnd.DragSourceListener; - -public class TreeModelDragSourceLIstener implements DragSourceListener { - - private TreeViewer viewer; - - public TreeModelDragSourceLIstener(TreeViewer viewer) { - this.viewer = viewer; - } - - @Override - public void dragStart(DragSourceEvent event) { - System.out.println("dragStart"); - IStructuredSelection selection = (IStructuredSelection) viewer - .getSelection(); - LocalSelectionTransfer.getTransfer().setSelection(selection); - event.doit = true; - - } - - @Override - public void dragSetData(DragSourceEvent event) { - System.out.println("dragSetData"); - event.data = LocalSelectionTransfer.getTransfer().getSelection(); - } - - @Override - public void dragFinished(DragSourceEvent event) { - System.out.println("dragFinished " + event); - LocalSelectionTransfer.getTransfer().setSelection(null); - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java b/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java deleted file mode 100644 index 9d2704a..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelDropTargetListener.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.jface.util.LocalSelectionTransfer; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.dnd.DropTargetEvent; -import org.eclipse.swt.dnd.DropTargetListener; - -public class TreeModelDropTargetListener implements DropTargetListener { - - public TreeModelDropTargetListener(TreeViewer viewer) { - } - - @Override - public void dragEnter(DropTargetEvent event) { - System.out.println("dragEnter"); - } - - @Override - public void dragLeave(DropTargetEvent event) { - System.out.println("dragLeave"); - } - - @Override - public void dragOperationChanged(DropTargetEvent event) { - System.out.println("dragOperationChanged"); - } - - @Override - public void dragOver(DropTargetEvent event) { - } - - @Override - public void drop(DropTargetEvent event) { - System.out.println("drop at " + event.item.getData()); - System.out.println( - "dropped:" + LocalSelectionTransfer.getTransfer().getSelection()); - } - - @Override - public void dropAccept(DropTargetEvent event) { - System.out.println("dropAccept " + event.detail); - } - -} diff --git a/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java b/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java deleted file mode 100644 index 5f29566..0000000 --- a/inez.ui/src/io/github/magwas/inez/ui/tree/TreeModelView.java +++ /dev/null @@ -1,69 +0,0 @@ -package io.github.magwas.inez.ui.tree; - -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.util.LocalSelectionTransfer; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.part.ViewPart; - -import io.github.magwas.inez.Inez; -import jakarta.inject.Inject; - -public class TreeModelView extends ViewPart { - public static final String ID = "io.github.magwas.inez.ui.treeModelView"; - - @Inject - IWorkbench workbench; - @Inject - Inez inez; - @Inject - ModelTreeContentProvider modelTreeContentProvider; - @Inject - ModelTreeLabelProvider modelTreeLabelProvider; - @Inject - NewDiagramAction newDiagramAction; - - private TreeViewer viewer; - - @Override - public void createPartControl(Composite parent) { - viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - viewer.setContentProvider(modelTreeContentProvider); - viewer.setLabelProvider(modelTreeLabelProvider); - viewer.setInput("parent"); - Transfer[] transfertypes = new Transfer[] { - LocalSelectionTransfer.getTransfer() }; - int allDrops = DND.DROP_DEFAULT | DND.DROP_COPY | DND.DROP_LINK - | DND.DROP_MOVE | DND.DROP_TARGET_MOVE; - viewer.addDragSupport(allDrops, transfertypes, - new TreeModelDragSourceLIstener(viewer)); - viewer.addDropSupport(allDrops, transfertypes, - new TreeModelDropTargetListener(viewer)); - - MenuManager menuManager = new MenuManager(); - menuManager.setRemoveAllWhenShown(true); - menuManager.addMenuListener(manager -> { - IStructuredSelection selection = viewer.getStructuredSelection(); - newDiagramAction.setSelection(selection); - menuManager.add(newDiagramAction); - - }); - - Control control = viewer.getControl(); - Menu menu = menuManager.createContextMenu(control); - control.setMenu(menu); - } - - @Override - public void setFocus() { - viewer.getControl().setFocus(); - } - -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8451d7..b8cfb3a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,10 @@ 4.0.0 io.github.magwas - konveyor-parent - 0.4.38 + konveyor.parent + 0.4.40 + io.github.magwas inez 0.0.1 pom @@ -28,14 +29,8 @@ - inez.target inez.parser - inez.parser.tests inez.model - inez.model.tests - inez.ui - inez.ui.tests - inez.ui.product scm:git:https://github.com/kode-konveyor/inez-server.git @@ -55,32 +50,6 @@ true - 0.4.38 + 0.4.40 - - - - org.sonatype.central - central-publishing-maven-plugin - - - org.apache.maven.plugins - maven-gpg-plugin - - - org.eclipse.tycho - target-platform-configuration - ${version.tycho} - - - - io.github.magwas - io.github.magwas.inez.target - ${project.version} - - - - - -