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

Commit 40ec29c

Browse files
authored
Merge pull request #4 from admin-shell-io/feature/renaming-json-ld
Renaming the JSON-LD Serializer to RDF Serializer and changing the de…
2 parents fcef0f9 + 8d5f8bb commit 40ec29c

File tree

103 files changed

+122
-110
lines changed

Some content is hidden

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

103 files changed

+122
-110
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ The project contains several modules:
3232
- `dataformat-core` Location of the general classes and interfaces that are used by more than one de-/serializer.
3333
- `dataformat-aasx` AASX de-/serializer
3434
- `dataformat-json` JSON de-/serializer
35+
- `dataformat-rdf` RDF de-/serializer
3536
- `dataformat-xml` XML de-/serializer
3637
- `dataformat-uanodeset` OPC UA I4AAS NodeSet de-/serializer
3738

@@ -44,7 +45,7 @@ We always look for contributions, bug reports, feature requests etc. Simply open
4445

4546
# Contributors
4647

47-
| Name | Affiliation | Github Account | parent | core | aasx | json | xml | json-ld | ua-nodeset | validator|
48+
| Name | Affiliation | Github Account | Parent | Core | AASX | JSON | XML | RDF | UA-Nodeset | Validator|
4849
--- | --- | --- | :---: | :---: | :---: | :---: | :---: | :---: | :---:| :---:
4950
| Mohammad Alreeni | Fraunhofer IWU | []() | | | | | x | | |
5051
| Sebastian Bader | Fraunhofer IAIS | [sebbader](https://github.com/sebbader) | x | | | | | x | | x |

dataformat-jsonld/pom.xml renamed to dataformat-rdf/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>dataformat-jsonld</artifactId>
13-
<name>Asset Administration Shell JSON-LD-Serializer</name>
12+
<artifactId>dataformat-rdf</artifactId>
13+
<name>Asset Administration Shell RDF-Serializer</name>
1414

1515
<properties>
1616
<maven.compiler.source>11</maven.compiler.source>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818
import com.fasterxml.jackson.core.JsonGenerator;
1919
import com.fasterxml.jackson.databind.SerializerProvider;

dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/IgnoreTypeMixIn.java renamed to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/IgnoreTypeMixIn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818
import com.fasterxml.jackson.annotation.JsonIgnoreType;
1919

dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDModule.java renamed to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDModule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818
import com.fasterxml.jackson.databind.module.SimpleModule;
1919

20-
import io.adminshell.aas.v3.dataformat.jsonld.custom.BigDecimalSerializer;
21-
import io.adminshell.aas.v3.dataformat.jsonld.custom.XMLGregorianCalendarDeserializer;
22-
import io.adminshell.aas.v3.dataformat.jsonld.custom.XMLGregorianCalendarSerializer;
20+
import io.adminshell.aas.v3.dataformat.rdf.custom.BigDecimalSerializer;
21+
import io.adminshell.aas.v3.dataformat.rdf.custom.XMLGregorianCalendarDeserializer;
22+
import io.adminshell.aas.v3.dataformat.rdf.custom.XMLGregorianCalendarSerializer;
2323
import io.adminshell.aas.v3.model.LangString;
2424

2525
import java.math.BigDecimal;

dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/JsonLDSerializer.java renamed to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/JsonLDSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818
import com.fasterxml.jackson.annotation.JsonProperty;
1919
import com.fasterxml.jackson.annotation.JsonTypeName;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818

1919
import com.fasterxml.jackson.databind.BeanDescription;
2020
import com.fasterxml.jackson.databind.JsonSerializer;
2121
import com.fasterxml.jackson.databind.SerializationConfig;
2222
import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
2323
import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
24-
import io.adminshell.aas.v3.dataformat.jsonld.JsonLDSerializer;
2524

2625
import java.util.Map;
2726

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.adminshell.aas.v3.dataformat.jsonld;
17+
package io.adminshell.aas.v3.dataformat.rdf;
1818

1919
import com.fasterxml.jackson.core.JsonGenerator;
2020
import com.fasterxml.jackson.databind.JsonSerializer;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818
import java.io.IOException;
1919

dataformat-jsonld/src/main/java/io/adminshell/aas/v3/dataformat/jsonld/Parser.java renamed to dataformat-rdf/src/main/java/io/adminshell/aas/v3/dataformat/rdf/Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.adminshell.aas.v3.dataformat.jsonld;
16+
package io.adminshell.aas.v3.dataformat.rdf;
1717

1818
import io.adminshell.aas.v3.model.LangString;
1919
import io.adminshell.aas.v3.model.annotations.IRI;

0 commit comments

Comments
 (0)