Skip to content

Commit 0ea5d53

Browse files
committed
refactor: Removed the use of the deprecated WildcardTerm class in protocol-base-mspec in favor to the one in the build-tools.
1 parent 562a2d8 commit 0ea5d53

File tree

3 files changed

+2
-53
lines changed

3 files changed

+2
-53
lines changed

code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultBooleanTypeReference;
2525
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultIntegerTypeReference;
2626
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultUndefinedTypeReference;
27-
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.WildcardTerm;
2827
import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
2928
import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
3029
import org.apache.plc4x.plugins.codegenerator.types.fields.*;
3130
import org.apache.plc4x.plugins.codegenerator.types.references.*;
3231
import org.apache.plc4x.plugins.codegenerator.types.terms.BooleanLiteral;
3332
import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
3433
import org.apache.plc4x.plugins.codegenerator.types.terms.VariableLiteral;
34+
import org.apache.plc4x.plugins.codegenerator.types.terms.WildcardTerm;
3535
import org.slf4j.Logger;
3636
import org.slf4j.LoggerFactory;
3737

@@ -355,8 +355,6 @@ protected ImplicitField getReferencedImplicitField(VariableLiteral variableLiter
355355
.orElse(null);
356356
}
357357

358-
359-
// TODO: replace that with term.isWildcard() (once the referenced wildcard term from build utils is used)
360358
public boolean isWildcard(Term term) {
361359
return term instanceof WildcardTerm;
362360
}

code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/WildcardTerm.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields.*;
3030
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.*;
3131
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.DefaultVariableLiteral;
32-
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.WildcardTerm;
3332
import org.apache.plc4x.plugins.codegenerator.protocol.TypeContext;
3433
import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
3534
import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
@@ -38,10 +37,7 @@
3837
import org.apache.plc4x.plugins.codegenerator.types.fields.ManualArrayField;
3938
import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
4039
import org.apache.plc4x.plugins.codegenerator.types.references.*;
41-
import org.apache.plc4x.plugins.codegenerator.types.terms.Literal;
42-
import org.apache.plc4x.plugins.codegenerator.types.terms.NumericLiteral;
43-
import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
44-
import org.apache.plc4x.plugins.codegenerator.types.terms.VariableLiteral;
40+
import org.apache.plc4x.plugins.codegenerator.types.terms.*;
4541
import org.slf4j.Logger;
4642
import org.slf4j.LoggerFactory;
4743

0 commit comments

Comments
 (0)