Skip to content

Commit 0feee55

Browse files
sruehlsruehl
committed
refactor(plc4j): fixed some Q/A issues
1 parent 724c043 commit 0feee55

File tree

111 files changed

+1097
-1227
lines changed

Some content is hidden

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

111 files changed

+1097
-1227
lines changed

‎code-generation/language-java/src/main/resources/templates/java/enum-template.java.ftlh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public enum ${type.name} {
143143
}
144144

145145
public static List<${type.name}> enumsForField${constantName?cap_first}(${helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true)} fieldValue) {
146-
List<${type.name}> _values = new ArrayList();
146+
List<${type.name}> _values = new ArrayList<>();
147147
for (${type.name} _val : ${type.name}.values()) {
148148
<#if type.name == "String" || helper.getLanguageTypeNameForTypeReference(type.getConstantType(constantName), true) == "String">
149149
if(_val.get${constantName?cap_first}().equals(fieldValue)) {

‎code-generation/protocol-base-mspec/src/test/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringParserTest.java‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -76,32 +76,28 @@ void parseDoubleCast() {
7676
"S7ParameterUserData"
7777
);
7878
},
79-
items -> {
80-
assertVariableLiteral(
81-
items,
82-
"items",
83-
hurzes -> {
84-
assertThat(hurzes, hasSize(1));
85-
assertVariableLiteral(
86-
hurzes.get(0),
87-
"hurz"
88-
);
89-
},
90-
null,
91-
0
92-
);
93-
});
79+
items -> assertVariableLiteral(
80+
items,
81+
"items",
82+
hurzes -> {
83+
assertThat(hurzes, hasSize(1));
84+
assertVariableLiteral(
85+
hurzes.get(0),
86+
"hurz"
87+
);
88+
},
89+
null,
90+
0
91+
));
9492
assertVariableLiteral(
9593
outerCast.get(1),
9694
"S7ParameterUserDataItemCPUFunctions"
9795
);
9896
},
99-
variableLiteral -> {
100-
assertVariableLiteral(
101-
variableLiteral,
102-
"cpuFunctionType"
103-
);
104-
}
97+
variableLiteral -> assertVariableLiteral(
98+
variableLiteral,
99+
"cpuFunctionType"
100+
)
105101
);
106102
}
107103

@@ -122,21 +118,19 @@ void parseCast() {
122118
"S7ParameterUserData"
123119
);
124120
},
125-
variableLiteral -> {
126-
assertVariableLiteral(
127-
variableLiteral,
128-
"items",
129-
terms -> {
130-
assertThat(terms, hasSize(1));
131-
assertVariableLiteral(
132-
terms.get(0),
133-
"hurz"
134-
);
135-
},
136-
null,
137-
0
138-
);
139-
}
121+
variableLiteral -> assertVariableLiteral(
122+
variableLiteral,
123+
"items",
124+
terms -> {
125+
assertThat(terms, hasSize(1));
126+
assertVariableLiteral(
127+
terms.get(0),
128+
"hurz"
129+
);
130+
},
131+
null,
132+
0
133+
)
140134
);
141135
}
142136

‎code-generation/protocol-base-mspec/src/test/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParserTest.java‎

Lines changed: 589 additions & 595 deletions
Large diffs are not rendered by default.

‎plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/AdsDataType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static AdsDataType firstEnumForFieldNumBytes(int fieldValue) {
103103
}
104104

