Add AAS Part 2 / API Model Classes #161

sebbader-sap · 2023-08-21T14:25:29Z

Solves #15

Revert the changed files

…ions/aas4j into generated-v3-part2

mjacoby

We are getting closer to merging this PR, however there are still some issues with the tests. Main issues are

JSON-realted tests should use static JSON/value pairs (use ExampleData<T> class) instead of generating in-/output on the fly via counterpart (i.e. JsonSerializerTest should not use JsonDeserializer and the other way around). The PR introduced some duplicate structures on how to store static test data via TestDataHelper
tests for custom subclasses (e.g. of Property or DataSpecification) missing, incomplete, and/or not properly separated (e.g. JsonSerializerTest.testSerializeCustomDataSpecification() tests also deserialization but should only test serialization)

...-json/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializerTest.java

...son/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonDeserializerTest.java

emildinchev · 2024-02-02T10:26:08Z

@mjacoby, @sebbader-sap, @FrankSchnicke,
The PR is ready for a new review.

mjacoby

Only slight changes required wrt de-/serializing custom data specifications as ReflectionHelper.SUBTYPES should never be modified. When specific type resolution is needed use JsonDeserializer.useImplementation(...).

Once these changes are made we can merge the PR.

mjacoby · 2024-02-05T13:03:59Z

...son/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonDeserializerTest.java

