Skip to content

Commit

Permalink
Merge pull request #1356 from mohanvive/master
Browse files Browse the repository at this point in the history 
Add parameter Overloads configuration to extension annotation
  • Loading branch information
@suhothayan
suhothayan authored Jun 28, 2019
2 parents 2769657 + d12e482 commit 6edd11b
Show file tree
Hide file tree
Showing 79 changed files with 473 additions and 383 deletions.
14 changes: 12 additions & 2 deletions docs/api/latest.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,8 @@ insert into sizeStream;
<p style="word-wrap: break-word">The pol2Cart function calculating the cartesian coordinates x & y for the given theta, rho coordinates and adding them as new attributes to the existing events.</p>
<span id="syntax" class="md-typeset" style="display: block; font-weight: bold;">Syntax</span>
```
pol2Cart()
pol2Cart(<DOUBLE> theta, <DOUBLE> rho)
pol2Cart(<DOUBLE> theta, <DOUBLE> rho, <DOUBLE> z)
```

Expand Down Expand Up @@ -1536,6 +1538,8 @@ insert expired events into outputStream ;
<p style="word-wrap: break-word">A batch (tumbling) time window based on external time, that holds events arrived during windowTime periods, and gets updated for every windowTime.</p>
<span id="syntax" class="md-typeset" style="display: block; font-weight: bold;">Syntax</span>
```
externalTimeBatch(<LONG> timestamp, <INT|LONG|TIME> window.time)
externalTimeBatch(<LONG> timestamp, <INT|LONG|TIME> window.time, <INT|LONG|TIME> start.time)
externalTimeBatch(<LONG> timestamp, <INT|LONG|TIME> window.time, <INT|LONG|TIME> start.time, <INT|LONG|TIME> timeout)
```

Expand Down Expand Up @@ -1713,6 +1717,7 @@ insert all events into outputStream ;
<p style="word-wrap: break-word">A batch (tumbling) length window that holds and process a number of events as specified in the window.length.</p>
<span id="syntax" class="md-typeset" style="display: block; font-weight: bold;">Syntax</span>
```
lengthBatch(<INT> window.length)
lengthBatch(<INT> window.length, <BOOL> stream.current.event)
```

Expand Down Expand Up @@ -1788,6 +1793,8 @@ insert all events into OutputStream ;
<p style="word-wrap: break-word">This window identifies and returns all the events of which the current frequency exceeds the value specified for the supportThreshold parameter.</p>
<span id="syntax" class="md-typeset" style="display: block; font-weight: bold;">Syntax</span>
```
lossyFrequent(<DOUBLE> support.threshold)
lossyFrequent(<DOUBLE> support.threshold, <DOUBLE> error.bound)
lossyFrequent(<DOUBLE> support.threshold, <DOUBLE> error.bound, <STRING> attribute)
```

Expand Down Expand Up @@ -1861,7 +1868,9 @@ insert all events into PotentialFraud;
<p style="word-wrap: break-word">This is a session window that holds events that belong to a specific session. The events that belong to a specific session are identified by a grouping attribute (i.e., a session key). A session gap period is specified to determine the time period after which the session is considered to be expired. A new event that arrives with a specific value for the session key is matched with the session window with the same session key.<br>&nbsp;There can be out of order and late arrival of events, these events can arrive after the session is expired, to include those events to the matching session key specify a latency time period that is less than the session gap period.To have aggregate functions with session windows, the events need to be grouped by the session key via a 'group by' clause.</p>
<span id="syntax" class="md-typeset" style="display: block; font-weight: bold;">Syntax</span>
```
session(<INT|LONG|TIME> window.session, <STRING> window.key, <INT|LONG|TIME> window.allowedlatency)
session(<INT|LONG|TIME> window.session)
session(<INT|LONG|TIME> window.session, <STRING> window.key)
session(<INT|LONG|TIME> window.session, <STRING> window.key, <INT|LONG|TIME> window.allowed.latency)
```

