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.

Sign up for GitHub

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

Fix setter names for Java builder classes #473

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Fix setter names for Java builder classes #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion aas_core_codegen/java/generation/_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def _generate_builder(

arg_name = java_naming.argument_name(arg.name)

setter_name = java_naming.setter_name(arg_name)
setter_name = java_naming.setter_name(arg.name)

setter_blocks.append(
Stripped(
Expand Down
4 changes: 2 additions & 2 deletions ...st_main/aas_core_meta.v3/expected_output/generation/AdministrativeInformationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class AdministrativeInformationBuilder {
*/
private String templateId;

public AdministrativeInformationBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public AdministrativeInformationBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}
Expand All @@ -65,7 +65,7 @@ public AdministrativeInformationBuilder setCreator(IReference creator) {
return this;
}

public AdministrativeInformationBuilder setTemplateid(String templateId) {
public AdministrativeInformationBuilder setTemplateId(String templateId) {
this.templateId = templateId;
return this;
}
Expand Down
10 changes: 5 additions & 5 deletions ...main/aas_core_meta.v3/expected_output/generation/AnnotatedRelationshipElementBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ public AnnotatedRelationshipElementBuilder setCategory(String category) {
return this;
}

public AnnotatedRelationshipElementBuilder setIdshort(String idShort) {
public AnnotatedRelationshipElementBuilder setIdShort(String idShort) {
this.idShort = idShort;
return this;
}

public AnnotatedRelationshipElementBuilder setDisplayname(List<ILangStringNameType> displayName) {
public AnnotatedRelationshipElementBuilder setDisplayName(List<ILangStringNameType> displayName) {
this.displayName = displayName;
return this;
}
Expand All @@ -146,12 +146,12 @@ public AnnotatedRelationshipElementBuilder setDescription(List<ILangStringTextTy
return this;
}

public AnnotatedRelationshipElementBuilder setSemanticid(IReference semanticId) {
public AnnotatedRelationshipElementBuilder setSemanticId(IReference semanticId) {
this.semanticId = semanticId;
return this;
}

public AnnotatedRelationshipElementBuilder setSupplementalsemanticids(List<IReference> supplementalSemanticIds) {
public AnnotatedRelationshipElementBuilder setSupplementalSemanticIds(List<IReference> supplementalSemanticIds) {
this.supplementalSemanticIds = supplementalSemanticIds;
return this;
}
Expand All @@ -161,7 +161,7 @@ public AnnotatedRelationshipElementBuilder setQualifiers(List<IQualifier> qualif
return this;
}

public AnnotatedRelationshipElementBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public AnnotatedRelationshipElementBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}
Expand Down
8 changes: 4 additions & 4 deletions ...est_main/aas_core_meta.v3/expected_output/generation/AssetAdministrationShellBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ public AssetAdministrationShellBuilder setCategory(String category) {
return this;
}

public AssetAdministrationShellBuilder setIdshort(String idShort) {
public AssetAdministrationShellBuilder setIdShort(String idShort) {
this.idShort = idShort;
return this;
}

public AssetAdministrationShellBuilder setDisplayname(List<ILangStringNameType> displayName) {
public AssetAdministrationShellBuilder setDisplayName(List<ILangStringNameType> displayName) {
this.displayName = displayName;
return this;
}
Expand All @@ -140,12 +140,12 @@ public AssetAdministrationShellBuilder setAdministration(IAdministrativeInformat
return this;
}

public AssetAdministrationShellBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public AssetAdministrationShellBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}

public AssetAdministrationShellBuilder setDerivedfrom(IReference derivedFrom) {
public AssetAdministrationShellBuilder setDerivedFrom(IReference derivedFrom) {
this.derivedFrom = derivedFrom;
return this;
}
Expand Down
8 changes: 4 additions & 4 deletions ...a/java/test_main/aas_core_meta.v3/expected_output/generation/AssetInformationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@ public AssetInformationBuilder(AssetKind assetKind) {
"Argument \"assetKind\" must be non-null.");
}

public AssetInformationBuilder setGlobalassetid(String globalAssetId) {
public AssetInformationBuilder setGlobalAssetId(String globalAssetId) {
this.globalAssetId = globalAssetId;
return this;
}

public AssetInformationBuilder setSpecificassetids(List<ISpecificAssetId> specificAssetIds) {
public AssetInformationBuilder setSpecificAssetIds(List<ISpecificAssetId> specificAssetIds) {
this.specificAssetIds = specificAssetIds;
return this;
}

public AssetInformationBuilder setAssettype(String assetType) {
public AssetInformationBuilder setAssetType(String assetType) {
this.assetType = assetType;
return this;
}

public AssetInformationBuilder setDefaultthumbnail(IResource defaultThumbnail) {
public AssetInformationBuilder setDefaultThumbnail(IResource defaultThumbnail) {
this.defaultThumbnail = defaultThumbnail;
return this;
}
Expand Down
20 changes: 10 additions & 10 deletions .../java/test_main/aas_core_meta.v3/expected_output/generation/BasicEventElementBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ public BasicEventElementBuilder setCategory(String category) {
return this;
}

public BasicEventElementBuilder setIdshort(String idShort) {
public BasicEventElementBuilder setIdShort(String idShort) {
this.idShort = idShort;
return this;
}

public BasicEventElementBuilder setDisplayname(List<ILangStringNameType> displayName) {
public BasicEventElementBuilder setDisplayName(List<ILangStringNameType> displayName) {
this.displayName = displayName;
return this;
}
Expand All @@ -204,12 +204,12 @@ public BasicEventElementBuilder setDescription(List<ILangStringTextType> descrip
return this;
}

public BasicEventElementBuilder setSemanticid(IReference semanticId) {
public BasicEventElementBuilder setSemanticId(IReference semanticId) {
this.semanticId = semanticId;
return this;
}

public BasicEventElementBuilder setSupplementalsemanticids(List<IReference> supplementalSemanticIds) {
public BasicEventElementBuilder setSupplementalSemanticIds(List<IReference> supplementalSemanticIds) {
this.supplementalSemanticIds = supplementalSemanticIds;
return this;
}
Expand All @@ -219,32 +219,32 @@ public BasicEventElementBuilder setQualifiers(List<IQualifier> qualifiers) {
return this;
}

public BasicEventElementBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public BasicEventElementBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}

public BasicEventElementBuilder setMessagetopic(String messageTopic) {
public BasicEventElementBuilder setMessageTopic(String messageTopic) {
this.messageTopic = messageTopic;
return this;
}

public BasicEventElementBuilder setMessagebroker(IReference messageBroker) {
public BasicEventElementBuilder setMessageBroker(IReference messageBroker) {
this.messageBroker = messageBroker;
return this;
}

public BasicEventElementBuilder setLastupdate(String lastUpdate) {
public BasicEventElementBuilder setLastUpdate(String lastUpdate) {
this.lastUpdate = lastUpdate;
return this;
}

public BasicEventElementBuilder setMininterval(String minInterval) {
public BasicEventElementBuilder setMinInterval(String minInterval) {
this.minInterval = minInterval;
return this;
}

public BasicEventElementBuilder setMaxinterval(String maxInterval) {
public BasicEventElementBuilder setMaxInterval(String maxInterval) {
this.maxInterval = maxInterval;
return this;
}
Expand Down
10 changes: 5 additions & 5 deletions test_data/java/test_main/aas_core_meta.v3/expected_output/generation/BlobBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ public BlobBuilder setCategory(String category) {
return this;
}

public BlobBuilder setIdshort(String idShort) {
public BlobBuilder setIdShort(String idShort) {
this.idShort = idShort;
return this;
}

public BlobBuilder setDisplayname(List<ILangStringNameType> displayName) {
public BlobBuilder setDisplayName(List<ILangStringNameType> displayName) {
this.displayName = displayName;
return this;
}
Expand All @@ -145,12 +145,12 @@ public BlobBuilder setDescription(List<ILangStringTextType> description) {
return this;
}

public BlobBuilder setSemanticid(IReference semanticId) {
public BlobBuilder setSemanticId(IReference semanticId) {
this.semanticId = semanticId;
return this;
}

public BlobBuilder setSupplementalsemanticids(List<IReference> supplementalSemanticIds) {
public BlobBuilder setSupplementalSemanticIds(List<IReference> supplementalSemanticIds) {
this.supplementalSemanticIds = supplementalSemanticIds;
return this;
}
Expand All @@ -160,7 +160,7 @@ public BlobBuilder setQualifiers(List<IQualifier> qualifiers) {
return this;
}

public BlobBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public BlobBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}
Expand Down
10 changes: 5 additions & 5 deletions test_data/java/test_main/aas_core_meta.v3/expected_output/generation/CapabilityBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ public CapabilityBuilder setCategory(String category) {
return this;
}

public CapabilityBuilder setIdshort(String idShort) {
public CapabilityBuilder setIdShort(String idShort) {
this.idShort = idShort;
return this;
}

public CapabilityBuilder setDisplayname(List<ILangStringNameType> displayName) {
public CapabilityBuilder setDisplayName(List<ILangStringNameType> displayName) {
this.displayName = displayName;
return this;
}
Expand All @@ -119,12 +119,12 @@ public CapabilityBuilder setDescription(List<ILangStringTextType> description) {
return this;
}

public CapabilityBuilder setSemanticid(IReference semanticId) {
public CapabilityBuilder setSemanticId(IReference semanticId) {
this.semanticId = semanticId;
return this;
}

public CapabilityBuilder setSupplementalsemanticids(List<IReference> supplementalSemanticIds) {
public CapabilityBuilder setSupplementalSemanticIds(List<IReference> supplementalSemanticIds) {
this.supplementalSemanticIds = supplementalSemanticIds;
return this;
}
Expand All @@ -134,7 +134,7 @@ public CapabilityBuilder setQualifiers(List<IQualifier> qualifiers) {
return this;
}

public CapabilityBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public CapabilityBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}
Expand Down
8 changes: 4 additions & 4 deletions ...java/test_main/aas_core_meta.v3/expected_output/generation/ConceptDescriptionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ public ConceptDescriptionBuilder setCategory(String category) {
return this;
}

public ConceptDescriptionBuilder setIdshort(String idShort) {
public ConceptDescriptionBuilder setIdShort(String idShort) {
this.idShort = idShort;
return this;
}

public ConceptDescriptionBuilder setDisplayname(List<ILangStringNameType> displayName) {
public ConceptDescriptionBuilder setDisplayName(List<ILangStringNameType> displayName) {
this.displayName = displayName;
return this;
}
Expand All @@ -124,12 +124,12 @@ public ConceptDescriptionBuilder setAdministration(IAdministrativeInformation ad
return this;
}

public ConceptDescriptionBuilder setEmbeddeddataspecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
public ConceptDescriptionBuilder setEmbeddedDataSpecifications(List<IEmbeddedDataSpecification> embeddedDataSpecifications) {
this.embeddedDataSpecifications = embeddedDataSpecifications;
return this;
}

public ConceptDescriptionBuilder setIscaseof(List<IReference> isCaseOf) {
public ConceptDescriptionBuilder setIsCaseOf(List<IReference> isCaseOf) {
this.isCaseOf = isCaseOf;
return this;
}
Expand Down
14 changes: 7 additions & 7 deletions ...st_main/aas_core_meta.v3/expected_output/generation/DataSpecificationIec61360Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public DataSpecificationIec61360Builder(List<ILangStringPreferredNameTypeIec6136
"Argument \"preferredName\" must be non-null.");
}

public DataSpecificationIec61360Builder setShortname(List<ILangStringShortNameTypeIec61360> shortName) {
public DataSpecificationIec61360Builder setShortName(List<ILangStringShortNameTypeIec61360> shortName) {
this.shortName = shortName;
return this;
}
Expand All @@ -103,12 +103,12 @@ public DataSpecificationIec61360Builder setUnit(String unit) {
return this;
}

public DataSpecificationIec61360Builder setUnitid(IReference unitId) {
public DataSpecificationIec61360Builder setUnitId(IReference unitId) {
this.unitId = unitId;
return this;
}

public DataSpecificationIec61360Builder setSourceofdefinition(String sourceOfDefinition) {
public DataSpecificationIec61360Builder setSourceOfDefinition(String sourceOfDefinition) {
this.sourceOfDefinition = sourceOfDefinition;
return this;
}
Expand All @@ -118,7 +118,7 @@ public DataSpecificationIec61360Builder setSymbol(String symbol) {
return this;
}

public DataSpecificationIec61360Builder setDatatype(DataTypeIec61360 dataType) {
public DataSpecificationIec61360Builder setDataType(DataTypeIec61360 dataType) {
this.dataType = dataType;
return this;
}
Expand All @@ -128,12 +128,12 @@ public DataSpecificationIec61360Builder setDefinition(List<ILangStringDefinition
return this;
}

public DataSpecificationIec61360Builder setValueformat(String valueFormat) {
public DataSpecificationIec61360Builder setValueFormat(String valueFormat) {
this.valueFormat = valueFormat;
return this;
}

public DataSpecificationIec61360Builder setValuelist(IValueList valueList) {
public DataSpecificationIec61360Builder setValueList(IValueList valueList) {
this.valueList = valueList;
return this;
}
Expand All @@ -143,7 +143,7 @@ public DataSpecificationIec61360Builder setValue(String value) {
return this;
}

public DataSpecificationIec61360Builder setLeveltype(ILevelType levelType) {
public DataSpecificationIec61360Builder setLevelType(ILevelType levelType) {
this.levelType = levelType;
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion ...st_main/aas_core_meta.v3/expected_output/generation/EmbeddedDataSpecificationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public EmbeddedDataSpecificationBuilder(IDataSpecificationContent dataSpecificat
"Argument \"dataSpecificationContent\" must be non-null.");
}

public EmbeddedDataSpecificationBuilder setDataspecification(IReference dataSpecification) {
public EmbeddedDataSpecificationBuilder setDataSpecification(IReference dataSpecification) {
this.dataSpecification = dataSpecification;
return this;
}
Expand Down
Loading
Loading