Skip to content

Conversation

@FrankSchnicke
Copy link
Contributor

No description provided.

FrankSchnicke and others added 30 commits October 21, 2021 15:37
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Refactor AASRegistryModelProvider
- Were added accidentally

Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
- Modifies POM accordingly

Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
* Refactor Converters to use AasEnv

Signed-off-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
* main, development**, bugfix**, feature**

Signed-off-by: Frank Schnicke <77283144+FrankSchnicke@users.noreply.github.com>
* Update maven-publish-snapshot.yml

* Rename README to README.md

* Update maven-publish-snapshot.yml

* Update pom.xml

* Update pom.xml
* Added helper classes for MqttAASRegistry, MqttAASAggregator, MqttSubmodelAPI

* Added helper class definitions
…rtDuplicationException (#24)


Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
Refactors DelegatedInvocationHelper to be able to use custom IConnectorFactory for delegated invokations
Renames DelegatedInvocationHelper to DelegatedInvocationManager

Signed-off-by: Maximilian Conradi <maximilian.conradi@iese.fraunhofer.de>
* Fixed Reference.isReference throws Exception with raw maps (#11)

* Updates JUnit & Milo to address Dependabot alerts (#12)

* Fixed getValue caching for ConnectedSubmodelElements

Co-authored-by: Mohammad Ghazanfar Ali Danish <62088117+mdanish98@users.noreply.github.com>
…orization for AASRegistry

Signed-off-by: Philipp Neuschwander <philipp.neuschwander@iese.fraunhofer.de>
Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
Fixed non-deterministic behaviour of serialized JSON
Adds ISubmodelAggregator for aggregating local submodels
* implement feature tags for submodels via applied patch

* use VABPathTools for path encoding

* remove unused import

* refactor extract method registerSubmodel

* add javadoc

* revert formatting as requested

* Adds default to the newly added methods

* Adds java doc

* Fix creation of dynamic submodels with MultiSubmodelProvider

* implement feature tags for submodels via applied patch

* use VABPathTools for path encoding

* remove unused import

* refactor extract method registerSubmodel

* add javadoc

* revert formatting as requested

* Adds default to the newly added methods

* Adds java doc

* Fixed lookupBothAasAndSubmodelTags for *, submodelTags

Returning now only descriptors for matching submodelTags, from all AAS.


Signed-off-by: Alexander Gordt <alexander.gordt@objective-partner.com>

Co-authored-by: Mischa Siebert <mischa.siebert@objective-partner.com>
Co-authored-by: Eduardo Buitrago <eduardo.buitrago@objective-partner.com>
Co-authored-by: objective-partner-ebuitrago <96250521+objective-partner-ebuitrago@users.noreply.github.com>
Co-authored-by: Daniel Espen <Daniel.Espen@iese.fraunhofer.de>
Co-authored-by: Alexander Gordt <alexander.gordt@objective-partner.com>
* Adds observer and observable aggregator of submodel

Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Adds MQTT functionality to SubmodelAggregator
* Adds corresponding tests
* Fixes class comment

Co-authored-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Signed-off-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>

* Adds new constructors for MqttAggregator creation

Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Fixes JavaDoc

Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Fixes JavaDoc

Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Removes unnecessary comment

Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Moves observer package to submodel

Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Changes payload of deleteByIdShort function to id instead of idShort

Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
Co-authored-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>
Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

* Reworks MqttSubmodelAggregator
* Removes duplicate code
* Uses idea of MqttSubmodelAPI

Co-authored-by: Rene Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Co-authored-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>

* Reworks MqttAASAggregator
* Removes duplicate code
* Uses idea of MqttSubmodelAPI

Co-authored-by: Rene Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Signed-off-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>

* Reworks test to incorporate parent shell id checks

Co-authored-by: Rene Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Signed-off-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>

* Implements missing methods for submodel creation

Co-authored-by: Rene Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>

* Moves observer registration in observable to the specific aggregator

Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
Co-authored-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>
Signed-off-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>

Co-authored-by: Jannis Jung <jannis.jung@iese.fraunhofer.de>
Co-authored-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>
FrankSchnicke and others added 27 commits February 24, 2022 08:05
Fixing NullPointerException on Property.setValueId(null)
* Adds MQTT integration for remaining APIs

* Adds MQTT for AAS API
* Adds MQTT for Submodel API
* Integration in the AASAggregator for OTS Component

Signed-off-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>

* Adds Test for full Mqtt Integration
* Adds Factory for SubmodelAggregator
* Adds AASAPIFactory

Signed-off-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>

* Fixes updateAAS lossing SubmodelReferences
* Fixes updateAAS not working with AASX Upload
* Reverts Formatting changes
* Renames Factories according to previous pattern

* Implements changes required by code review
* Finishes implementation of Decorating Factories
* Refactors Tests

Signed-off-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>

* Adds @deprecated warning to Decorating Factories
Changes AASAggregatorFactory according to code review
Changes observer and observerdAPI to local field

Signed-off-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>
Description:
- Removes getInputStream method from AASXToMetamodelConverter
- Adds helper class FileLoaderHelper to facilitate loading of files

Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
* Adds MQTT integration for remaining APIs

* Adds MQTT for AAS API
* Adds MQTT for Submodel API
* Integration in the AASAggregator for OTS Component

Signed-off-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>

* Adds Test for full Mqtt Integration
* Adds Factory for SubmodelAggregator
* Adds AASAPIFactory

Signed-off-by: Jannik Fried <jannik.fried@iese.fraunhofer.de>

* Fixes updateAAS lossing SubmodelReferences
* Fixes updateAAS not working with AASX Upload
* Reverts Formatting changes
* Renames Factories according to previous pattern

* Adds authorization to remaining AASServer layers

Signed-off-by: Daniel Espen <Daniel.Espen@iese.fraunhofer.de>

* Implements changes required by code review
* Finishes implementation of Decorating Factories
* Refactors Tests

Signed-off-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>

* Adds @deprecated warning to Decorating Factories
Changes AASAggregatorFactory according to code review
Changes observer and observerdAPI to local field

Signed-off-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>

* Removes unnecessary throw declaration

Signed-off-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>

* Adds decorating Factory for AuthorizedAASAggregator

Co-authored-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Signed-off-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de>

Co-authored-by: Daniel Espen <Daniel.Espen@iese.fraunhofer.de>
Co-authored-by: Rene-Pascal Fischer <rene-pascal.fischer@iese.fraunhofer.de>
Adds helper class FileLoaderHelper
* Implements retrieveAASAll in ConnectedAssetAdministrationShellManager

Signed-off-by: Maximilian Conradi <maximilian.conradi@iese.fraunhofer.de>

* Refactors setValue in SubmodelProvider to use SubmodelElementFacadeFactory

Signed-off-by: Maximilian Conradi <maximilian.conradi@iese.fraunhofer.de>
Added constructor with user/pass to MqttAASRegistryServiceObserver
* Adds create method in interfaces

Description:
- Adds create method in IAASAPIFactory and marks getAASApi as deprecated
- Adds create method in IConnectorFactory and marks getConnector as deprecated
- Adds create method in ISubmodelAPIFactory and marks getSubmodelAPI as deprecated

Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>

* Replaces usage of old methods with create method

Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>

* Fixes javadoc error

Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
SubmodelElements in JSON response from /aas/submodels were represented as Map and not as List

Signed-off-by: Maximilian Conradi <maximilian.conradi@iese.fraunhofer.de>
* Harmonizes path handling for sync/async invocation

Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>

* Fixes formatting issue

Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Mohammad Ghazanfar Ali Danish <ghazanfar.danish@iese.fraunhofer.de>
Fixes GitHub Action does not delete old packages
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
…ement

Fixes wrong conversion of Entity statement
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
@FrankSchnicke FrankSchnicke merged commit 4690323 into main Apr 25, 2022
@AbiGithub91
Copy link

Implements CORS configuration is not available in this release. When it will be available?

@FrankSchnicke
Copy link
Contributor Author

FrankSchnicke commented May 24, 2022

Implements CORS configuration is not available in this release. When it will be available?
It will be contained in the next minor release (somewhere in July) and is already available in the development branch: #83

The integration in our components is currently being worked on and will be made available shorty.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.