Skip to content

Commit 8848418

Browse files
author
chengyitian
committed
AJ-638: optimize error info for cep;
1 parent 86b2672 commit 8848418

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/com/xxdb/streaming/cep/EventHandler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public EventHandler(List<EventScheme> eventSchemes, List<String> eventTimeKeys,
3232
List<EventScheme> expandEventSchemes = new ArrayList<>(eventSchemes);
3333
for (EventScheme event : expandEventSchemes) {
3434
if (Utils.isEmpty(event.getEventType()))
35-
throw new IllegalArgumentException(funcName + " the eventType cannot be empty");
35+
throw new IllegalArgumentException("eventType must be non-empty.");
3636

3737
// check if has duplicate key in attrKeys
3838
Set<String> set = new HashSet<>();
@@ -46,10 +46,10 @@ public EventHandler(List<EventScheme> eventSchemes, List<String> eventTimeKeys,
4646
event.setAttrExtraParams(Collections.nCopies(length, 0));
4747
}
4848
if (length == 0) {
49-
throw new IllegalArgumentException(funcName + " the eventKey in eventScheme must not be empty");
49+
throw new IllegalArgumentException("eventKey in eventScheme must be non-empty.");
5050
}
5151
if ((!event.getAttrExtraParams().isEmpty() && length != event.getAttrExtraParams().size()) || length != event.getAttrForms().size() || length != event.getAttrTypes().size()) {
52-
throw new IllegalArgumentException(funcName + " the number of eventKey, eventTypes, eventForms and eventExtraParams (if set) must have the same length.");
52+
throw new IllegalArgumentException("the number of eventKey, eventTypes, eventForms and eventExtraParams (if set) must have the same length.");
5353
}
5454
}
5555
int eventNum = eventSchemes.size();
@@ -72,7 +72,7 @@ public EventHandler(List<EventScheme> eventSchemes, List<String> eventTimeKeys,
7272
// prepare eventInfos
7373
StringBuilder errMsg = new StringBuilder();
7474
if (!checkSchema(expandEventSchemes, expandTimeKeys, commonKeys, errMsg))
75-
throw new IllegalArgumentException(funcName + " " + errMsg);
75+
throw new IllegalArgumentException(errMsg.toString());
7676

7777
this.commonKeySize = commonKeys.size();
7878
}
@@ -269,7 +269,7 @@ private boolean checkSchema(List<EventScheme> eventSchemes, List<String> expandT
269269
int index = 0;
270270
for (EventScheme scheme : eventSchemes) {
271271
if (eventInfos.containsKey(scheme.getEventType())) {
272-
errMsg.append("eventType must be unique");
272+
errMsg.append("eventType must be unique.");
273273
return false;
274274
}
275275

@@ -279,7 +279,7 @@ private boolean checkSchema(List<EventScheme> eventSchemes, List<String> expandT
279279
if (isNeedEventTime) {
280280
int timeIndex = scheme.getAttrKeys().indexOf(expandTimeKeys.get(index));
281281
if (timeIndex == -1) {
282-
errMsg.append("event ").append(scheme.getEventType()).append(" doesn't contain eventTimeKey ").append(expandTimeKeys.get(index));
282+
errMsg.append("event ").append(scheme.getEventType()).append(" doesn't contain eventTimeKey ").append(expandTimeKeys.get(index)).append(".");
283283
return false;
284284
}
285285
schemeEx.setTimeIndex(timeIndex);

0 commit comments

Comments
 (0)