-        Environment expected = Examples.EXAMPLE_FULL.getModel();
-        Environment actual = new JsonDeserializer().read(Examples.EXAMPLE_FULL.fileContentStream());
-        Assert.assertEquals(expected, actual);
+    public void testReadCustomDataSpecification() throws DeserializationException {


ReflectionHelper values should never be modified! Use this code instead

JsonDeserializer deserializer = new JsonDeserializer();
deserializer.useImplementation(DataSpecificationContent.class, DefaultDummyDataSpecification.class);
Environment env = deserializer.read(Examples.ENVIRONMENT_CUSTOM_DATA.fileContentStream(), Environment.class);
assertEquals(Examples.ENVIRONMENT_CUSTOM_DATA.getModel(), env);`

mjacoby · 2024-02-05T13:05:04Z

...-json/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializerTest.java

-        JsonSerializer serializer = new JsonSerializer();
-        JsonDeserializer deserializer = new JsonDeserializer();
-
+    public void testWriteCustomDataSpecification() {
        // This is the only way to make the serialization to work.
        Set<Class<?>> subtypes = ReflectionHelper.SUBTYPES.get(DataSpecificationContent.class);


remove this line as it is not needed for serialization

mjacoby · 2024-02-05T13:05:17Z

...-json/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializerTest.java

-        JsonSerializer serializer = new JsonSerializer();
-        JsonDeserializer deserializer = new JsonDeserializer();
-
+    public void testWriteCustomDataSpecification() {
        // This is the only way to make the serialization to work.
        Set<Class<?>> subtypes = ReflectionHelper.SUBTYPES.get(DataSpecificationContent.class);
        subtypes.add(DefaultDummyDataSpecification.class);


remove this line as it is not needed for serialization

mjacoby · 2024-02-05T13:09:53Z

...son/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonDeserializerTest.java

    }

+    /**


Remove JavaDoc for test methods

mjacoby · 2024-02-05T13:10:24Z

...-json/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializerTest.java

-        List<Referable> emptyList = Collections.emptyList();
-        String serialized = new JsonSerializer().write(emptyList);
-        assertEquals("[]", serialized);
-    }

    /**


remove JavaDoc for tests

mjacoby · 2024-02-05T13:12:55Z

@emildinchev just letting you know that I finished review

emildinchev · 2024-02-05T13:35:25Z

@mjacoby Ready

sebbader-sap and others added 30 commits June 16, 2023 18:52

upgrade to latest generated java model and adding toString method

13ee184

Update dataformat-aasx project

d868f19

Update dataformat-core

f339157

Update dataformat-core project

c62e54d

Update dataformat-json project

ddc62e2

Create dataformat-rdf project

2bdb3bb

Update dataformat-xml project

3037e71

Update model project

7e1b1c4

Update model project

61258fa

Update model project

534bbec

Revert the changed files

78c8cc3

Revert the changed files

Remove dataformat-rdf project

f44bd1a

fix compile errors

a30a902

Merge branch 'generated-v3-part2' of https://github.com/sap-contribut…

93a10e1

…ions/aas4j into generated-v3-part2

fix compile errors

651a383

Adapt the copyright notice

c50a4ac

Adapt the copyright notice

4dcdcda

add next iteration of generated part 1 classes

8471132

Merge branch 'generated-v3-part2' of https://github.com/sap-contribut…

2ca2599

…ions/aas4j into generated-v3-part2

Fix the tests in dataformat-core

49e6e23

Fix the compilation errors in XML-Serializer Project

3678a6e

Fix Some XML Serialization Tests

b1ddf4b

Fix some XML Serialization Tests

1d8e192

Fix the dataformat-xml project

30ee673

Fix the dataformat-json project

18decbf

Adapt the mixins

b0c17e6

Revert some changes in the comments

6326dae

Adapt dataformat-core

74811fb

Adapt dataformat-json project

382fd3d

Update PropertyMixin.java

5c7bff0

emildinchev added 9 commits January 26, 2024 10:51

Update JsonMapperFactory.java

70e8ab4

Update JsonSerializer.java

2ee9067

Update SimpleAbstractTypeResolverFactory.java

ba185f1

Fix the mixins

9bc5cae

Improve serialization tests

16e985f

Update JsonSerializerTest.java

2408ccd

Update EmbeddedDataSpecificationsDeserializer.java

941fe76

revert some changes

8574255

Delete LangString.java

6412ce7

sebbader-sap requested a review from mjacoby January 29, 2024 09:42

mjacoby requested changes Jan 30, 2024

View reviewed changes

emildinchev added 10 commits January 31, 2024 14:30

Fix testSerializeCustomDataSpecification

f95d045

add testReadCustomDataSpecification

545d9f1

Remove TestDataHelper

399cd4a

Address the problem with the default QualifierKind

bfa69e3

Remove partial data validation

c3ecd3c

Add tests for OperationRequest

4a21f7e

Refactoring of the tests

ddad0ba

Refactoring of the tests

c55601f

Refactoring of the tests

fa2f191

Refactoring of the tests

99b6c80

mjacoby requested changes Feb 5, 2024

View reviewed changes

Address review remarks

ced05f5

mjacoby approved these changes Feb 5, 2024

View reviewed changes

mjacoby merged commit 8c516b5 into eclipse-aas4j:main Feb 5, 2024
2 checks passed

This was referenced Feb 5, 2024

Add Part 2 Classes #15

Closed

ProtocolInformation misses SecurityAttributes #175

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add AAS Part 2 / API Model Classes #161

Add AAS Part 2 / API Model Classes #161

sebbader-sap commented Aug 21, 2023 •

edited

Loading

mjacoby left a comment

emildinchev commented Feb 2, 2024

mjacoby left a comment

mjacoby Feb 5, 2024

mjacoby Feb 5, 2024

mjacoby Feb 5, 2024

mjacoby Feb 5, 2024

mjacoby Feb 5, 2024

mjacoby commented Feb 5, 2024

emildinchev commented Feb 5, 2024

Add AAS Part 2 / API Model Classes #161

Add AAS Part 2 / API Model Classes #161

Conversation

sebbader-sap commented Aug 21, 2023 • edited Loading

mjacoby left a comment

Choose a reason for hiding this comment

emildinchev commented Feb 2, 2024

mjacoby left a comment

Choose a reason for hiding this comment

mjacoby Feb 5, 2024

Choose a reason for hiding this comment

mjacoby Feb 5, 2024

Choose a reason for hiding this comment

mjacoby Feb 5, 2024

Choose a reason for hiding this comment

mjacoby Feb 5, 2024

Choose a reason for hiding this comment

mjacoby Feb 5, 2024

Choose a reason for hiding this comment

mjacoby commented Feb 5, 2024

emildinchev commented Feb 5, 2024

sebbader-sap commented Aug 21, 2023 •

edited

Loading