<span id="query-parameters" class="md-typeset" style="display: block; color: rgba(0, 0, 0, 0.54); font-size: 12.8px; font-weight: bold;">QUERY PARAMETERS</span>
Expand Down Expand Up @@ -1891,7 +1900,7 @@ session(<INT|LONG|TIME> window.session, <STRING> window.key, <INT|LONG|TIME> win
<td style="vertical-align: top">No</td>
</tr>
<tr>
<td style="vertical-align: top">window.allowedlatency</td>
<td style="vertical-align: top">window.allowed.latency</td>
<td style="vertical-align: top; word-wrap: break-word">This specifies the time period for which the session window is valid after the expiration of the session. The time period specified here should be less than the session time gap (which is specified via the 'window.session' parameter).</td>
<td style="vertical-align: top">0</td>
<td style="vertical-align: top">INT<br>LONG<br>TIME</td>
Expand All @@ -1917,6 +1926,7 @@ insert all events into OutputStream;
<p style="word-wrap: break-word">This window holds a batch of events that equal the number specified as the windowLength and sorts them in the given order.</p>
<span id="syntax" class="md-typeset" style="display: block; font-weight: bold;">Syntax</span>
```
sort(<INT> window.length, <STRING> attribute)
sort(<INT> window.length, <STRING> attribute, <STRING> order)
```

Expand Down
10 changes: 7 additions & 3 deletions ...annotations/src/main/java/io/siddhi/annotation/processor/AbstractAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
public class AbstractAnnotationProcessor {
protected static final Pattern CORE_PACKAGE_PATTERN = Pattern.compile("^io.siddhi.core.");
protected static final Pattern PARAMETER_NAME_PATTERN = Pattern.compile("^[a-z][a-z0-9]*(\\.[a-z][a-z0-9]*)*$");
protected static final String REPETITIVE_PARAMETER_NOTATION = "...";
protected static final Pattern CAMEL_CASE_PATTERN = Pattern.compile("^(([a-z][a-z0-9]+)([A-Z]{0,1}[a-z0-9]*)*)$");
protected String extensionClassFullName;

Expand Down Expand Up @@ -92,7 +93,8 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter -> " +
"name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter -> " +
"name {0} annotated in class {1} is not in proper format 'abc.def.ghi'.",
Expand Down Expand Up @@ -144,13 +146,15 @@ public void parameterOverloadValidation(ParameterOverload[] parameterOverloads,
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> " +
"@ParameterOverload -> parameterNames annotated in class {0} is null or empty.",
extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(overloadParameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(overloadParameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(overloadParameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> " +
"@ParameterOverload -> parameterNames {0} annotated in class {1} is not " +
"in proper format 'abc.def.ghi'.", overloadParameterName, extensionClassFullName));
}
if (!parameterMap.containsKey(overloadParameterName)) {
if (!(parameterMap.containsKey(overloadParameterName) ||
REPETITIVE_PARAMETER_NOTATION.equals(overloadParameterName))) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> " +
"@ParameterOverload -> parameterNames {0} annotated in class {1} is not defined in " +
"@Extension -> @Parameter.", overloadParameterName, extensionClassFullName));
Expand Down
10 changes: 2 additions & 8 deletions ...ava/io/siddhi/annotation/processor/AggregationAttributeValidationAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name:{0} annotated in class {1} is not in proper format ''abc.def.ghi''.",
Expand All @@ -57,13 +58,6 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
" name:{0} -> type annotated in class {1} is null or empty.", parameterName,
extensionClassFullName));
}
//Check if the @Parameter dynamic property false or empty in the classes extending
//super classes except the Sink & SinkMapper.
if (parameter.dynamic()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} -> dynamic property cannot be annotated true in class {1}.", parameterName,
extensionClassFullName));
}
}
}

