Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 3c3b0e2

Browse files
author
Matthias Böckmann
committed
Merge branch 'master' of https://jira.iais.fraunhofer.de/stash/scm/ear/aas-serializer into feature/validator
� Conflicts: � pom.xml
2 parents 238cd4b + 552daae commit 3c3b0e2

596 files changed

Lines changed: 232166 additions & 52 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ The project contains several modules:
3434
- `dataformat-aasx` AASX de-/serializer
3535
- `dataformat-json` JSON de-/serializer
3636
- `dataformat-xml` XML de-/serializer
37+
- `dataformat-uanodeset` OPC UA I4AAS NodeSet de-/serializer
3738

3839

3940

‎dataformat-aasx/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<plugin>
5656
<groupId>org.apache.maven.plugins</groupId>
5757
<artifactId>maven-compiler-plugin</artifactId>
58+
<version>3.8.1</version>
5859
<configuration>
5960
<source>11</source>
6061
<target>11</target>
@@ -85,12 +86,5 @@
8586
</executions>
8687
</plugin>
8788
</plugins>
88-
</build>
89-
<repositories>
90-
<repository>
91-
<id>eis-public-repo</id>
92-
<name>maven-public</name>
93-
<url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-public</url>
94-
</repository>
95-
</repositories>
89+
</build>
9690
</project>

‎dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/AASXDeserializer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public AssetAdministrationShellEnvironment read() throws InvalidFormatException,
8181
/**
8282
* Return the Content of the xml file in the aasx-package as String
8383
*
84-
* @param aasxPackage - the root package of the AASX
8584
* @return Content of XML as String
8685
* @throws InvalidFormatException
8786
* @throws IOException

‎dataformat-aasx/src/main/java/io/adminshell/aas/v3/dataformat/aasx/deserialization/PathHandling.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
public class PathHandling {
2222
/**
23-
* Returns the last element of path separated by "/", e.g. a/b/c -> c
23+
* Returns the last element of path separated by "/", e.g. a/b/c -&gt; c
2424
*
2525
* @param path
2626
* @return
@@ -40,7 +40,7 @@ public static String getLastElement(String path) {
4040
}
4141

4242
/**
43-
* Removes the last element from the path, e.g. a/b/c -> a/b
43+
* Removes the last element from the path, e.g. a/b/c -&gt; a/b
4444
*
4545
* @param path
4646
* @return

‎dataformat-core/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<plugin>
4444
<groupId>org.apache.maven.plugins</groupId>
4545
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>3.8.1</version>
4647
<configuration>
4748
<source>11</source>
4849
<target>11</target>
@@ -74,11 +75,4 @@
7475
</plugin>
7576
</plugins>
7677
</build>
77-
<repositories>
78-
<repository>
79-
<id>eis-public-repo</id>
80-
<name>maven-public</name>
81-
<url>https://maven.iais.fraunhofer.de/artifactory/eis-ids-public</url>
82-
</repository>
83-
</repositories>
8478
</project>

‎dataformat-json/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<plugin>
7373
<groupId>org.apache.maven.plugins</groupId>
7474
<artifactId>maven-compiler-plugin</artifactId>
75+
<version>3.8.1</version>
7576
<configuration>
7677
<source>11</source>
7778
<target>11</target>
@@ -103,11 +104,4 @@
103104
</plugin>
104105
</plugins>
105106
</build>
106-
<repositories>
107-
<repository>
108-
<id>eis-public-repo</id>
109-
<name>maven-public</name>
110-
<url>https://maven.iais.fraunhofer.de/artifactory/eis-ids-public</url>
111-
</repository>
112-
</repositories>
113107
</project>

‎dataformat-json/src/main/java/io/adminshell/aas/v3/dataformat/json/ReflectionAnnotationIntrospector.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,15 @@
4040
* <ul>
4141
* <li> @JsonTypeName([interface name])
4242
* <li> @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "modelType")
43-
* <li> @JsonSubTypes({@Type(value = [sub-interface].class, name = "[sub-interface name]"), ...})
43+
* <li> @JsonSubTypes({
44+
*
45+
* \@Type(value = [sub-interface].class, name = "[sub-interface name]"), ...})
4446
* for each sub-interface
4547
* </ul>
46-
* <li> to all getter methods returning any type of Collection<?> defined in the
48+
* <li> to all getter methods returning any type of Collection&lt;?&gt; defined in the
4749
* AAS model:
48-
* <ul> @JsonInclude(JsonInclude.Include.NON_EMPTY)
50+
* <ul>
51+
* <li>@JsonInclude(JsonInclude.Include.NON_EMPTY)</li>
4952
* </ul>
5053
* </ul>
5154
*/

‎dataformat-jsonld/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<artifactId>dataformat-jsonld</artifactId>
1313

1414
<properties>
15-
<maven.compiler.source>12</maven.compiler.source>
16-
<maven.compiler.target>12</maven.compiler.target>
15+
<!--<maven.compiler.source>12</maven.compiler.source>
16+
<maven.compiler.target>12</maven.compiler.target>-->
1717
</properties>
1818

1919
<dependencies>

