Skip to content

Commit

Permalink
refactor(expression): reorganize packages for built-in functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@fhussonnois
fhussonnois committed Sep 21, 2021
1 parent 50200f7 commit bf3fc31
Show file tree
Hide file tree
Showing 29 changed files with 57 additions and 57 deletions.
52 changes: 26 additions & 26 deletions ...reamthoughts/kafka/connect/filepulse/expression/function/ExpressionFunctionExecutors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,32 @@

import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
import io.streamthoughts.kafka.connect.filepulse.expression.ExpressionException;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.And;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Concat;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.ConcatWs;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Converts;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.EndsWith;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Equals;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Exists;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.ExtractArray;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.GreaterThan;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Hash;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.If;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.IsNull;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.LessThan;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Lowercase;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Md5;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Matches;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Nlv;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Length;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Or;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.ReplaceAll;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Split;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.StartsWith;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Trim;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.UnixTimestamp;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Uppercase;
import io.streamthoughts.kafka.connect.filepulse.expression.function.impl.Uuid;
import io.streamthoughts.kafka.connect.filepulse.expression.function.conditions.And;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Concat;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.ConcatWs;
import io.streamthoughts.kafka.connect.filepulse.expression.function.objects.Converts;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.EndsWith;
import io.streamthoughts.kafka.connect.filepulse.expression.function.conditions.Equals;
import io.streamthoughts.kafka.connect.filepulse.expression.function.objects.Exists;
import io.streamthoughts.kafka.connect.filepulse.expression.function.collections.ExtractArray;
import io.streamthoughts.kafka.connect.filepulse.expression.function.conditions.GreaterThan;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Hash;
import io.streamthoughts.kafka.connect.filepulse.expression.function.conditions.If;
import io.streamthoughts.kafka.connect.filepulse.expression.function.objects.IsNull;
import io.streamthoughts.kafka.connect.filepulse.expression.function.conditions.LessThan;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Lowercase;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Md5;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Matches;
import io.streamthoughts.kafka.connect.filepulse.expression.function.objects.Nlv;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Length;
import io.streamthoughts.kafka.connect.filepulse.expression.function.conditions.Or;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.ReplaceAll;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Split;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.StartsWith;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Trim;
import io.streamthoughts.kafka.connect.filepulse.expression.function.time.UnixTimestamp;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Uppercase;
import io.streamthoughts.kafka.connect.filepulse.expression.function.strings.Uuid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions ...xpression/function/impl/ExtractArray.java → ...on/function/collections/ExtractArray.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.collections;

import io.streamthoughts.kafka.connect.filepulse.data.DataException;
import io.streamthoughts.kafka.connect.filepulse.data.Type;
Expand Down Expand Up @@ -44,7 +44,7 @@ public class ExtractArray implements ExpressionFunction {
* {@inheritDoc}
*/
@Override
public Arguments prepare(final Expression[] args) {
public Arguments<?> prepare(final Expression[] args) {
if (args.length < 2) {
return Arguments.of(
new MissingArgumentValue(ARRAY_ARG),
Expand Down
2 changes: 1 addition & 1 deletion ...lepulse/expression/function/impl/And.java → ...e/expression/function/conditions/And.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.conditions;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...ulse/expression/function/impl/Equals.java → ...xpression/function/conditions/Equals.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.conditions;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion ...expression/function/impl/GreaterThan.java → ...sion/function/conditions/GreaterThan.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.conditions;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...ilepulse/expression/function/impl/If.java → ...se/expression/function/conditions/If.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.conditions;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...se/expression/function/impl/LessThan.java → ...ression/function/conditions/LessThan.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.conditions;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...ilepulse/expression/function/impl/Or.java → ...se/expression/function/conditions/Or.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.conditions;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...se/expression/function/impl/Converts.java → ...expression/function/objects/Converts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.objects;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
Expand Down
4 changes: 2 additions & 2 deletions ...ulse/expression/function/impl/Exists.java → ...e/expression/function/objects/Exists.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.objects;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedStruct;
Expand All @@ -37,7 +37,7 @@ public class Exists implements ExpressionFunction {
* {@inheritDoc}
*/
@Override
public Arguments prepare(final Expression[] args) {
public Arguments<?> prepare(final Expression[] args) {
if (args.length < 2) {
return Arguments.of(
new MissingArgumentValue(OBJECT_ARG),
Expand Down
4 changes: 2 additions & 2 deletions ...ulse/expression/function/impl/IsNull.java → ...e/expression/function/objects/IsNull.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.objects;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand All @@ -34,7 +34,7 @@ public class IsNull implements ExpressionFunction {
* {@inheritDoc}
*/
@Override
public Arguments prepare(final Expression[] args) {
public Arguments<?> prepare(final Expression[] args) {
if (args.length == 0) {
return new Arguments<>(new MissingArgumentValue(FIELD_ARG));
}
Expand Down
2 changes: 1 addition & 1 deletion ...lepulse/expression/function/impl/Nlv.java → ...ulse/expression/function/objects/Nlv.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.objects;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...ulse/expression/function/impl/Concat.java → ...e/expression/function/strings/Concat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...se/expression/function/impl/ConcatWs.java → ...expression/function/strings/ConcatWs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...se/expression/function/impl/EndsWith.java → ...expression/function/strings/EndsWith.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...epulse/expression/function/impl/Hash.java → ...lse/expression/function/strings/Hash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...ulse/expression/function/impl/Length.java → ...e/expression/function/strings/Length.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion ...e/expression/function/impl/Lowercase.java → ...xpression/function/strings/Lowercase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...lse/expression/function/impl/Matches.java → .../expression/function/strings/Matches.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...lepulse/expression/function/impl/Md5.java → ...ulse/expression/function/strings/Md5.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion .../expression/function/impl/ReplaceAll.java → ...pression/function/strings/ReplaceAll.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...pulse/expression/function/impl/Split.java → ...se/expression/function/strings/Split.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion .../expression/function/impl/StartsWith.java → ...pression/function/strings/StartsWith.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...epulse/expression/function/impl/Trim.java → ...lse/expression/function/strings/Trim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...e/expression/function/impl/Uppercase.java → ...xpression/function/strings/Uppercase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.Expression;
Expand Down
2 changes: 1 addition & 1 deletion ...epulse/expression/function/impl/Uuid.java → ...lse/expression/function/strings/Uuid.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...pression/function/impl/UnixTimestamp.java → ...pression/function/time/UnixTimestamp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
*/

package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.time;

import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
import io.streamthoughts.kafka.connect.filepulse.expression.function.Arguments;
Expand Down
2 changes: 1 addition & 1 deletion ...pression/function/impl/FunctionsTest.java → ...se/expression/function/FunctionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedStruct;
Expand Down
2 changes: 1 addition & 1 deletion ...e/expression/function/impl/SplitTest.java → ...xpression/function/strings/SplitTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.streamthoughts.kafka.connect.filepulse.expression.function.impl;
package io.streamthoughts.kafka.connect.filepulse.expression.function.strings;

import io.streamthoughts.kafka.connect.filepulse.data.Type;
import io.streamthoughts.kafka.connect.filepulse.data.TypedValue;
Expand Down

0 comments on commit bf3fc31

Please sign in to comment.