Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Newly generated V3.0.1 Classes and toString() Method #159

Merged
merged 56 commits into from
Nov 2, 2023
Merged

Newly generated V3.0.1 Classes and toString() Method #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
13ee184
upgrade to latest generated java model and adding toString method
sebbader-sap Jun 16, 2023
d868f19
Update dataformat-aasx project
emildinchev Jun 27, 2023
f339157
Update dataformat-core
emildinchev Jun 27, 2023
c62e54d
Update dataformat-core project
emildinchev Jun 29, 2023
ddc62e2
Update dataformat-json project
emildinchev Jun 29, 2023
2bdb3bb
Create dataformat-rdf project
emildinchev Jun 29, 2023
3037e71
Update dataformat-xml project
emildinchev Jun 29, 2023
7e1b1c4
Update model project
emildinchev Jun 29, 2023
61258fa
Update model project
emildinchev Jun 30, 2023
534bbec
Update model project
emildinchev Jun 30, 2023
78c8cc3
Revert the changed files
emildinchev Jul 3, 2023
f44bd1a
Remove dataformat-rdf project
emildinchev Jul 3, 2023
a30a902
fix compile errors
sebbader-sap Jul 3, 2023
93a10e1
Merge branch 'generated-v3-part2' of https://github.com/sap-contribut…
sebbader-sap Jul 3, 2023
651a383
fix compile errors
sebbader-sap Jul 3, 2023
c50a4ac
Adapt the copyright notice
emildinchev Jul 3, 2023
4dcdcda
Adapt the copyright notice
emildinchev Jul 3, 2023
8471132
add next iteration of generated part 1 classes
sebbader-sap Jul 3, 2023
2ca2599
Merge branch 'generated-v3-part2' of https://github.com/sap-contribut…
sebbader-sap Jul 3, 2023
49e6e23
Fix the tests in dataformat-core
emildinchev Jul 4, 2023
3678a6e
Fix the compilation errors in XML-Serializer Project
emildinchev Jul 4, 2023
b1ddf4b
Fix Some XML Serialization Tests
emildinchev Jul 4, 2023
1d8e192
Fix some XML Serialization Tests
emildinchev Jul 4, 2023
30ee673
Fix the dataformat-xml project
emildinchev Jul 5, 2023
18decbf
Fix the dataformat-json project
emildinchev Jul 6, 2023
b0c17e6
Adapt the mixins
emildinchev Jul 7, 2023
6326dae
Revert some changes in the comments
emildinchev Jul 7, 2023
74811fb
Adapt dataformat-core
emildinchev Jul 7, 2023
382fd3d
Adapt dataformat-json project
emildinchev Jul 7, 2023
5c7bff0
Update PropertyMixin.java
emildinchev Jul 7, 2023
32df45a
Merge pull request #1 from sap-contributions/generated-v3-part2
emildinchev Jul 11, 2023
4fa5d0f
fix: enable more than one data specification content (#5)
tschultebahrenberg-sap Jul 27, 2023
d77046b
add copyright header
sebbader-sap Jul 28, 2023
953c7f4
fix v3.0.1 compliance of descriptors
sebbader-sap Jul 28, 2023
fff595c
fix v3.0.1 compliance of descriptors
sebbader-sap Jul 28, 2023
a4ceded
add v3.0.1 classes of new model generator run
sebbader-sap Jul 28, 2023
40c6f31
remove copy constructor logic
sebbader-sap Jul 28, 2023
5942128
remove part 2 classes
sebbader-sap Jul 28, 2023
04cbc42
Cherry pick the changes to fix the extensions serialization
emildinchev Sep 4, 2023
159e28a
merge JSON Serialiser and Deserialiser, remove not needed interfaces
sebbader-sap Oct 9, 2023
7c172f1
remove dataformat-rdf and validator
sebbader-sap Oct 9, 2023
fcb2fa3
add 'public' to json mixin methods
sebbader-sap Oct 9, 2023
52d57ce
undo linebreak deletion in mixins
sebbader-sap Oct 9, 2023
97b7849
Merge branch 'main' into sap-contributions-generated-v3-classes-and-t…
sebbader-sap Oct 9, 2023
bfed684
remove Reference and SpecificAssetId de/serialiser
sebbader-sap Oct 10, 2023
be8ecec
remove unneeded EmbeddedDataSpecificationDeserializer
sebbader-sap Oct 10, 2023
0758ad7
remove unneeded EmbeddedDataSpecificationDeserializer
sebbader-sap Oct 10, 2023
95e4961
remove unneeded EmbeddedDataSpecificationSerializer
sebbader-sap Oct 10, 2023
b54a302
remove unneeded changes
sebbader-sap Oct 10, 2023
fc2e5d8
undo changes introduced by the embeddeddataspecification works
sebbader-sap Oct 10, 2023
f6e78b0
undo changes introduced by the embeddeddataspecification works
sebbader-sap Oct 10, 2023
87a3099
change tostring for defaultblob
sebbader-sap Oct 10, 2023
5f675d6
optimize imports
sebbader-sap Oct 10, 2023
8932d1a
remove protocolinformation
sebbader-sap Oct 11, 2023
a7fd2b0
optimize imports
sebbader-sap Oct 11, 2023
7e64d11
remove unnecessary todos
sebbader-sap Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions ...aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,28 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx;

import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import org.apache.commons.io.IOUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;

import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.internal.AASXUtils;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlDeserializer;
import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
import org.eclipse.digitaltwin.aas4j.v3.model.File;
import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElementCollection;
import org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell;
import org.eclipse.digitaltwin.aas4j.v3.model.AssetInformation;

import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

/**
* The AASX package converter converts a aasx package into a list of aas, a list
Expand Down
32 changes: 13 additions & 19 deletions ...t-aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx;

import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;

import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
Expand All @@ -32,21 +23,24 @@
import org.apache.poi.openxml4j.opc.RelationshipSource;
import org.apache.poi.openxml4j.opc.TargetMode;
import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.eclipse.digitaltwin.aas4j.v3.model.File;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.internal.AASXUtils;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSerializer;
import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
import org.eclipse.digitaltwin.aas4j.v3.model.File;
import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElementCollection;
import org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell;
import org.eclipse.digitaltwin.aas4j.v3.model.AssetInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.internal.AASXUtils;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSerializer;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;

/**
* This class can be used to generate an .aasx file from Metamodel Objects and
Expand Down
9 changes: 4 additions & 5 deletions ...at-aasx/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/AASXValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx;

import java.io.IOException;
import java.io.InputStream;
import java.util.Set;

import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSchemaValidator;
import org.xml.sax.SAXException;

import org.eclipse.digitaltwin.aas4j.v3.dataformat.xml.XmlSchemaValidator;
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;

/**
* Class to validate the XML file inside an AASX-package
Expand Down
32 changes: 15 additions & 17 deletions ...rg/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/deserialization/AASXDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,30 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.deserialization;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import javax.xml.parsers.ParserConfigurationException;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXDeserializer;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.xml.sax.SAXException;

import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class AASXDeserializerTest {

Expand Down
25 changes: 12 additions & 13 deletions ...java/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/deserialization/ValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.deserialization;

import static org.junit.Assert.assertEquals;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import javax.xml.parsers.ParserConfigurationException;

import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.DeserializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
Expand All @@ -40,6 +27,18 @@
import org.junit.rules.TemporaryFolder;
import org.xml.sax.SAXException;

import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import static org.junit.Assert.assertEquals;

public class ValidationTest {

@Rule
Expand Down
22 changes: 10 additions & 12 deletions ...va/org/eclipse/digitaltwin/aas4j/v3/dataformat/aasx/serialization/AASXSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@
package org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.serialization;


import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
import org.junit.Before;
import org.junit.Test;

import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand All @@ -27,16 +33,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;

import org.junit.Before;
import org.junit.Test;

import org.eclipse.digitaltwin.aas4j.v3.dataformat.SerializationException;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.AASXSerializer;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.aasx.InMemoryFile;
import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.AASSimple;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class AASXSerializerTest {

Expand Down
4 changes: 2 additions & 2 deletions ...va/org/eclipse/digitaltwin/aas4j/v3/dataformat/core/deserialization/EnumDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.deserialization;

import java.io.IOException;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;

import java.io.IOException;

/**
* Deserializes enum values converting element names from UpperCamelCase to
* SCREAMING_SNAKE_CASE
Expand Down
6 changes: 3 additions & 3 deletions ...org/eclipse/digitaltwin/aas4j/v3/dataformat/core/internal/util/IdentifiableCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util;

import java.util.HashSet;
import java.util.Set;

import org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.visitor.AssetAdministrationShellElementWalkerVisitor;
import org.eclipse.digitaltwin.aas4j.v3.model.AssetAdministrationShell;
import org.eclipse.digitaltwin.aas4j.v3.model.ConceptDescription;
import org.eclipse.digitaltwin.aas4j.v3.model.Environment;
import org.eclipse.digitaltwin.aas4j.v3.model.Identifiable;
import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;

import java.util.HashSet;
import java.util.Set;

/**
* Collects all Identifiable elements within an
* AssetAdministrationShellEnvironment
Expand Down
4 changes: 2 additions & 2 deletions ...e/digitaltwin/aas4j/v3/dataformat/core/internal/util/MostSpecificTypeTokenComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
package org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util;

import java.util.Comparator;

import com.google.common.reflect.TypeToken;

import java.util.Comparator;

/**
* Comparator comparing two TypeToken regarding which type is more specific.
*/
Expand Down
9 changes: 5 additions & 4 deletions ...win/aas4j/v3/dataformat/core/internal/visitor/AssetAdministrationShellElementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
* Copyright (c) 2023 SAP SE
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -53,7 +54,7 @@
import org.eclipse.digitaltwin.aas4j.v3.model.ReferenceElement;
import org.eclipse.digitaltwin.aas4j.v3.model.RelationshipElement;
import org.eclipse.digitaltwin.aas4j.v3.model.Resource;
import org.eclipse.digitaltwin.aas4j.v3.model.SpecificAssetID;
import org.eclipse.digitaltwin.aas4j.v3.model.SpecificAssetId;
import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElementCollection;
Expand Down Expand Up @@ -132,8 +133,8 @@ public default void visit(HasSemantics hasSemantics) {
Class<?> type = hasSemantics.getClass();
if (Extension.class.isAssignableFrom(type)) {
visit((Extension) hasSemantics);
} else if (SpecificAssetID.class.isAssignableFrom(type)) {
visit((SpecificAssetID) hasSemantics);
} else if (SpecificAssetId.class.isAssignableFrom(type)) {
visit((SpecificAssetId) hasSemantics);
} else if (Submodel.class.isAssignableFrom(type)) {
visit((Submodel) hasSemantics);
} else if (SubmodelElement.class.isAssignableFrom(type)) {
Expand Down Expand Up @@ -245,7 +246,7 @@ public default void visit(Extension extension) {
public default void visit(File file) {
}

public default void visit(SpecificAssetID identifierKeyValuePair) {
public default void visit(SpecificAssetId identifierKeyValuePair) {
}

public default void visit(Key key) {
Expand Down
Loading