Skip to content

Commit

Permalink
Merge branch 'release/2021-03-rc1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivan-gomes
ivan-gomes committed Mar 28, 2021
2 parents 28a5806 + fb1eca4 commit d914eab
Show file tree
Hide file tree
Showing 303 changed files with 8,512 additions and 10,411 deletions.
4 changes: 2 additions & 2 deletions app/controllers/BaseController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

public abstract class BaseController extends Controller {

protected static final boolean INLINE_JSON_LD_CONTEXT_DEFAULT = false;
protected static final boolean INLINE_JSON_LD_CONTEXT_DEFAULT = true;
protected static final boolean INLINE_JSON_LD_CONTEXT = Optional.ofNullable(System.getenv("INLINE_JSON_LD_CONTEXT"))
.map(Boolean::parseBoolean)
.orElse(INLINE_JSON_LD_CONTEXT_DEFAULT);
Expand Down Expand Up @@ -178,6 +178,6 @@ protected static JsonLdMofObjectAdornment adornMofObject(MofObject mof, Http.Req
}

protected static boolean respondWithJsonLd(Http.Request request) {
return request.accepts(JSONLD_MIME_TYPE);
return request.accepts(JSONLD_MIME_TYPE) && !request.accepts(Http.MimeTypes.JSON);
}
}
30 changes: 15 additions & 15 deletions app/org/omg/sysml/external/impl/ExternalElementImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,38 +64,38 @@ public void setResourceIdentifier(URI resourceIdentifier) {
}

// @info.archinnov.achilles.annotations.Column("aliasId")
private Collection<String> aliasId;
private List<String> aliasId;

