Skip to content

Commit 523df03

Browse files
author
Matthias Böckmann
committed
Updating to 1.0.9 - including new feature branch on AAS-Specs
1 parent d293a1f commit 523df03

72 files changed

Lines changed: 456 additions & 990 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/de/fraunhofer/iais/eis/AccessPermissionRuleBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,6 @@ final public AccessPermissionRuleBuilder idShort(String idShort) {
9797
}
9898

9999

100-
/**
101-
* This function allows setting a value for parent
102-
* @param parent desired value to be set
103-
* @return Builder object with new value for parent
104-
*/
105-
final public AccessPermissionRuleBuilder parent(URI parent) {
106-
this.defaultAccessPermissionRule.parent = parent;
107-
return this;
108-
}
109-
110-
111100
/**
112101
* This function allows setting a value for qualifiers
113102
* @param qualifiers desired value to be set

‎src/main/java/de/fraunhofer/iais/eis/AnnotatedRelationshipElementBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,6 @@ final public AnnotatedRelationshipElementBuilder idShort(String idShort) {
109109
}
110110

111111

112-
/**
113-
* This function allows setting a value for parent
114-
* @param parent desired value to be set
115-
* @return Builder object with new value for parent
116-
*/
117-
final public AnnotatedRelationshipElementBuilder parent(URI parent) {
118-
this.defaultAnnotatedRelationshipElement.parent = parent;
119-
return this;
120-
}
121-
122-
123112
/**
124113
* This function allows setting a value for qualifiers
125114
* @param qualifiers desired value to be set

‎src/main/java/de/fraunhofer/iais/eis/AssetAdministrationShell.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ public interface AssetAdministrationShell extends HasDataSpecification, Identifi
7878

7979
/**
8080
* "Points from the Admin Shell to the Submodels that describe the Admin Shell of a given Asset"@en
81-
* @return Returns the List of Submodels for the property submodels.
81+
* @return Returns the List of References for the property submodels.
8282
* More information under https://admin-shell.io/aas/3/0/RC01/AssetAdministrationShell/submodel
8383
*/
8484
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetAdministrationShell/submodel")
85-
public List<Submodel> getSubmodels();
85+
public List<Reference> getSubmodels();
8686

