Skip to content

Commit a18de6b

Browse files
committed
Merge branch 'release/2022-07'
2 parents 2ae3545 + 67d2ce9 commit a18de6b

File tree

9 files changed

+606
-1
lines changed

9 files changed

+606
-1
lines changed

app/org/omg/sysml/lifecycle/impl/package-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
@MetaValue(value = "PortUsage", targetEntity = PortUsageImpl.class),
144144
@MetaValue(value = "PortioningFeature", targetEntity = PortioningFeatureImpl.class),
145145
@MetaValue(value = "Predicate", targetEntity = PredicateImpl.class),
146+
@MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class),
146147
@MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class),
147148
@MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class),
148149
@MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class),
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* SysML v2 REST/HTTP Pilot Implementation
3+
* Copyright (C) 2020 InterCAX LLC
4+
* Copyright (C) 2020 California Institute of Technology ("Caltech")
5+
* Copyright (C) 2021-2022 Twingineer LLC
6+
*
7+
* This program is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* (at your option) any later version.
11+
*
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public License
18+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
19+
*
20+
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
21+
*/
22+
23+
package org.omg.sysml.metamodel;
24+
25+
import java.util.Collection;
26+
import java.util.List;
27+
import java.util.Set;
28+
29+
public interface PrefixComment extends Comment, SysMLType {
30+
31+
}

app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,13 @@ public void setElementId(java.util.UUID elementId) {
155155

156156

157157

158+
// @info.archinnov.achilles.annotations.Transient
158159
// @info.archinnov.achilles.annotations.Column("featureWithValue")
159160
private Feature featureWithValue;
160161

161162
@JsonGetter
162163
@JsonSerialize(using = DataSerializer.class)
164+
// @javax.persistence.Transient
163165
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureWithValue_type"), fetch = FetchType.LAZY)
164166
@JoinColumn(name = "featureWithValue_id", table = "FeatureValue")
165167
public Feature getFeatureWithValue() {

0 commit comments

Comments
 (0)