@JsonGetter
@Lob
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
@ElementCollection(targetClass = String.class)
@CollectionTable(name = "ExternalElement_aliasId",
joinColumns = @JoinColumn(name = "ExternalElementId"))
public Collection<String> getAliasId() {
public List<String> getAliasId() {
if (aliasId == null) {
aliasId = new ArrayList<>();
}
return aliasId;
}

@JsonSetter
public void setAliasId(Collection<String> aliasId) {
public void setAliasId(List<String> aliasId) {
this.aliasId = aliasId;
}



// @info.archinnov.achilles.annotations.Column("documentation")
private Collection<Documentation> documentation;
private List<Documentation> documentation;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
@JoinTable(name = "ExternalElement_documentation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Documentation> getDocumentation() {
public List<Documentation> getDocumentation() {
if (documentation == null) {
documentation = new ArrayList<>();
}
Expand All @@ -104,15 +104,15 @@ public Collection<Documentation> getDocumentation() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DocumentationImpl.class)
public void setDocumentation(Collection<Documentation> documentation) {
public void setDocumentation(List<Documentation> documentation) {
this.documentation = documentation;
}



// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("documentationComment")
private Collection<Comment> documentationComment;
private List<Comment> documentationComment;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
Expand All @@ -121,7 +121,7 @@ public void setDocumentation(Collection<Documentation> documentation) {
@JoinTable(name = "ExternalElement_documentationComment",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Comment> getDocumentationComment() {
public List<Comment> getDocumentationComment() {
if (documentationComment == null) {
documentationComment = new ArrayList<>();
}
Expand All @@ -130,7 +130,7 @@ public Collection<Comment> getDocumentationComment() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = CommentImpl.class)
public void setDocumentationComment(Collection<Comment> documentationComment) {
public void setDocumentationComment(List<Comment> documentationComment) {
this.documentationComment = documentationComment;
}

Expand Down Expand Up @@ -191,15 +191,15 @@ public void setName(String name) {


// @info.archinnov.achilles.annotations.Column("ownedAnnotation")
private Collection<Annotation> ownedAnnotation;
private List<Annotation> ownedAnnotation;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
@JoinTable(name = "ExternalElement_ownedAnnotation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Annotation> getOwnedAnnotation() {
public List<Annotation> getOwnedAnnotation() {
if (ownedAnnotation == null) {
ownedAnnotation = new ArrayList<>();
}
Expand All @@ -208,15 +208,15 @@ public Collection<Annotation> getOwnedAnnotation() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AnnotationImpl.class)
public void setOwnedAnnotation(Collection<Annotation> ownedAnnotation) {
public void setOwnedAnnotation(List<Annotation> ownedAnnotation) {
this.ownedAnnotation = ownedAnnotation;
}



// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedElement")
private Collection<Element> ownedElement;
private List<Element> ownedElement;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
Expand All @@ -225,7 +225,7 @@ public void setOwnedAnnotation(Collection<Annotation> ownedAnnotation) {
@JoinTable(name = "ExternalElement_ownedElement",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Element> getOwnedElement() {
public List<Element> getOwnedElement() {
if (ownedElement == null) {
ownedElement = new ArrayList<>();
}
Expand All @@ -234,7 +234,7 @@ public Collection<Element> getOwnedElement() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ExternalElementImpl.class)
public void setOwnedElement(Collection<Element> ownedElement) {
public void setOwnedElement(List<Element> ownedElement) {
this.ownedElement = ownedElement;
}

Expand Down
30 changes: 15 additions & 15 deletions app/org/omg/sysml/external/impl/ExternalRelationshipImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,38 +74,38 @@ public void setSpecification(String specification) {
this.specification = specification;
}
// @info.archinnov.achilles.annotations.Column("aliasId")
private Collection<String> aliasId;
private List<String> aliasId;

@JsonGetter
@Lob
@org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
@ElementCollection(targetClass = String.class)
@CollectionTable(name = "ExternalRelationship_aliasId",
joinColumns = @JoinColumn(name = "ExternalRelationshipId"))
public Collection<String> getAliasId() {
public List<String> getAliasId() {
if (aliasId == null) {
aliasId = new ArrayList<>();
}
return aliasId;
}

@JsonSetter
public void setAliasId(Collection<String> aliasId) {
public void setAliasId(List<String> aliasId) {
this.aliasId = aliasId;
}



// @info.archinnov.achilles.annotations.Column("documentation")
private Collection<Documentation> documentation;
private List<Documentation> documentation;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
@JoinTable(name = "ExternalRelationship_documentation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Documentation> getDocumentation() {
public List<Documentation> getDocumentation() {
if (documentation == null) {
documentation = new ArrayList<>();
}
Expand All @@ -114,15 +114,15 @@ public Collection<Documentation> getDocumentation() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DocumentationImpl.class)
public void setDocumentation(Collection<Documentation> documentation) {
public void setDocumentation(List<Documentation> documentation) {
this.documentation = documentation;
}



// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("documentationComment")
private Collection<Comment> documentationComment;
private List<Comment> documentationComment;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
Expand All @@ -131,7 +131,7 @@ public void setDocumentation(Collection<Documentation> documentation) {
@JoinTable(name = "ExternalRelationship_documentationComment",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Comment> getDocumentationComment() {
public List<Comment> getDocumentationComment() {
if (documentationComment == null) {
documentationComment = new ArrayList<>();
}
Expand All @@ -140,7 +140,7 @@ public Collection<Comment> getDocumentationComment() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = CommentImpl.class)
public void setDocumentationComment(Collection<Comment> documentationComment) {
public void setDocumentationComment(List<Comment> documentationComment) {
this.documentationComment = documentationComment;
}

Expand Down Expand Up @@ -200,15 +200,15 @@ public void setName(String name) {


// @info.archinnov.achilles.annotations.Column("ownedAnnotation")
private Collection<Annotation> ownedAnnotation;
private List<Annotation> ownedAnnotation;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
@ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
@JoinTable(name = "ExternalRelationship_ownedAnnotation",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Annotation> getOwnedAnnotation() {
public List<Annotation> getOwnedAnnotation() {
if (ownedAnnotation == null) {
ownedAnnotation = new ArrayList<>();
}
Expand All @@ -217,15 +217,15 @@ public Collection<Annotation> getOwnedAnnotation() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AnnotationImpl.class)
public void setOwnedAnnotation(Collection<Annotation> ownedAnnotation) {
public void setOwnedAnnotation(List<Annotation> ownedAnnotation) {
this.ownedAnnotation = ownedAnnotation;
}



// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("ownedElement")
private Collection<Element> ownedElement;
private List<Element> ownedElement;

@JsonGetter
@JsonSerialize(contentUsing = MofObjectSerializer.class)
Expand All @@ -234,7 +234,7 @@ public void setOwnedAnnotation(Collection<Annotation> ownedAnnotation) {
@JoinTable(name = "ExternalRelationship_ownedElement",
joinColumns = @JoinColumn(name = "classId"),
inverseJoinColumns = @JoinColumn(name = "attributeId"))
public Collection<Element> getOwnedElement() {
public List<Element> getOwnedElement() {
if (ownedElement == null) {
ownedElement = new ArrayList<>();
}
Expand All @@ -243,7 +243,7 @@ public Collection<Element> getOwnedElement() {

@JsonSetter
@JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class)
public void setOwnedElement(Collection<Element> ownedElement) {
public void setOwnedElement(List<Element> ownedElement) {
this.ownedElement = ownedElement;
}

Expand Down
4 changes: 2 additions & 2 deletions app/org/omg/sysml/metamodel/AnnotatingElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.Set;

public interface AnnotatingElement extends Element, MofObject {
Collection<? extends Annotation> getAnnotation();
List<? extends Annotation> getAnnotation();

Collection<? extends Element> getAnnotatedElement();
List<? extends Element> getAnnotatedElement();
}
2 changes: 1 addition & 1 deletion app/org/omg/sysml/metamodel/AnnotatingFeature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
public interface AnnotatingFeature extends AnnotatingElement, Feature, MofObject {
DataType getMetadataType();

Collection<? extends MetadataFeature> getOwnedMetadata();
List<? extends MetadataFeature> getOwnedMetadata();
}
2 changes: 1 addition & 1 deletion app/org/omg/sysml/metamodel/Behavior.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
public interface Behavior extends Class, MofObject {
Collection<? extends Step> getStep();

Collection<? extends Feature> getParameter();
List<? extends Feature> getParameter();
}
30 changes: 0 additions & 30 deletions app/org/omg/sysml/metamodel/BlockExpression.java
View file

This file was deleted.

10 changes: 5 additions & 5 deletions app/org/omg/sysml/metamodel/Element.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ public interface Element extends MofObject {

Element getOwner();

Collection<? extends Element> getOwnedElement();
List<? extends Element> getOwnedElement();

Collection<? extends Documentation> getDocumentation();
List<? extends Documentation> getDocumentation();

Collection<? extends Comment> getDocumentationComment();
List<? extends Comment> getDocumentationComment();

Collection<? extends Annotation> getOwnedAnnotation();
List<? extends Annotation> getOwnedAnnotation();

Collection<? extends TextualRepresentation> getOwnedTextualRepresentation();

String getQualifiedName();

Collection<? extends String> getAliasId();
List<? extends String> getAliasId();

String getHumanId();
}
8 changes: 4 additions & 4 deletions app/org/omg/sysml/metamodel/Feature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public interface Feature extends Type, MofObject {

Boolean getIsOrdered();

Collection<? extends Type> getType();
List<? extends Type> getType();

Collection<? extends Redefinition> getOwnedRedefinition();

Expand All @@ -46,11 +46,11 @@ public interface Feature extends Type, MofObject {

Type getEndOwningType();

Collection<? extends FeatureTyping> getOwnedTyping();
List<? extends FeatureTyping> getOwnedTyping();

Collection<? extends Type> getFeaturingType();
List<? extends Type> getFeaturingType();

Collection<? extends TypeFeaturing> getOwnedTypeFeaturing();
List<? extends TypeFeaturing> getOwnedTypeFeaturing();

Boolean getIsNonunique();
}
Loading

0 comments on commit d914eab

Please sign in to comment.