105105
public static List<AdsDataType> enumsForFieldNumBytes(int fieldValue) {
106-
List<AdsDataType> _values = new ArrayList();
106+
List<AdsDataType> _values = new ArrayList<>();
107107
for (AdsDataType _val : AdsDataType.values()) {
108108
if (_val.getNumBytes() == fieldValue) {
109109
_values.add(_val);
@@ -126,7 +126,7 @@ public static AdsDataType firstEnumForFieldPlcValueType(PlcValueType fieldValue)
126126
}
127127

128128
public static List<AdsDataType> enumsForFieldPlcValueType(PlcValueType fieldValue) {
129-
List<AdsDataType> _values = new ArrayList();
129+
List<AdsDataType> _values = new ArrayList<>();
130130
for (AdsDataType _val : AdsDataType.values()) {
131131
if (_val.getPlcValueType() == fieldValue) {
132132
_values.add(_val);

‎plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/AdsPlcDriver.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,7 @@ protected org.apache.plc4x.java.api.value.PlcValueHandler getValueHandler() {
100100

101101
@Override
102102
public PlcDriverMetadata getMetadata() {
103-
return new PlcDriverMetadata() {
104-
@Override
105-
public boolean canDiscover() {
106-
return true;
107-
}
108-
};
103+
return () -> true;
109104
}
110105

111106
/**

‎plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ public static BACnetVendorId firstEnumForFieldVendorId(int fieldValue) {
16691669
}
16701670

16711671
public static List<BACnetVendorId> enumsForFieldVendorId(int fieldValue) {
1672-
List<BACnetVendorId> _values = new ArrayList();
1672+
List<BACnetVendorId> _values = new ArrayList<>();
16731673
for (BACnetVendorId _val : BACnetVendorId.values()) {
16741674
if (_val.getVendorId() == fieldValue) {
16751675
_values.add(_val);
@@ -1692,7 +1692,7 @@ public static BACnetVendorId firstEnumForFieldVendorName(String fieldValue) {
16921692
}
16931693

16941694
public static List<BACnetVendorId> enumsForFieldVendorName(String fieldValue) {
1695-
List<BACnetVendorId> _values = new ArrayList();
1695+
List<BACnetVendorId> _values = new ArrayList<>();
16961696
for (BACnetVendorId _val : BACnetVendorId.values()) {
16971697
if (_val.getVendorName().equals(fieldValue)) {
16981698
_values.add(_val);

‎plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/MaxApduLengthAccepted.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static MaxApduLengthAccepted firstEnumForFieldNumberOfOctets(int fieldVal
7777
}
7878

7979
public static List<MaxApduLengthAccepted> enumsForFieldNumberOfOctets(int fieldValue) {
80-
List<MaxApduLengthAccepted> _values = new ArrayList();
80+
List<MaxApduLengthAccepted> _values = new ArrayList<>();
8181
for (MaxApduLengthAccepted _val : MaxApduLengthAccepted.values()) {
8282
if (_val.getNumberOfOctets() == fieldValue) {
8383
_values.add(_val);

‎plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/MaxSegmentsAccepted.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static MaxSegmentsAccepted firstEnumForFieldMaxSegments(short fieldValue)
6969
}
7070

7171
public static List<MaxSegmentsAccepted> enumsForFieldMaxSegments(short fieldValue) {
72-
List<MaxSegmentsAccepted> _values = new ArrayList();
72+
List<MaxSegmentsAccepted> _values = new ArrayList<>();
7373
for (MaxSegmentsAccepted _val : MaxSegmentsAccepted.values()) {
7474
if (_val.getMaxSegments() == fieldValue) {
7575
_values.add(_val);

‎plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/ede/EdeParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public EdeModel parseFile(File edeFile) {
6161
private List<File> findAllEdeFiles(File curDir) {
6262
List<File> edeFiles = new LinkedList<>();
6363
try {
64-
Files.walkFileTree(curDir.toPath(), new SimpleFileVisitor<Path>() {
64+
Files.walkFileTree(curDir.toPath(), new SimpleFileVisitor<>() {
6565
@Override
6666
public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
6767
final File file = path.toFile();
68-
if(file.isFile()) {
68+
if (file.isFile()) {
6969
// If the name starts with "edeDataText" this is probably an EDE file.
7070
if (file.getName().startsWith("edeDataText")) {
7171
String suffix = file.getName().substring("edeDataText".length());

‎plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AccessControlCommandType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static AccessControlCommandType firstEnumForFieldNumberOfArguments(short
6969
}
7070

7171
public static List<AccessControlCommandType> enumsForFieldNumberOfArguments(short fieldValue) {
72-
List<AccessControlCommandType> _values = new ArrayList();
72+
List<AccessControlCommandType> _values = new ArrayList<>();
7373
for (AccessControlCommandType _val : AccessControlCommandType.values()) {
7474
if (_val.getNumberOfArguments() == fieldValue) {
7575
_values.add(_val);

0 commit comments

Comments
 (0)