Skip to content

554 refactoring tool all aspects with references to x #599

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8c529b3
Add new command for search
Yauhenikapl Jul 3, 2024
59488f9
Update new command
Yauhenikapl Jul 3, 2024
d8aa58c
Update new command
Yauhenikapl Jul 4, 2024
17e9e2d
Allow property mapping customizations for collection properties
andreas-schilling Jun 24, 2024
b8bff8b
Fix style issues
andreas-schilling Jun 25, 2024
e9cb552
Add initial set of improved model abstractions
atextor May 24, 2024
a2a5ad3
Added initializing ModelFiles during models resolving.
ysrbo May 30, 2024
9b85db1
Removed AspectContext
ysrbo Jun 4, 2024
b3f3660
Fixed unit tests
ysrbo Jun 7, 2024
77f175a
fixed code style
ysrbo Jun 10, 2024
2cda3c9
Consolidate SAMM interfaces in -interface module
atextor Jun 20, 2024
10c4c98
Unify and clean up org.eclipse.esmf.{metamodel,aspectmodel} packages
atextor Jun 20, 2024
5370a97
Implement loading abstraction that includes AspectModelFile
atextor Jul 5, 2024
5d2de81
Update AspectModelResolverTest and add FromLoadedFileStrategy
atextor Jul 8, 2024
985df08
Fix code style
atextor Jul 8, 2024
656f9cd
Add comments and remove deprecated code
atextor Jul 8, 2024
74abd69
Remove parameterization over meta model versions in tests
atextor Jul 8, 2024
fa9c688
Temporarily disable code style check
atextor Jul 8, 2024
a9c7be6
Incorporate PR suggestions
atextor Jul 8, 2024
a7a4a58
Update documentation with Java/samm-cli/Maven plugin changes
atextor Jul 8, 2024
adbeedf
Re-enable code style check
atextor Jul 9, 2024
e9db33e
Fix GitHub workflow YAML indentation
atextor Jul 9, 2024
fc26e50
Add new command for search
Yauhenikapl Jul 3, 2024
6b977c0
Update new command
Yauhenikapl Jul 3, 2024
699842f
Update new command
Yauhenikapl Jul 9, 2024
923480c
Update new command
Yauhenikapl Jul 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions core/esmf-aspect-meta-model-interface/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
<groupId>org.eclipse.esmf</groupId>
<artifactId>esmf-semantic-aspect-meta-model</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
* Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
*
* See the AUTHORS file(s) distributed with this work for additional
* information regarding authorship.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: MPL-2.0
*/

package org.eclipse.esmf.metamodel.loader;
package org.eclipse.esmf.aspectmodel;

public class AspectLoadingException extends RuntimeException {
private static final long serialVersionUID = 7687644022103150329L;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
*
* See the AUTHORS file(s) distributed with this work for additional
* information regarding authorship.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*/

package org.eclipse.esmf.aspectmodel;

import java.net.URI;
import java.util.List;
import java.util.Optional;

import org.eclipse.esmf.metamodel.ModelElement;
import org.eclipse.esmf.metamodel.ModelElementGroup;

import org.apache.jena.rdf.model.Model;

public interface AspectModelFile extends ModelElementGroup {
Model sourceModel();

default List<String> headerComment() {
return List.of();
}

Optional<URI> sourceLocation();

@Override
default List<ModelElement> elements() {
throw new UnsupportedOperationException( "Uninitialized Aspect Model" );
}

// boolean isAutoMigrated();
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
* Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
*
* See the AUTHORS file(s) distributed with this work for additional
* information regarding authorship.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: MPL-2.0
*/

package org.eclipse.esmf.aspectmodel.versionupdate.migrator;
package org.eclipse.esmf.aspectmodel.versionupdate;

import java.util.Optional;

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
* Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
*
* See the AUTHORS file(s) distributed with this work for additional
* information regarding authorship.
Expand All @@ -10,30 +10,8 @@
*
* SPDX-License-Identifier: MPL-2.0
*/
package org.eclipse.esmf.metamodel.visitor;

import org.eclipse.esmf.characteristic.Code;
import org.eclipse.esmf.characteristic.Collection;
import org.eclipse.esmf.characteristic.Duration;
import org.eclipse.esmf.characteristic.Either;
import org.eclipse.esmf.characteristic.Enumeration;
import org.eclipse.esmf.characteristic.List;
import org.eclipse.esmf.characteristic.Measurement;
import org.eclipse.esmf.characteristic.Quantifiable;
import org.eclipse.esmf.characteristic.Set;
import org.eclipse.esmf.characteristic.SingleEntity;
import org.eclipse.esmf.characteristic.SortedSet;
import org.eclipse.esmf.characteristic.State;
import org.eclipse.esmf.characteristic.StructuredValue;
import org.eclipse.esmf.characteristic.TimeSeries;
import org.eclipse.esmf.characteristic.Trait;
import org.eclipse.esmf.constraint.EncodingConstraint;
import org.eclipse.esmf.constraint.FixedPointConstraint;
import org.eclipse.esmf.constraint.LanguageConstraint;
import org.eclipse.esmf.constraint.LengthConstraint;
import org.eclipse.esmf.constraint.LocaleConstraint;
import org.eclipse.esmf.constraint.RangeConstraint;
import org.eclipse.esmf.constraint.RegularExpressionConstraint;
package org.eclipse.esmf.aspectmodel.visitor;

import org.eclipse.esmf.metamodel.AbstractEntity;
import org.eclipse.esmf.metamodel.Aspect;
import org.eclipse.esmf.metamodel.Characteristic;
Expand All @@ -54,6 +32,28 @@
import org.eclipse.esmf.metamodel.Type;
import org.eclipse.esmf.metamodel.Unit;
import org.eclipse.esmf.metamodel.Value;
import org.eclipse.esmf.metamodel.characteristic.Code;
import org.eclipse.esmf.metamodel.characteristic.Collection;
import org.eclipse.esmf.metamodel.characteristic.Duration;
import org.eclipse.esmf.metamodel.characteristic.Either;
import org.eclipse.esmf.metamodel.characteristic.Enumeration;
import org.eclipse.esmf.metamodel.characteristic.List;
import org.eclipse.esmf.metamodel.characteristic.Measurement;
import org.eclipse.esmf.metamodel.characteristic.Quantifiable;
import org.eclipse.esmf.metamodel.characteristic.Set;
import org.eclipse.esmf.metamodel.characteristic.SingleEntity;
import org.eclipse.esmf.metamodel.characteristic.SortedSet;
import org.eclipse.esmf.metamodel.characteristic.State;
import org.eclipse.esmf.metamodel.characteristic.StructuredValue;
import org.eclipse.esmf.metamodel.characteristic.TimeSeries;
import org.eclipse.esmf.metamodel.characteristic.Trait;
import org.eclipse.esmf.metamodel.constraint.EncodingConstraint;
import org.eclipse.esmf.metamodel.constraint.FixedPointConstraint;
import org.eclipse.esmf.metamodel.constraint.LanguageConstraint;
import org.eclipse.esmf.metamodel.constraint.LengthConstraint;
import org.eclipse.esmf.metamodel.constraint.LocaleConstraint;
import org.eclipse.esmf.metamodel.constraint.RangeConstraint;
import org.eclipse.esmf.metamodel.constraint.RegularExpressionConstraint;

/**
* Visitor interface for the traversal of Aspect Meta Model instances
Expand Down
Loading