This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 0ea5d53f8b refactor: Removed the use of the deprecated WildcardTerm
class in protocol-base-mspec in favor to the one in the build-tools.
0ea5d53f8b is described below
commit 0ea5d53f8be65b13c9ec279d54b7da9d6f41228e
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu Sep 4 19:02:35 2025 +0200
refactor: Removed the use of the deprecated WildcardTerm class in
protocol-base-mspec in favor to the one in the build-tools.
---
.../BaseFreemarkerLanguageTemplateHelper.java | 4 +-
.../language/mspec/model/terms/WildcardTerm.java | 45 ----------------------
.../mspec/parser/MessageFormatListener.java | 6 +--
3 files changed, 2 insertions(+), 53 deletions(-)
diff --git
a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
index 8cb67dd16f..6593f68443 100644
---
a/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
+++
b/code-generation/language-base-freemarker/src/main/java/org/apache/plc4x/plugins/codegenerator/protocol/freemarker/BaseFreemarkerLanguageTemplateHelper.java
@@ -24,7 +24,6 @@ import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.D
import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultBooleanTypeReference;
import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultIntegerTypeReference;
import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.DefaultUndefinedTypeReference;
-import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.WildcardTerm;
import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
import org.apache.plc4x.plugins.codegenerator.types.fields.*;
@@ -32,6 +31,7 @@ import
org.apache.plc4x.plugins.codegenerator.types.references.*;
import org.apache.plc4x.plugins.codegenerator.types.terms.BooleanLiteral;
import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
import org.apache.plc4x.plugins.codegenerator.types.terms.VariableLiteral;
+import org.apache.plc4x.plugins.codegenerator.types.terms.WildcardTerm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -355,8 +355,6 @@ public abstract class BaseFreemarkerLanguageTemplateHelper
implements Freemarker
.orElse(null);
}
-
- // TODO: replace that with term.isWildcard() (once the referenced wildcard
term from build utils is used)
public boolean isWildcard(Term term) {
return term instanceof WildcardTerm;
}
diff --git
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/WildcardTerm.java
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/WildcardTerm.java
deleted file mode 100644
index fb0deea107..0000000000
---
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/WildcardTerm.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- *
- * https://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.apache.plc4x.plugins.codegenerator.language.mspec.model.terms;
-
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-
-/**
- * @deprecated {@link
org.apache.plc4x.plugins.codegenerator.types.terms.WildcardTerm} should be used
instead
- */
-@Deprecated
-public class WildcardTerm implements Term {
-
- public static final WildcardTerm INSTANCE = new WildcardTerm();
-
- @Override
- public boolean contains(String s) {
- throw new IllegalStateException("Should never be called");
- }
-
- @Override
- public String stringRepresentation() {
- throw new IllegalStateException("Should never be called");
- }
-
- @Override
- public String toString() {
- return "WildcardTerm{}";
- }
-}
diff --git
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
index 9dbb5ead03..8e7ce7e6c4 100644
---
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
+++
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
@@ -29,7 +29,6 @@ import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.definitions.*
import org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields.*;
import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.references.*;
import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.DefaultVariableLiteral;
-import
org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.WildcardTerm;
import org.apache.plc4x.plugins.codegenerator.protocol.TypeContext;
import org.apache.plc4x.plugins.codegenerator.types.definitions.*;
import org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
@@ -38,10 +37,7 @@ import
org.apache.plc4x.plugins.codegenerator.types.fields.Field;
import org.apache.plc4x.plugins.codegenerator.types.fields.ManualArrayField;
import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
import org.apache.plc4x.plugins.codegenerator.types.references.*;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Literal;
-import org.apache.plc4x.plugins.codegenerator.types.terms.NumericLiteral;
-import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
-import org.apache.plc4x.plugins.codegenerator.types.terms.VariableLiteral;
+import org.apache.plc4x.plugins.codegenerator.types.terms.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