8787
/**
8888
* "Points to the differents views associated to the Administration Shell via the Submodels."@en

‎src/main/java/de/fraunhofer/iais/eis/AssetAdministrationShellBuilder.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ final public AssetAdministrationShellBuilder security(Security security) {
6969
* @param submodels desired value to be set
7070
* @return Builder object with new value for submodels
7171
*/
72-
final public AssetAdministrationShellBuilder submodels(List<Submodel> submodels) {
72+
final public AssetAdministrationShellBuilder submodels(List<Reference> submodels) {
7373
this.defaultAssetAdministrationShell.submodels = submodels;
7474
return this;
7575
}
@@ -161,17 +161,6 @@ final public AssetAdministrationShellBuilder idShort(String idShort) {
161161
this.defaultAssetAdministrationShell.idShort = idShort;
162162
return this;
163163
}
164-
165-
166-
/**
167-
* This function allows setting a value for parent
168-
* @param parent desired value to be set
169-
* @return Builder object with new value for parent
170-
*/
171-
final public AssetAdministrationShellBuilder parent(URI parent) {
172-
this.defaultAssetAdministrationShell.parent = parent;
173-
return this;
174-
}
175164
/**
176165
* This function takes the values that were set previously via the other functions of this class and turns them into a Java bean.
177166
* @return Bean with specified values

‎src/main/java/de/fraunhofer/iais/eis/AssetAdministrationShellEnvironment.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package de.fraunhofer.iais.eis;
2+
3+
import de.fraunhofer.iais.eis.util.*;
4+
import de.fraunhofer.iais.eis.*;
5+
6+
import javax.xml.datatype.XMLGregorianCalendar;
7+
import java.lang.String;
8+
import java.math.BigInteger;
9+
import java.net.URL;
10+
import java.net.URI;
11+
import java.util.Arrays;
12+
import java.util.Collections;
13+
import java.util.HashMap;
14+
import java.util.Iterator;
15+
import java.util.List;
16+
import java.util.Map;
17+
import java.util.Objects;
18+
19+
import com.fasterxml.jackson.annotation.JsonIgnore;
20+
21+
/**
22+
* "Asset Administration Shell Environment"
23+
* "A graph of Asset Administration Shells."@en
24+
*/
25+
@KnownSubtypes({
26+
@KnownSubtypes.Type(value = DefaultAssetAdministrationShellEnvironment.class)
27+
})
28+
public interface AssetAdministrationShellEnvironment {
29+
30+
// standard methods
31+
32+
/**
33+
* This function retrieves the ID of the current object (can be set via the constructor of the builder class)
34+
* @return ID of current object as URI
35+
*/
36+
public URI getId();
37+
38+
/**
39+
* This function retrieves a human readable labels about the current class, as defined in the ontology.
40+
* This label could, for example, be used as a field heading in a user interface
41+
* @return Human readable labels
42+
*/
43+
public List<TypedLiteral> getLabels();
44+
45+
/**
46+
* This function retrieves a human readable explanatory comments about the current class, as defined in the ontology.
47+
* This comment could, for example, be used as a tooltip in a user interface
48+
* @return Human readable explanatory comments
49+
*/
50+
public List<TypedLiteral> getComments();
51+
52+
// accessor methods as derived from the Asset Administration Shell ontology
53+
54+
55+
/**
56+
* "Points to the differents Administration Shells in one AssetAdministrationShellEnvironment graph."@en
57+
* @return Returns the List of AssetAdministrationShells for the property assetAdministrationShells.
58+
* More information under https://admin-shell.io/aas/3/0/RC01/AssetAdministrationShellEnvironment/assetAdministrationShell
59+
*/
60+
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetAdministrationShellEnvironment/assetAdministrationShell")
61+
public List<AssetAdministrationShell> getAssetAdministrationShells();
62+
63+
}

‎src/main/java/de/fraunhofer/iais/eis/AssetAdministrationShellEnvironmentBuilder.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package de.fraunhofer.iais.eis;
2+
3+
import de.fraunhofer.iais.eis.util.*;
4+
import de.fraunhofer.iais.eis.*;
5+
6+
import javax.xml.datatype.XMLGregorianCalendar;
7+
import java.lang.String;
8+
import java.math.BigInteger;
9+
import java.net.URL;
10+
import java.net.URI;
11+
import java.util.Arrays;
12+
import java.util.Collections;
13+
import java.util.HashMap;
14+
import java.util.Iterator;
15+
import java.util.List;
16+
import java.util.Map;
17+
import java.util.Objects;
18+
19+
import com.fasterxml.jackson.annotation.JsonIgnore;
20+
21+
public class AssetAdministrationShellEnvironmentBuilder {
22+
23+
private DefaultAssetAdministrationShellEnvironment defaultAssetAdministrationShellEnvironment;
24+
25+
public AssetAdministrationShellEnvironmentBuilder() {
26+
defaultAssetAdministrationShellEnvironment = new DefaultAssetAdministrationShellEnvironment();
27+
}
28+
29+
public AssetAdministrationShellEnvironmentBuilder(URI id) {
30+
this();
31+
defaultAssetAdministrationShellEnvironment.id = id;
32+
}
33+
34+
/**
35+
* This function allows setting a value for assetAdministrationShells
36+
* @param assetAdministrationShells desired value to be set
37+
* @return Builder object with new value for assetAdministrationShells
38+
*/
39+
final public AssetAdministrationShellEnvironmentBuilder assetAdministrationShells(List<AssetAdministrationShell> assetAdministrationShells) {
40+
this.defaultAssetAdministrationShellEnvironment.assetAdministrationShells = assetAdministrationShells;
41+
return this;
42+
}
43+
/**
44+
* This function takes the values that were set previously via the other functions of this class and turns them into a Java bean.
45+
* @return Bean with specified values
46+
* @throws ConstraintViolationException This exception is thrown, if a validator is used and a violation is found.
47+
*/
48+
49+
final public AssetAdministrationShellEnvironment build() throws ConstraintViolationException {
50+
VocabUtil.getInstance().validate(defaultAssetAdministrationShellEnvironment);
51+
return defaultAssetAdministrationShellEnvironment;
52+
}
53+
}

‎src/main/java/de/fraunhofer/iais/eis/AssetAdministrationShellEnvironmentMixin.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package de.fraunhofer.iais.eis;
2+
3+
import de.fraunhofer.iais.eis.util.*;
4+
import de.fraunhofer.iais.eis.*;
5+
6+
import javax.xml.datatype.XMLGregorianCalendar;
7+
import java.lang.String;
8+
import java.math.BigInteger;
9+
import java.net.URL;
10+
import java.net.URI;
11+
import java.util.Arrays;
12+
import java.util.Collections;
13+
import java.util.HashMap;
14+
import java.util.Iterator;
15+
import java.util.List;
16+
import java.util.Map;
17+
import java.util.Objects;
18+
19+
import com.fasterxml.jackson.annotation.JsonIgnore;
20+
import com.fasterxml.jackson.annotation.JsonTypeName;
21+
import com.fasterxml.jackson.annotation.JsonTypeInfo;
22+
23+
@JsonTypeName("AssetAdministrationShellEnvironment")
24+
@JsonTypeInfo(use=JsonTypeInfo.Id.NAME, property="modelType")
25+
public abstract class AssetAdministrationShellEnvironmentMixin extends DefaultAssetAdministrationShellEnvironment {
26+
27+
}

‎src/main/java/de/fraunhofer/iais/eis/AssetBuilder.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,6 @@ final public AssetBuilder idShort(String idShort) {
107107
this.defaultAsset.idShort = idShort;
108108
return this;
109109
}
110-
111-
112-
/**
113-
* This function allows setting a value for parent
114-
* @param parent desired value to be set
115-
* @return Builder object with new value for parent
116-
*/
117-
final public AssetBuilder parent(URI parent) {
118-
this.defaultAsset.parent = parent;
119-
return this;
120-
}
121110
/**
122111
* This function takes the values that were set previously via the other functions of this class and turns them into a Java bean.
123112
* @return Bean with specified values

‎src/main/java/de/fraunhofer/iais/eis/AssetInformation.java‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
import com.fasterxml.jackson.annotation.JsonIgnore;
2020

2121
/**
22-
* "has Asset Identification Model"
23-
* "In AssetInformation identifying meta data of the asset that is represented by an AAS is defined."@en
24-
* "The asset may either represent an asset type or an asset instance."@en
25-
* "The asset has a globally unique identifier plus - if needed - additional domain specific (proprietary) identifiers. However, to support the corner case of very first phase of lifecycle where a stabilised/constant global asset identifier does not already exist, the corresponding attribute \'globalAssetId\' is optional."@en
22+
* "Asset Information"
23+
* "The asset may either represent an asset type or an asset instance. The asset has a globally unique identifier plus - if needed - additional domain specific (proprietary) identifiers. However, to support the corner case of very first phase of lifecycle where a stabilised/constant global asset identifier does not already exist, the corresponding attribute \'globalAssetId\' is optional."@en
2624
*/
2725
@KnownSubtypes({
2826
@KnownSubtypes.Type(value = DefaultAssetInformation.class)
@@ -55,16 +53,15 @@ public interface AssetInformation {
5553

5654

5755
/**
58-
* "Denotes whether the Asset of of kind \'Type\' or \'Instance\'."@en
56+
* "Denotes whether the Asset of kind \'Type\' or \'Instance\'."@en
5957
* @return Returns the List of AssetKinds for the property assetKinds.
6058
* More information under https://admin-shell.io/aas/3/0/RC01/AssetInformation/assetKind
6159
*/
6260
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetInformation/assetKind")
6361
public List<AssetKind> getAssetKinds();
6462

6563
/**
66-
* "Reference to either an Asset object or a global reference to the asset the AAS is representing."@en
67-
* "This attribute is required as soon as the AAS is exchanged via partners in the life cycle of the asset. In a first phase of the life cycle the asset might not yet have a global id but already an internal identifier. The internal identifier would be modelled via \'externalAssetId\'."@en
64+
* "Reference to either an Asset object or a global reference to the asset the AAS is representing. This attribute is required as soon as the AAS is exchanged via partners in the life cycle of the asset. In a first phase of the life cycle the asset might not yet have a global id but already an internal identifier. The internal identifier would be modelled via \'externalAssetId\'."@en
6865
* "Constraint AASd-023: AssetInformation/globalAssetId either is a reference to an Asset object or a global reference."@en
6966
* @return Returns the Reference for the property globalAssetId.
7067
* More information under https://admin-shell.io/aas/3/0/RC01/AssetInformation/globalAssetId
@@ -73,12 +70,12 @@ public interface AssetInformation {
7370
public Reference getGlobalAssetId();
7471

7572
/**
76-
* "Additional domain specific external, typically proprietary Identifier for the asset like e.g. serial number etc."@en
77-
* @return Returns the List of IdentifierKeyValuePairs for the property externalAssetIds.
78-
* More information under https://admin-shell.io/aas/3/0/RC01/AssetInformation/externalAssetId
73+
* "Additional domain-specific, typically proprietary Identifier for the asset like e.g. serial number etc."@en
74+
* @return Returns the List of IdentifierKeyValuePairs for the property specificAssetIds.
75+
* More information under https://admin-shell.io/aas/3/0/RC01/AssetInformation/specificAssetId
7976
*/
80-
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetInformation/externalAssetId")
81-
public List<IdentifierKeyValuePair> getExternalAssetIds();
77+
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetInformation/specificAssetId")
78+
public List<IdentifierKeyValuePair> getSpecificAssetIds();
8279

8380
/**
8481
* "A reference to a Submodel that defines the bill of material of the asset represented by the AAS. This submodel contains a set of entities describing the material used to compose the composite I4.0 Component."@en
@@ -90,10 +87,10 @@ public interface AssetInformation {
9087

9188
/**
9289
* "Thumbnail of the asset represented by the asset administration shell."@en
93-
* @return Returns the File for the property thumbnail.
94-
* More information under https://admin-shell.io/aas/3/0/RC01/AssetInformation/thumbnail
90+
* @return Returns the File for the property defaultThumbnail.
91+
* More information under https://admin-shell.io/aas/3/0/RC01/AssetInformation/defaultThumbnail
9592
*/
96-
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetInformation/thumbnail")
97-
public File getThumbnail();
93+
@IRI("https://admin-shell.io/aas/3/0/RC01/AssetInformation/defaultThumbnail")
94+
public File getDefaultThumbnail();
9895

9996
}

‎src/main/java/de/fraunhofer/iais/eis/AssetInformationBuilder.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ final public AssetInformationBuilder globalAssetId(Reference globalAssetId) {
5454

5555

5656
/**
57-
* This function allows setting a value for externalAssetIds
58-
* @param externalAssetIds desired value to be set
59-
* @return Builder object with new value for externalAssetIds
57+
* This function allows setting a value for specificAssetIds
58+
* @param specificAssetIds desired value to be set
59+
* @return Builder object with new value for specificAssetIds
6060
*/
61-
final public AssetInformationBuilder externalAssetIds(List<IdentifierKeyValuePair> externalAssetIds) {
62-
this.defaultAssetInformation.externalAssetIds = externalAssetIds;
61+
final public AssetInformationBuilder specificAssetIds(List<IdentifierKeyValuePair> specificAssetIds) {
62+
this.defaultAssetInformation.specificAssetIds = specificAssetIds;
6363
return this;
6464
}
6565

@@ -76,12 +76,12 @@ final public AssetInformationBuilder billOfMaterials(List<Submodel> billOfMateri
7676

7777

7878
/**
79-
* This function allows setting a value for thumbnail
80-
* @param thumbnail desired value to be set
81-
* @return Builder object with new value for thumbnail
79+
* This function allows setting a value for defaultThumbnail
80+
* @param defaultThumbnail desired value to be set
81+
* @return Builder object with new value for defaultThumbnail
8282
*/
83-
final public AssetInformationBuilder thumbnail(File thumbnail) {
84-
this.defaultAssetInformation.thumbnail = thumbnail;
83+
final public AssetInformationBuilder defaultThumbnail(File defaultThumbnail) {
84+
this.defaultAssetInformation.defaultThumbnail = defaultThumbnail;
8585
return this;
8686
}
8787
/**

0 commit comments

Comments
 (0)