Skip to content

Commit

Permalink
fix(plc4j/enums): String comparison when evaluating enums
Browse files Browse the repository at this point in the history
  • Loading branch information
@hutcheb
hutcheb committed Jan 18, 2023
1 parent d465153 commit 3b84d5d
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 38 deletions.
12 changes: 12 additions & 0 deletions code-generation/language-java/src/main/resources/templates/java/enum-template.java.ftlh
View file
Expand Up @@ -129,19 +129,31 @@ public enum ${type.name} {

public static ${type.name} firstEnumForField${constantName?cap_first}(${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true)} fieldValue) {
for (${type.name} _val : ${type.name}.values()) {
<#if type.name == "String" || helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true) == "String">
if(_val.get${constantName?cap_first}().equals(fieldValue)) {
return _val;
}
<#else>
if(_val.get${constantName?cap_first}() == fieldValue) {
return _val;
}
</#if>
}
return null;
}

public static List<${type.name}> enumsForField${constantName?cap_first}(${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true)} fieldValue) {
List<${type.name}> _values = new ArrayList();
for (${type.name} _val : ${type.name}.values()) {
<#if type.name == "String" || helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true) == "String">
if(_val.get${constantName?cap_first}().equals(fieldValue)) {
_values.add(_val);
}
<#else>
if(_val.get${constantName?cap_first}() == fieldValue) {
_values.add(_val);
}
</#if>
}
return _values;
}
Expand Down
4 changes: 2 additions & 2 deletions ...rs/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java
View file
Expand Up @@ -1660,7 +1660,7 @@ public String getVendorName() {

public static BACnetVendorId firstEnumForFieldVendorName(String fieldValue) {
for (BACnetVendorId _val : BACnetVendorId.values()) {
if (_val.getVendorName() == fieldValue) {
if (_val.getVendorName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -1670,7 +1670,7 @@ public static BACnetVendorId firstEnumForFieldVendorName(String fieldValue) {
public static List<BACnetVendorId> enumsForFieldVendorName(String fieldValue) {
List<BACnetVendorId> _values = new ArrayList();
for (BACnetVendorId _val : BACnetVendorId.values()) {
if (_val.getVendorName() == fieldValue) {
if (_val.getVendorName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
12 changes: 6 additions & 6 deletions plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/Parameter.java
View file
Expand Up @@ -2141,7 +2141,7 @@ public String getForm() {

public static Parameter firstEnumForFieldForm(String fieldValue) {
for (Parameter _val : Parameter.values()) {
if (_val.getForm() == fieldValue) {
if (_val.getForm().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -2151,7 +2151,7 @@ public static Parameter firstEnumForFieldForm(String fieldValue) {
public static List<Parameter> enumsForFieldForm(String fieldValue) {
List<Parameter> _values = new ArrayList();
for (Parameter _val : Parameter.values()) {
if (_val.getForm() == fieldValue) {
if (_val.getForm().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down Expand Up @@ -2187,7 +2187,7 @@ public String getParameterDescription() {

public static Parameter firstEnumForFieldParameterDescription(String fieldValue) {
for (Parameter _val : Parameter.values()) {
if (_val.getParameterDescription() == fieldValue) {
if (_val.getParameterDescription().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -2197,7 +2197,7 @@ public static Parameter firstEnumForFieldParameterDescription(String fieldValue)
public static List<Parameter> enumsForFieldParameterDescription(String fieldValue) {
List<Parameter> _values = new ArrayList();
for (Parameter _val : Parameter.values()) {
if (_val.getParameterDescription() == fieldValue) {
if (_val.getParameterDescription().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down Expand Up @@ -2233,7 +2233,7 @@ public String getGroup() {

public static Parameter firstEnumForFieldGroup(String fieldValue) {
for (Parameter _val : Parameter.values()) {
if (_val.getGroup() == fieldValue) {
if (_val.getGroup().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -2243,7 +2243,7 @@ public static Parameter firstEnumForFieldGroup(String fieldValue) {
public static List<Parameter> enumsForFieldGroup(String fieldValue) {
List<Parameter> _values = new ArrayList();
for (Parameter _val : Parameter.values()) {
if (_val.getGroup() == fieldValue) {
if (_val.getGroup().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...rivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ProtectionLevel.java
View file
Expand Up @@ -57,7 +57,7 @@ public String getDescription() {

public static ProtectionLevel firstEnumForFieldDescription(String fieldValue) {
for (ProtectionLevel _val : ProtectionLevel.values()) {
if (_val.getDescription() == fieldValue) {
if (_val.getDescription().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -67,7 +67,7 @@ public static ProtectionLevel firstEnumForFieldDescription(String fieldValue) {
public static List<ProtectionLevel> enumsForFieldDescription(String fieldValue) {
List<ProtectionLevel> _values = new ArrayList();
for (ProtectionLevel _val : ProtectionLevel.values()) {
if (_val.getDescription() == fieldValue) {
if (_val.getDescription().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/GenericCANDataType.java
View file
Expand Up @@ -75,7 +75,7 @@ public String getPlcValueName() {

public static GenericCANDataType firstEnumForFieldPlcValueName(String fieldValue) {
for (GenericCANDataType _val : GenericCANDataType.values()) {
if (_val.getPlcValueName() == fieldValue) {
if (_val.getPlcValueName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -85,7 +85,7 @@ public static GenericCANDataType firstEnumForFieldPlcValueName(String fieldValue
public static List<GenericCANDataType> enumsForFieldPlcValueName(String fieldValue) {
List<GenericCANDataType> _values = new ArrayList();
for (GenericCANDataType _val : GenericCANDataType.values()) {
if (_val.getPlcValueName() == fieldValue) {
if (_val.getPlcValueName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenDataType.java
View file
Expand Up @@ -80,7 +80,7 @@ public String getPlcValueName() {

public static CANOpenDataType firstEnumForFieldPlcValueName(String fieldValue) {
for (CANOpenDataType _val : CANOpenDataType.values()) {
if (_val.getPlcValueName() == fieldValue) {
if (_val.getPlcValueName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -90,7 +90,7 @@ public static CANOpenDataType firstEnumForFieldPlcValueName(String fieldValue) {
public static List<CANOpenDataType> enumsForFieldPlcValueName(String fieldValue) {
List<CANOpenDataType> _values = new ArrayList();
for (CANOpenDataType _val : CANOpenDataType.values()) {
if (_val.getPlcValueName() == fieldValue) {
if (_val.getPlcValueName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/AccessLevel.java
View file
Expand Up @@ -60,7 +60,7 @@ public String getPurpose() {

public static AccessLevel firstEnumForFieldPurpose(String fieldValue) {
for (AccessLevel _val : AccessLevel.values()) {
if (_val.getPurpose() == fieldValue) {
if (_val.getPurpose().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -70,7 +70,7 @@ public static AccessLevel firstEnumForFieldPurpose(String fieldValue) {
public static List<AccessLevel> enumsForFieldPurpose(String fieldValue) {
List<AccessLevel> _values = new ArrayList();
for (AccessLevel _val : AccessLevel.values()) {
if (_val.getPurpose() == fieldValue) {
if (_val.getPurpose().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...tip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointMainType.java
View file
Expand Up @@ -149,7 +149,7 @@ public String getName() {

public static KnxDatapointMainType firstEnumForFieldName(String fieldValue) {
for (KnxDatapointMainType _val : KnxDatapointMainType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -159,7 +159,7 @@ public static KnxDatapointMainType firstEnumForFieldName(String fieldValue) {
public static List<KnxDatapointMainType> enumsForFieldName(String fieldValue) {
List<KnxDatapointMainType> _values = new ArrayList();
for (KnxDatapointMainType _val : KnxDatapointMainType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...nxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapointType.java
View file
Expand Up @@ -1207,7 +1207,7 @@ public String getName() {

public static KnxDatapointType firstEnumForFieldName(String fieldValue) {
for (KnxDatapointType _val : KnxDatapointType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -1217,7 +1217,7 @@ public static KnxDatapointType firstEnumForFieldName(String fieldValue) {
public static List<KnxDatapointType> enumsForFieldName(String fieldValue) {
List<KnxDatapointType> _values = new ArrayList();
for (KnxDatapointType _val : KnxDatapointType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectProperty.java
View file
Expand Up @@ -1385,7 +1385,7 @@ public String getName() {

public static KnxInterfaceObjectProperty firstEnumForFieldName(String fieldValue) {
for (KnxInterfaceObjectProperty _val : KnxInterfaceObjectProperty.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -1395,7 +1395,7 @@ public static KnxInterfaceObjectProperty firstEnumForFieldName(String fieldValue
public static List<KnxInterfaceObjectProperty> enumsForFieldName(String fieldValue) {
List<KnxInterfaceObjectProperty> _values = new ArrayList();
for (KnxInterfaceObjectProperty _val : KnxInterfaceObjectProperty.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...p/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxInterfaceObjectType.java
View file
Expand Up @@ -82,7 +82,7 @@ public String getCode() {

public static KnxInterfaceObjectType firstEnumForFieldCode(String fieldValue) {
for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
if (_val.getCode() == fieldValue) {
if (_val.getCode().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -92,7 +92,7 @@ public static KnxInterfaceObjectType firstEnumForFieldCode(String fieldValue) {
public static List<KnxInterfaceObjectType> enumsForFieldCode(String fieldValue) {
List<KnxInterfaceObjectType> _values = new ArrayList();
for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
if (_val.getCode() == fieldValue) {
if (_val.getCode().equals(fieldValue)) {
_values.add(_val);
}
}
Expand All @@ -105,7 +105,7 @@ public String getName() {

public static KnxInterfaceObjectType firstEnumForFieldName(String fieldValue) {
for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -115,7 +115,7 @@ public static KnxInterfaceObjectType firstEnumForFieldName(String fieldValue) {
public static List<KnxInterfaceObjectType> enumsForFieldName(String fieldValue) {
List<KnxInterfaceObjectType> _values = new ArrayList();
for (KnxInterfaceObjectType _val : KnxInterfaceObjectType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
View file
Expand Up @@ -757,7 +757,7 @@ public String getName() {

public static KnxManufacturer firstEnumForFieldName(String fieldValue) {
for (KnxManufacturer _val : KnxManufacturer.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -767,7 +767,7 @@ public static KnxManufacturer firstEnumForFieldName(String fieldValue) {
public static List<KnxManufacturer> enumsForFieldName(String fieldValue) {
List<KnxManufacturer> _values = new ArrayList();
for (KnxManufacturer _val : KnxManufacturer.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...etip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxPropertyDataType.java
View file
Expand Up @@ -153,7 +153,7 @@ public String getName() {

public static KnxPropertyDataType firstEnumForFieldName(String fieldValue) {
for (KnxPropertyDataType _val : KnxPropertyDataType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -163,7 +163,7 @@ public static KnxPropertyDataType firstEnumForFieldName(String fieldValue) {
public static List<KnxPropertyDataType> enumsForFieldName(String fieldValue) {
List<KnxPropertyDataType> _values = new ArrayList();
for (KnxPropertyDataType _val : KnxPropertyDataType.values()) {
if (_val.getName() == fieldValue) {
if (_val.getName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...p/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/SupportedPhysicalMedia.java
View file
Expand Up @@ -105,7 +105,7 @@ public String getDescription() {

public static SupportedPhysicalMedia firstEnumForFieldDescription(String fieldValue) {
for (SupportedPhysicalMedia _val : SupportedPhysicalMedia.values()) {
if (_val.getDescription() == fieldValue) {
if (_val.getDescription().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -115,7 +115,7 @@ public static SupportedPhysicalMedia firstEnumForFieldDescription(String fieldVa
public static List<SupportedPhysicalMedia> enumsForFieldDescription(String fieldValue) {
List<SupportedPhysicalMedia> _values = new ArrayList();
for (SupportedPhysicalMedia _val : SupportedPhysicalMedia.values()) {
if (_val.getDescription() == fieldValue) {
if (_val.getDescription().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...finet/src/main/generated/org/apache/plc4x/java/profinet/readwrite/VirtualLanPriority.java
View file
Expand Up @@ -61,7 +61,7 @@ public String getAcronym() {

public static VirtualLanPriority firstEnumForFieldAcronym(String fieldValue) {
for (VirtualLanPriority _val : VirtualLanPriority.values()) {
if (_val.getAcronym() == fieldValue) {
if (_val.getAcronym().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -71,7 +71,7 @@ public static VirtualLanPriority firstEnumForFieldAcronym(String fieldValue) {
public static List<VirtualLanPriority> enumsForFieldAcronym(String fieldValue) {
List<VirtualLanPriority> _values = new ArrayList();
for (VirtualLanPriority _val : VirtualLanPriority.values()) {
if (_val.getAcronym() == fieldValue) {
if (_val.getAcronym().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java
View file
Expand Up @@ -62,7 +62,7 @@ public String getShortName() {

public static MemoryArea firstEnumForFieldShortName(String fieldValue) {
for (MemoryArea _val : MemoryArea.values()) {
if (_val.getShortName() == fieldValue) {
if (_val.getShortName().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -72,7 +72,7 @@ public static MemoryArea firstEnumForFieldShortName(String fieldValue) {
public static List<MemoryArea> enumsForFieldShortName(String fieldValue) {
List<MemoryArea> _values = new ArrayList();
for (MemoryArea _val : MemoryArea.values()) {
if (_val.getShortName() == fieldValue) {
if (_val.getShortName().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down
4 changes: 2 additions & 2 deletions plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java
View file
Expand Up @@ -630,7 +630,7 @@ public String getDataProtocolId() {

public static TransportSize firstEnumForFieldDataProtocolId(String fieldValue) {
for (TransportSize _val : TransportSize.values()) {
if (_val.getDataProtocolId() == fieldValue) {
if (_val.getDataProtocolId().equals(fieldValue)) {
return _val;
}
}
Expand All @@ -640,7 +640,7 @@ public static TransportSize firstEnumForFieldDataProtocolId(String fieldValue) {
public static List<TransportSize> enumsForFieldDataProtocolId(String fieldValue) {
List<TransportSize> _values = new ArrayList();
for (TransportSize _val : TransportSize.values()) {
if (_val.getDataProtocolId() == fieldValue) {
if (_val.getDataProtocolId().equals(fieldValue)) {
_values.add(_val);
}
}
Expand Down

0 comments on commit 3b84d5d

Please sign in to comment.