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.

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

Updating to v3.0RC02 #18

Merged
merged 122 commits into from
Dec 14, 2022
Merged

Updating to v3.0RC02 #18

merged 122 commits into from
Dec 14, 2022

Conversation

mjacoby
Copy link
Contributor

@mjacoby mjacoby commented Aug 8, 2022

This PR collects changes, issues and ToDos related to updating to v3.0RC02.

  • Enum Naming
    Enum names for serialization are currently being generated rule-based. If possible, shall become constant, i.e. being provided as part of the input to the model generator and stored in the generated Enum classes.
    Until this is available, generated names will be used.
  • Update handling of embeddedDataSpecifications (see Enable more than one DataSpecificationContent #14)
    Currently we expect the following format
         "embeddedDataSpecifications": [
             "embeddedDataSpecifications": {...},	// reference indicating the type
             "dataSpecificationContent": {...}		// actual data specification
         ]
    
    In the future, either embeddedDataSpecifications or dataSpecificationContent should be present.
    However, it is still undefined how the actual (sub-)type of dataSpecificationContent should be serialized, so this cannot be implemented right now.
    Therefore, this functionality is currently disabled until standardization progresses.
  • ...

sebbader-sap and others added 30 commits June 3, 2022 16:15
Version 1.3.RC02-SNAPSHOT for the model
adjusting the packages to org.eclipse.aas4j and correcting imports and other renaming due to RD02
Adjusting the JSON Serialiser to the new "modelType" pattern and the DataTypeDefXsd notation
* Update test JSON documents to v3.0.RC02
Update the Model and Serialisers to 3.0.rc02
"Default implementation of package org.eclipse.aas4j.v3.rc02.model.xxx" --> "Default implementation of package io.adminshell.aas.v3.rc02.model.xxx"
Fix rename AssetAdministrationShellEnvironmentMixin to EnvironmentMixin
* updated the test files in dataformat-json according to the proper usage of the DataSpecificationIEC61360
* updated the respective classes and builders
* upgrade to minor version 0.2.0-SNAPSHOT
Fix JSON dataformat bugs which appeared after closing some leftovers from the model/mixins updates
…er to debug to create less traffic on the regular log

* Solving a few copy-paste errors in the AASFull test instances
* Adjusting the files paths in AASSimple to match the pattern
* Adjust the ValueList according to the metamodel
…t AAS XML schema

* Update the XSD files to the current 3.0.R02 state
* Updating the XML Mixins and adding new ones where necessary
* Adjusting the XML Serialisers where necessary
* Upgrading the XML UnitTests to comply with 3.0.R02
* Open: XML Matcher in the UnitTests still fails
@mjacoby
Copy link
Contributor Author

mjacoby commented Nov 14, 2022

  1. Inversing the makePlural algorithm (https://github.com/eclipse-aas4j/aas4j-model-generator/blob/main/aas/src/templates/to_plural_form.rq) seems to be straight forward if I'm not missing something. Only problem might occur if have have words that end in 's' in singular because then we can't know if the 's' at the end is a plural 's' or part of the word itself.
    If we do have such words, we have a problem and would require some additional mapping file for mapping between singular and plural...

  2. Not a blocker from my perspective. We can fix this in the final release.

  3. Regarding enums - right now we have an inconsistency as one enum element exists twice in our model and those instances are not the same or equals - this might cause problems in de-/serializing. But I'm fine with keeping it as-is until a concrete problem with it arises.

* Remove support for custom DataSpecificationContent
* remove unused classes
* update ReferableSerializer interface
* cleanup resource files for testing
@mjacoby
Copy link
Contributor Author

mjacoby commented Nov 16, 2022

I just updated dataformat-core and dataformat-json and this seems fine and working now.
However, I removed the support for custom DataSpecificationContent implementation as it is unclear is they are allowed and how they should be handled with latest changes regarding serialization of embeddedDataSpecification. This causes dataformat-xml to break. However, dataformat-xml does not seem like it has been updated to v3.0RC02 as there is e.g. no support for SubmodelElementList. Also the unit tests have been deactivated for dataformat-xml and when actived some of them failed. Not sure if we lost something while merging or it has never been implemented.
Additionally, some files are damaged due to incorrect merging, e.g.

I now consider dataformat-core and dataformat-json basically ready and would appreciate a review.

tschuba and others added 12 commits November 24, 2022 08:46
…-rc02-xml

# Conflicts:
#	dataformat-xml/src/test/java/org/eclipse/aas4j/v3/dataformat/xml/XMLDeserializerTest.java
#	dataformat-xml/src/test/resources/operation_example.xml
…o-rc02-xml

# Conflicts:
#	dataformat-xml/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlSerializerTest.java
…blems

add a custom deserialiser for ValueReferencePairs
fix order of SME-List attributes
* Was not V2 any more
@FrankSchnicke
Copy link
Contributor

After #48 is merged we can also merge this PR.

@sebbader-sap sebbader-sap marked this pull request as ready for review December 6, 2022 15:54
@sebbader-sap
Copy link
Contributor

I have just changed the state of this PR from draft to ready for review. I am personally not 'ready for review' (too many hours in front of the monitor) but will have a look again tomorrow. Would be great if you guys can also add your opinion here before we decide to merge it.

@sebbader-sap
Copy link
Contributor

sebbader-sap commented Dec 6, 2022

@twebermartins twebermartins linked an issue Dec 9, 2022 that may be closed by this pull request
2 tasks
sebbader-sap and others added 3 commits December 9, 2022 16:51
* remove outdated comments
* remove fully qualified class name
* remove unused imports
re-enabling the aasx tests and fixing the aasx code
@sebbader-sap sebbader-sap merged commit 86126fb into main Dec 14, 2022
@twebermartins twebermartins deleted the update-to-rc02 branch January 10, 2023 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Get approval from EMO IP Team to use libraries
6 participants