Expand Down
13 changes: 4 additions & 9 deletions ...in/java/io/siddhi/annotation/processor/FunctionExecutorValidationAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {

//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name:{0} annotated in class {1} is not in proper format ''abc.def.ghi''.",
Expand All @@ -57,14 +59,7 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
"-> name:{0} -> type annotated in class {1} is null or empty.", parameterName,
extensionClassFullName));
}
//Check if the @Parameter dynamic property false or empty in the classes extending
//super classes except the Sink & SinkMapper.
if (parameter.dynamic()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name:{0} -> dynamic property cannot be annotated true in class {1}. " +
"Only classes extending Sink and SinkMapper can have the dynamic parameters.",
parameterName, extensionClassFullName));
}

if (parameter.optional()) {
if (parameter.defaultValue().isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter -> " +
Expand Down
10 changes: 2 additions & 8 deletions ...hi/annotation/processor/IncrementalAggregationAttributeValidationAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter " +
"-> name:{0} annotated in class {1} is not in proper format ''abc.def.ghi''.",
Expand All @@ -58,13 +59,6 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
" name:{0} -> type annotated in class {1} is null or empty.", parameterName,
extensionClassFullName));
}
//Check if the @Parameter dynamic property false or empty in the classes extending
//super classes except the Sink & SinkMapper.
if (parameter.dynamic()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} -> dynamic property cannot be annotated true in class {1}.", parameterName,
extensionClassFullName));
}
}
}

Expand Down
11 changes: 3 additions & 8 deletions .../io/siddhi/annotation/processor/StreamFunctionProcessorValidationAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} annotated in class {1} is not in proper format ''abc.def.ghi''.",
Expand All @@ -57,13 +58,7 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
" name:{0} -> type annotated in class {1} is null or empty.", parameterName,
extensionClassFullName));
}
//Check if the @Parameter dynamic property false or empty in the classes extending
//super classes except the Sink & SinkMapper.
if (parameter.dynamic()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} -> dynamic property cannot be annotated true in class {1}.", parameterName,
extensionClassFullName));
}

if (parameter.optional()) {
if (parameter.defaultValue().isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter -> " +
Expand Down
11 changes: 3 additions & 8 deletions ...ain/java/io/siddhi/annotation/processor/StreamProcessorValidationAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} annotated in class {1} is not in proper format ''abc.def.ghi''.",
Expand All @@ -57,13 +58,7 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
" name:{0} -> type annotated in class {1} is null or empty.", parameterName,
extensionClassFullName));
}
//Check if the @Parameter dynamic property false or empty in the classes extending
//super classes except the Sink & SinkMapper.
if (parameter.dynamic()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} -> dynamic property cannot be annotated true in class {1}.", parameterName,
extensionClassFullName));
}

if (parameter.optional()) {
if (parameter.defaultValue().isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter -> " +
Expand Down
11 changes: 3 additions & 8 deletions ...ain/java/io/siddhi/annotation/processor/WindowProcessorValidationAnnotationProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
if (parameterName.isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name annotated in class {0} is null or empty.", extensionClassFullName));
} else if (!PARAMETER_NAME_PATTERN.matcher(parameterName).find()) {
} else if (!(PARAMETER_NAME_PATTERN.matcher(parameterName).find() ||
REPETITIVE_PARAMETER_NOTATION.equals(parameterName))) {
//Check if the @Parameter name is in a correct format 'abc.def.ghi' using regex pattern.
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} annotated in class {1} is not in proper format ''abc.def.ghi''.",
Expand All @@ -57,13 +58,7 @@ public void parameterValidation(Parameter[] parameters) throws AnnotationValidat
" name:{0} -> type annotated in class {1} is null or empty.", parameterName,
extensionClassFullName));
}
//Check if the @Parameter dynamic property false or empty in the classes extending
//super classes except the Sink & SinkMapper.
if (parameter.dynamic()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter ->" +
" name:{0} -> dynamic property cannot be annotated true in class {1}.", parameterName,
extensionClassFullName));
}

if (parameter.optional()) {
if (parameter.defaultValue().isEmpty()) {
throw new AnnotationValidationException(MessageFormat.format("The @Extension -> @Parameter -> " +
Expand Down
Loading

0 comments on commit 6edd11b

Please sign in to comment.