Skip to content

Commit e2cb48a

Browse files
authored
Merge pull request #78 from dnwick/master
Allow multiple different typed arguments for concat function and upgrade log4j1
2 parents e93dea5 + 374d025 commit e2cb48a

28 files changed

+100
-73
lines changed

component/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<artifactId>siddhi-query-api</artifactId>
4141
</dependency>
4242
<dependency>
43-
<groupId>org.apache.log4j.wso2</groupId>
44-
<artifactId>log4j</artifactId>
43+
<groupId>org.apache.logging.log4j</groupId>
44+
<artifactId>log4j-core</artifactId>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.testng</groupId>
@@ -153,7 +153,7 @@
153153
io.siddhi.query.*;version="${siddhi.import.version.range}",
154154
io.siddhi.core.*;version="${siddhi.import.version.range}",
155155
io.siddhi.annotation.*;version="${siddhi.import.version.range}",
156-
org.apache.log4j.*
156+
org.apache.logging.log4j.*
157157
</Import-Package>
158158
<Include-Resource>
159159
META-INF=target/classes/META-INF

component/src/main/java/io/siddhi/extension/execution/string/ConcatFunctionExtension.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@
4949
"concatenating two or more input string values.",
5050
parameters = {
5151
@Parameter(name = "arg",
52-
description = "This can have two or more `string` type input parameters.",
53-
type = {DataType.STRING},
52+
description = "This can have two or more STRING, DOUBLE, BOOL, FLOAT, INT, LONG typed" +
53+
" input parameters.",
54+
type = {DataType.STRING, DataType.DOUBLE, DataType.BOOL,
55+
DataType.FLOAT, DataType.INT, DataType.LONG},
5456
dynamic = true)
5557
},
5658
parameterOverloads = {

component/src/main/java/io/siddhi/extension/execution/string/ContainsFunctionExtension.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
import io.siddhi.core.util.snapshot.state.StateFactory;
3434
import io.siddhi.query.api.definition.Attribute;
3535
import io.siddhi.query.api.exception.SiddhiAppValidationException;
36-
import org.apache.log4j.Logger;
36+
import org.apache.logging.log4j.LogManager;
37+
import org.apache.logging.log4j.Logger;
3738

3839
import static io.siddhi.query.api.definition.Attribute.Type.BOOL;
3940
import static io.siddhi.query.api.definition.Attribute.Type.STRING;
@@ -78,7 +79,7 @@
7879
)
7980
public class ContainsFunctionExtension extends FunctionExecutor {
8081

81-
private static final Logger LOGGER = Logger.getLogger(ContainsFunctionExtension.class);
82+
private static final Logger LOGGER = LogManager.getLogger(ContainsFunctionExtension.class);
8283

8384
Attribute.Type returnType = BOOL;
8485

component/src/test/java/io/siddhi/extension/execution/string/CharAtFunctionExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
import io.siddhi.core.stream.input.InputHandler;
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
29-
import org.apache.log4j.Logger;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3031
import org.testng.AssertJUnit;
3132
import org.testng.annotations.BeforeMethod;
3233
import org.testng.annotations.Test;
3334

3435
import java.util.concurrent.atomic.AtomicInteger;
3536

3637
public class CharAtFunctionExtensionTestCase {
37-
static final Logger LOGGER = Logger.getLogger(CharAtFunctionExtensionTestCase.class);
38+
private static final Logger LOGGER = LogManager.getLogger(CharAtFunctionExtensionTestCase.class);
3839
private AtomicInteger count = new AtomicInteger(0);
3940
private volatile boolean eventArrived;
4041

component/src/test/java/io/siddhi/extension/execution/string/CharFrequencyExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
import io.siddhi.core.stream.output.StreamCallback;
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
29-
import org.apache.log4j.Logger;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3031
import org.testng.AssertJUnit;
3132
import org.testng.annotations.BeforeMethod;
3233
import org.testng.annotations.Test;
3334

3435
import java.util.concurrent.atomic.AtomicInteger;
3536

3637
public class CharFrequencyExtensionTestCase {
37-
static final Logger LOGGER = Logger.getLogger(CharFrequencyExtensionTestCase.class);
38+
private static final Logger LOGGER = LogManager.getLogger(CharFrequencyExtensionTestCase.class);
3839
private AtomicInteger count = new AtomicInteger(0);
3940
private volatile boolean eventArrived;
4041

component/src/test/java/io/siddhi/extension/execution/string/CoalesceFunctionExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
import io.siddhi.core.stream.input.InputHandler;
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
29-
import org.apache.log4j.Logger;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3031
import org.testng.AssertJUnit;
3132
import org.testng.annotations.BeforeMethod;
3233
import org.testng.annotations.Test;
3334

3435
import java.util.concurrent.atomic.AtomicInteger;
3536

3637
public class CoalesceFunctionExtensionTestCase {
37-
static final Logger LOGGER = Logger.getLogger(CoalesceFunctionExtensionTestCase.class);
38+
private static final Logger LOGGER = LogManager.getLogger(CoalesceFunctionExtensionTestCase.class);
3839
private AtomicInteger count = new AtomicInteger(0);
3940
private volatile boolean eventArrived;
4041

component/src/test/java/io/siddhi/extension/execution/string/ConcatFunctionExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
import io.siddhi.core.stream.input.InputHandler;
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
29-
import org.apache.log4j.Logger;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3031
import org.testng.AssertJUnit;
3132
import org.testng.annotations.BeforeMethod;
3233
import org.testng.annotations.Test;
3334

3435
import java.util.concurrent.atomic.AtomicInteger;
3536

3637
public class ConcatFunctionExtensionTestCase {
37-
static final Logger LOGGER = Logger.getLogger(ConcatFunctionExtensionTestCase.class);
38+
private static final Logger LOGGER = LogManager.getLogger(CoalesceFunctionExtensionTestCase.class);
3839
private AtomicInteger count = new AtomicInteger(0);
3940
private volatile boolean eventArrived;
4041

component/src/test/java/io/siddhi/extension/execution/string/ContainsFunctionExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import io.siddhi.core.stream.input.InputHandler;
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
29-
import org.apache.log4j.Logger;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3031
import org.testng.AssertJUnit;
3132
import org.testng.annotations.BeforeMethod;
3233
import org.testng.annotations.Test;
@@ -35,7 +36,7 @@
3536

3637
public class ContainsFunctionExtensionTestCase {
3738

38-
static final Logger LOGGER = Logger.getLogger(ContainsFunctionExtensionTestCase.class);
39+
private static final Logger LOGGER = LogManager.getLogger(ContainsFunctionExtensionTestCase.class);
3940
private AtomicInteger count = new AtomicInteger(0);
4041
private volatile boolean eventArrived;
4142

component/src/test/java/io/siddhi/extension/execution/string/EqualsIgnoreCaseFunctionExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
import io.siddhi.core.stream.input.InputHandler;
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
29-
import org.apache.log4j.Logger;
29+
import org.apache.logging.log4j.LogManager;
30+
import org.apache.logging.log4j.Logger;
3031
import org.testng.AssertJUnit;
3132
import org.testng.annotations.BeforeMethod;
3233
import org.testng.annotations.Test;
3334

3435
import java.util.concurrent.atomic.AtomicInteger;
3536

3637
public class EqualsIgnoreCaseFunctionExtensionTestCase {
37-
static final Logger LOGGER = Logger.getLogger(EqualsIgnoreCaseFunctionExtensionTestCase.class);
38+
private static final Logger LOGGER = LogManager.getLogger(EqualsIgnoreCaseFunctionExtensionTestCase.class);
3839
private AtomicInteger count = new AtomicInteger(0);
3940
private volatile boolean eventArrived;
4041

component/src/test/java/io/siddhi/extension/execution/string/FillTemplateFunctionExtensionTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@
2727
import io.siddhi.core.util.EventPrinter;
2828
import io.siddhi.extension.execution.map.CreateFunctionExtension;
2929
import io.siddhi.extension.execution.string.test.util.SiddhiTestHelper;
30-
import org.apache.log4j.Logger;
30+
import org.apache.logging.log4j.LogManager;
31+
import org.apache.logging.log4j.Logger;
3132
import org.testng.AssertJUnit;
3233
import org.testng.annotations.BeforeMethod;
3334
import org.testng.annotations.Test;
3435

3536
import java.util.concurrent.atomic.AtomicInteger;
3637

3738
public class FillTemplateFunctionExtensionTestCase {
38-
static final Logger LOGGER = Logger.getLogger(FillTemplateFunctionExtensionTestCase.class);
39+
private static final Logger LOGGER = LogManager.getLogger(FillTemplateFunctionExtensionTestCase.class);
3940
private AtomicInteger count = new AtomicInteger(0);
4041
private volatile boolean eventArrived;
4142

0 commit comments

Comments
 (0)