This is an automated email from the ASF dual-hosted git repository.
sruehl 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 0cd6560 fix(codgen): lower log output by setting some errors on debug
for now
0cd6560 is described below
commit 0cd65608eca97f02cf9f67b0461daa77cee15d98
Author: Sebastian Rühl <[email protected]>
AuthorDate: Mon Feb 28 09:54:51 2022 +0100
fix(codgen): lower log output by setting some errors on debug for now
---
.../mspec/expression/ExpressionStringListener.java | 3 ++-
.../definitions/DefaultDataIoTypeDefinition.java | 10 +++++++--
.../definitions/DefaultEnumTypeDefinition.java | 10 +++++++--
.../mspec/parser/MessageFormatListener.java | 24 +++++++++++-----------
.../mspec/parser/MessageFormatParserTest.java | 6 ++++--
5 files changed, 34 insertions(+), 19 deletions(-)
diff --git
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
index bab9237..0b99ef2 100644
---
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
+++
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
@@ -235,7 +235,8 @@ public class ExpressionStringListener extends
ExpressionBaseListener {
final DefaultVariableLiteral variableLiteral = new
DefaultVariableLiteral(name, argsContext, index, rest);
futureStack.pop().whenComplete((typeReference, throwable) -> {
if (throwable != null) {
- LOGGER.error("Error setting type", throwable);
+ // TODO: proper error collection in type context error bucket
+ LOGGER.debug("Error setting type", throwable);
return;
}
variableLiteral.setTypeReference(typeReference);
diff --git
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDataIoTypeDefinition.java
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDataIoTypeDefinition.java
index 2d1003f..a6ee933 100644
---
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDataIoTypeDefinition.java
+++
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultDataIoTypeDefinition.java
@@ -23,6 +23,8 @@ import
org.apache.plc4x.plugins.codegenerator.types.definitions.DataIoTypeDefini
import org.apache.plc4x.plugins.codegenerator.types.fields.SwitchField;
import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collections;
import java.util.List;
@@ -31,6 +33,10 @@ import java.util.Objects;
public class DefaultDataIoTypeDefinition extends DefaultComplexTypeDefinition
implements DataIoTypeDefinition {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultDataIoTypeDefinition.class);
+
+
private final SwitchField switchField;
private TypeReference type;
@@ -42,8 +48,8 @@ public class DefaultDataIoTypeDefinition extends
DefaultComplexTypeDefinition im
}
((DefaultArgument)
parserArguments.get(0)).getTypeReferenceCompletionStage().whenComplete((typeReference,
throwable) -> {
if (throwable != null) {
- // TODO: handle error
- System.err.println(throwable);
+ // TODO: proper error collection in type context error bucket
+ LOGGER.debug("Error setting type for {}",
parserArguments.get(0), throwable);
return;
}
this.type =
Objects.requireNonNull(parserArguments.get(0).getType());
diff --git
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
index b17025c..2a59be5 100644
---
a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
+++
b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/definitions/DefaultEnumTypeDefinition.java
@@ -24,11 +24,17 @@ import
org.apache.plc4x.plugins.codegenerator.types.enums.EnumValue;
import
org.apache.plc4x.plugins.codegenerator.types.references.SimpleTypeReference;
import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
public class DefaultEnumTypeDefinition extends DefaultTypeDefinition
implements EnumTypeDefinition {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultEnumTypeDefinition.class);
+
+
private final SimpleTypeReference type;
private final List<EnumValue> enumValues;
private final Map<String, TypeReference> constants;
@@ -43,8 +49,8 @@ public class DefaultEnumTypeDefinition extends
DefaultTypeDefinition implements
for (Argument argument : parserArgument) {
((DefaultArgument)
argument).getTypeReferenceCompletionStage().whenComplete((typeReference,
throwable) -> {
if (throwable != null) {
- // TODO: handle error
- System.err.println(throwable);
+ // TODO: proper error collection in type context error
bucket
+ LOGGER.debug("Error setting type for {}", argument,
throwable);
return;
}
this.constants.put(argument.getName(), argument.getType());
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 357682f..e43e6fd 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
@@ -190,7 +190,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -209,7 +209,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(new DefaultArrayTypeReference(typeReference));
@@ -240,7 +240,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable)
-> {
if (throwable != null) {
// TODO: proper error collection in type context error
bucket
- LOGGER.error("Error setting type for {}", field,
throwable);
+ LOGGER.debug("Error setting type for {}", field,
throwable);
return;
}
field.setType(typeReference);
@@ -258,7 +258,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -303,7 +303,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -327,7 +327,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(new DefaultArrayTypeReference(typeReference));
@@ -348,7 +348,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -369,7 +369,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -390,7 +390,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -429,7 +429,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -467,7 +467,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(ctx.type).whenComplete((typeReference, throwable) -> {
if (throwable != null) {
// TODO: proper error collection in type context error bucket
- LOGGER.error("Error setting type for {}", field, throwable);
+ LOGGER.debug("Error setting type for {}", field, throwable);
return;
}
field.setType(typeReference);
@@ -709,7 +709,7 @@ public class MessageFormatListener extends
MSpecBaseListener implements LazyType
getTypeReference(argumentContext.type).whenComplete((typeReference, throwable)
-> {
if (throwable != null) {
// TODO: proper error collection in type context error
bucket
- LOGGER.error("Error setting type for {}", argument,
throwable);
+ LOGGER.debug("Error setting type for {}", argument,
throwable);
return;
}
argument.setType(typeReference);
diff --git
a/code-generation/protocol-base-mspec/src/test/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParserTest.java
b/code-generation/protocol-base-mspec/src/test/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParserTest.java
index 049db5d..8d4ce37 100644
---
a/code-generation/protocol-base-mspec/src/test/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParserTest.java
+++
b/code-generation/protocol-base-mspec/src/test/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatParserTest.java
@@ -52,13 +52,15 @@ class MessageFormatParserTest {
@Test
void parseSomething() {
TypeContext parse =
SUT.parse(getClass().getResourceAsStream("/mspec.example"));
- System.out.println(parse);
+ assertThat(parse)
+ .isNotNull();
}
@Test
void parseSomethingElse() {
TypeContext parse =
SUT.parse(getClass().getResourceAsStream("/mspec.example2"));
- System.out.println(parse);
+ assertThat(parse)
+ .isNotNull();
}
@Test
