Skip to content
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

add metamodel and api classes after latest run #3

Draft
wants to merge 1 commit into
base: generated-v3-classes-and-tostring
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ public static AssetAdministrationShellDescriptor createAasDescriptor() {
.administration(TestDataHelper.DEFAULT_ADMINISTRATIVE_INFORMATION)
.description(TestDataHelper.DEFAULT_DESCRIPTION)
.displayName(TestDataHelper.DEFAULT_DISPLAY_NAME)
.identification(TestDataHelper.DEFAULT_IDENTIFICATION)
.id(TestDataHelper.DEFAULT_IDENTIFICATION)
.idShort(TestDataHelper.DEFAULT_ID_SHORT)
.specificAssetId(specificAssetId)
.specificAssetIds(specificAssetId)
.endpoints(List.of(TestDataHelper.createEndpointBuilder().build()))
.globalAssetId(TestDataHelper.createReference(ReferenceTypes.MODEL_REFERENCE, KeyTypes.ASSET_ADMINISTRATION_SHELL, "defaultGlobalAssetId"))
.submodelDescriptor(List.of(JsonSubmodelDescriptorDeserializerTest.getDefaultSubmodelDescriptor())).build();
.globalAssetId("defaultGlobalAssetId")
.submodelDescriptors(List.of(JsonSubmodelDescriptorDeserializerTest.getDefaultSubmodelDescriptor())).build();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static DefaultEndpoint.Builder createEndpointBuilder() {

return new DefaultEndpoint.Builder()
.protocolInformation(createProtocolInformationBuilder().build())
.withInterface(DEFAULT_INTERFACE_VALUE);
._interface(DEFAULT_INTERFACE_VALUE);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old version seems better to me.

}

public static Key createKey(KeyTypes type, String value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@


import org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,19 @@

import org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;
import org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
* Strings with language tags
*/
@KnownSubtypes({
@KnownSubtypes.Type(value = LangStringTextType.class),
@KnownSubtypes.Type(value = LangStringNameType.class),
@KnownSubtypes.Type(value = LangStringPreferredNameTypeIec61360.class),
@KnownSubtypes.Type(value = LangStringShortNameTypeIec61360.class),
@KnownSubtypes.Type(value = LangStringDefinitionTypeIec61360.class),
@KnownSubtypes.Type(value = LangStringNameType.class),
@KnownSubtypes.Type(value = LangStringTextType.class)
@KnownSubtypes.Type(value = LangStringDefinitionTypeIec61360.class)
})
public interface AbstractLangString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
package org.eclipse.digitaltwin.aas4j.v3.model;



import org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;
import org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAdministrativeInformation;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@

package org.eclipse.digitaltwin.aas4j.v3.model;

import java.util.List;


import org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;
import org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAnnotatedRelationshipElement;

import java.util.List;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
* Copyright (c) 2023, SAP SE or an SAP affiliate company
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/

package org.eclipse.digitaltwin.aas4j.v3.model;



import org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
*/
@KnownSubtypes({
@KnownSubtypes.Type(value = DefaultAnnotatedRelationshipElementMetadata.class)
})
public interface AnnotatedRelationshipElementMetadata extends SubmodelElementAttributes {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Copyright (c) 2021 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e. V.
* Copyright (c) 2023, SAP SE or an SAP affiliate company
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/

package org.eclipse.digitaltwin.aas4j.v3.model;

import java.util.List;


import org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;
import org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
*/
@KnownSubtypes({
@KnownSubtypes.Type(value = DefaultAnnotatedRelationshipElementValue.class)
})
public interface AnnotatedRelationshipElementValue {

/**
*
* More information under https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/first
*
* @return Returns the ReferenceValue for the property first.
*/
@IRI("https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/first")
ReferenceValue getFirst();

/**
*
* More information under https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/first
*
* @param first desired value for the property first.
*/
void setFirst(ReferenceValue first);

/**
*
* More information under https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/second
*
* @return Returns the ReferenceValue for the property second.
*/
@IRI("https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/second")
ReferenceValue getSecond();

/**
*
* More information under https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/second
*
* @param second desired value for the property second.
*/
void setSecond(ReferenceValue second);

/**
*
* More information under
* https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/annotation
*
* @return Returns the List of Strings for the property annotation.
*/
@IRI("https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/annotation")
List<String> getAnnotation();

/**
*
* More information under
* https://admin-shell.io/aas/3/0/AnnotatedRelationshipElementValue/annotation
*
* @param annotations desired value for the property annotation.
*/
void setAnnotation(List<String> annotations);

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@

package org.eclipse.digitaltwin.aas4j.v3.model;

import java.util.List;


import org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;
import org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultAssetAdministrationShell;

import java.util.List;
import org.eclipse.digitaltwin.aas4j.v3.model.builder.*;
import org.eclipse.digitaltwin.aas4j.v3.model.impl.*;


/**
Expand All @@ -28,7 +30,7 @@
@KnownSubtypes({
@KnownSubtypes.Type(value = DefaultAssetAdministrationShell.class)
})
public interface AssetAdministrationShell extends HasDataSpecification, Identifiable {
public interface AssetAdministrationShell extends Identifiable, HasDataSpecification {

/**
* The reference to the AAS the AAS was derived from.
Expand Down
Loading