‎dataformat-jsonld/src/test/java/io/adminshell/aas/v3/model/dataformat/jsonld/ParserTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void parseAllSchemaExamplesTest() throws IOException, DeserializationExce
3737
serializer.deserialize(SerializerUtil.readResourceToString("Asset_Example.nt"), Asset.class, RDFLanguages.NTRIPLES);
3838
serializer.deserialize(SerializerUtil.readResourceToString("Asset_Example.ttl"), Asset.class, RDFLanguages.TURTLE);
3939
serializer.deserialize(SerializerUtil.readResourceToString("AssetAdministrationShell_Example.ttl"), AssetAdministrationShell.class, RDFLanguages.TURTLE);
40-
serializer.deserialize(SerializerUtil.readResourceToString("Complete_Example.ttl"), AssetAdministrationShell.class, RDFLanguages.TURTLE);
40+
//serializer.deserialize(SerializerUtil.readResourceToString("Complete_Example.ttl"), AssetAdministrationShell.class, RDFLanguages.TURTLE);
4141
serializer.deserialize(SerializerUtil.readResourceToString("KapitalVerwaltungsschaleExample.ttl"), Property.class, RDFLanguages.TURTLE);
4242
serializer.deserialize(SerializerUtil.readResourceToString("Overall-Example.nt"), AssetAdministrationShell.class, RDFLanguages.NTRIPLES);
4343
serializer.deserialize(SerializerUtil.readResourceToString("ReferenceExample.ttl"), AssetAdministrationShell.class, RDFLanguages.TURTLE);

‎dataformat-jsonld/src/test/resources/AAS_Reference_shortExample.ttl‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,29 @@
2626
<https://admin-shell.io/aas/3/0/RC01/Identifiable/identification> [
2727
a <https://admin-shell.io/aas/3/0/RC01/Identifier> ;
2828
<https://admin-shell.io/aas/3/0/RC01/Identifier/identifier> "http://customer.com/aas/9175_7013_7091_9168"^^xsd:string ;
29-
<https://admin-shell.io/aas/3/0/RC01/Identifier/idType> [
30-
a <https://admin-shell.io/aas/3/0/RC01/IdentifierType> , <https://admin-shell.io/aas/3/0/RC01/IdentifierType/Iri>
31-
] ;
29+
<https://admin-shell.io/aas/3/0/RC01/Identifier/idType> <https://admin-shell.io/aas/3/0/RC01/IdentifierType/Iri> ;
3230
] ;
31+
<https://admin-shell.io/aas/3/0/RC01/Referable/idShort> "9175_7013_7091_9168"^^xsd:string ;
3332
<https://admin-shell.io/aas/3/0/RC01/AssetAdministrationShell/assetInformation> [
3433
a <https://admin-shell.io/aas/3/0/RC01/AssetInformation> ;
3534
<https://admin-shell.io/aas/3/0/RC01/AssetInformation/globalAssetId> [
3635
a <https://admin-shell.io/aas/3/0/RC01/Reference> ;
3736
<https://admin-shell.io/aas/3/0/RC01/Reference/key> [
3837
a <https://admin-shell.io/aas/3/0/RC01/Key> ;
39-
<https://admin-shell.io/aas/3/0/RC01/Key/type> [
40-
a <https://admin-shell.io/aas/3/0/RC01/KeyElements>, <https://admin-shell.io/aas/3/0/RC01/KeyElements/Asset>
41-
] ;
38+
<https://admin-shell.io/aas/3/0/RC01/Key/type> <https://admin-shell.io/aas/3/0/RC01/IdentifiableElements/Asset> ;
4239
<https://admin-shell.io/aas/3/0/RC01/Key/value> "http://customer.com/assets/KHBVZJSQKIY"^^xsd:string ;
43-
<https://admin-shell.io/aas/3/0/RC01/Key/idType> [
44-
a <https://admin-shell.io/aas/3/0/RC01/KeyType>, <https://admin-shell.io/aas/3/0/RC01/KeyType/Iri>
45-
]
40+
<https://admin-shell.io/aas/3/0/RC01/Key/idType> <https://admin-shell.io/aas/3/0/RC01/IdentifierType/Iri>
4641
]
47-
]
42+
] ;
43+
<https://admin-shell.io/aas/3/0/RC01/AssetInformation/assetKind> <https://admin-shell.io/aas/3/0/RC01/AssetKind/Instance> ;
4844
]
4945
.
5046
<http://customer.com/assets/KHBVZJSQKIY>
5147
rdf:type <https://admin-shell.io/aas/3/0/RC01/Asset> ;
5248
<https://admin-shell.io/aas/3/0/RC01/Identifiable/identification> [
5349
a <https://admin-shell.io/aas/3/0/RC01/Identifier> ;
5450
<https://admin-shell.io/aas/3/0/RC01/Identifier/identifier> "http://customer.com/assets/KHBVZJSQKIY"^^xsd:string ;
55-
<https://admin-shell.io/aas/3/0/RC01/Identifier/idType> [
56-
a <https://admin-shell.io/aas/3/0/RC01/IdentifierType> , <https://admin-shell.io/aas/3/0/RC01/IdentifierType/Iri>
57-
]
58-
]
51+
<https://admin-shell.io/aas/3/0/RC01/Identifier/idType> <https://admin-shell.io/aas/3/0/RC01/IdentifierType/Iri> ;
52+
] ;
53+
<https://admin-shell.io/aas/3/0/RC01/Referable/idShort> "KHBVZJSQKIY"^^xsd:string ;
5954
.

0 commit comments

Comments
 (0)