Merge pull request #1538 from niveathika/master

Fix aggregation definition error logs
siddhi-io · Oct 5, 2019 · a6a0a39 · a6a0a39
2 parents b5865fd + 3c55a0a
commit a6a0a39
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/parser/AggregationParser.java
@@ -105,18 +105,18 @@ public static AggregationRuntime parse(AggregationDefinition aggregationDefiniti
 
         if (aggregationDefinition == null) {
             throw new SiddhiAppCreationException(
-                    "AggregationDefinition instance is null. " +
+                    "Aggregation Definition instance is null. " +
                             "Hence, can't create the siddhi app '" + siddhiAppContext.getName() + "'");
         }
         if (aggregationDefinition.getTimePeriod() == null) {
             throw new SiddhiAppCreationException(
-                    "AggregationDefinition '" + aggregationDefinition.getId() + "'s timePeriod is null. " +
+                    "Aggregation Definition '" + aggregationDefinition.getId() + "'s timePeriod is null. " +
                             "Hence, can't create the siddhi app '" + siddhiAppContext.getName() + "'",
                     aggregationDefinition.getQueryContextStartIndex(), aggregationDefinition.getQueryContextEndIndex());
         }
         if (aggregationDefinition.getSelector() == null) {
             throw new SiddhiAppCreationException(
-                    "AggregationDefinition '" + aggregationDefinition.getId() + "'s selection is not defined. " +
+                    "Aggregation Definition '" + aggregationDefinition.getId() + "'s selection is not defined. " +
                             "Hence, can't create the siddhi app '" + siddhiAppContext.getName() + "'",
                     aggregationDefinition.getQueryContextStartIndex(), aggregationDefinition.getQueryContextEndIndex());
         }
@@ -585,10 +585,9 @@ private static void populateIncomingAggregatorsAndExecutors(
                         siddhiQueryContext);
             } else if (externalTimestampExecutor.getReturnType() != Attribute.Type.LONG) {
                 throw new SiddhiAppCreationException(
-                        "AggregationDefinition '" + aggregationDefinition.getId() + "'s aggregateAttribute expects " +
-                                "long or string, but found " + timestampExecutor.getReturnType() + ". " +
-                                "Hence, can't create the siddhi app '" +
-                                siddhiQueryContext.getSiddhiAppContext().getName() + "'",
+                        "Aggregation Definition '" + aggregationDefinition.getId() + "'s timestamp attribute expects " +
+                        "long or string, but found " + externalTimestampExecutor.getReturnType() + ". Hence, can't " +
+                        "create the siddhi app '" + siddhiQueryContext.getSiddhiAppContext().getName() + "'",
                         externalTimestampExpression.getQueryContextStartIndex(),
                         externalTimestampExpression.getQueryContextEndIndex());
             }