Skip to content

Commit

Permalink
Merge pull request #43 from sujanan/master
Browse files Browse the repository at this point in the history
Refactor according to wso2-extensions to siddhi-io repo move
  • Loading branch information
mohanvive authored May 14, 2019
2 parents 76b2c21 + 9c70b1c commit a58c85c
Show file tree
Hide file tree
Showing 26 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Latest API Docs is <a target="_blank" href="https://wso2-extensions.github.io/si

```
<dependency>
<groupId>org.wso2.extension.siddhi.store.mongodb</groupId>
<groupId>io.siddhi.extension.store.mongodb</groupId>
<artifactId>siddhi-store-mongodb</artifactId>
<version>x.x.x</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wso2.extension.siddhi.store.mongodb</groupId>
<groupId>io.siddhi.extension.store.mongodb</groupId>
<artifactId>siddhi-store-mongodb-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
Expand Down Expand Up @@ -316,7 +316,7 @@
org.bson.*;
</Private-Package>
<Export-Package>
org.wso2.extension.siddhi.store.mongodb.*
io.siddhi.extension.store.mongodb.*
</Export-Package>
<Import-Package>
org.apache.commons.logging.*;version="${commons.logging.version.range}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.util.collection.operator.CompiledCondition;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import com.mongodb.MongoBulkWriteException;
import com.mongodb.MongoClient;
Expand Down Expand Up @@ -45,16 +45,16 @@
import io.siddhi.core.util.collection.operator.CompiledCondition;
import io.siddhi.core.util.collection.operator.CompiledExpression;
import io.siddhi.core.util.config.ConfigReader;
import io.siddhi.extension.store.mongodb.exception.MongoTableException;
import io.siddhi.extension.store.mongodb.util.MongoTableConstants;
import io.siddhi.extension.store.mongodb.util.MongoTableUtils;
import io.siddhi.query.api.annotation.Annotation;
import io.siddhi.query.api.definition.Attribute;
import io.siddhi.query.api.definition.TableDefinition;
import io.siddhi.query.api.util.AnnotationHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bson.Document;
import org.wso2.extension.siddhi.store.mongodb.exception.MongoTableException;
import org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants;
import org.wso2.extension.siddhi.store.mongodb.util.MongoTableUtils;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.table.record.BaseExpressionVisitor;
import io.siddhi.extension.store.mongodb.exception.MongoTableException;
import io.siddhi.extension.store.mongodb.util.Constant;
import io.siddhi.extension.store.mongodb.util.MongoTableConstants;
import io.siddhi.query.api.definition.Attribute;
import io.siddhi.query.api.expression.condition.Compare;
import org.wso2.extension.siddhi.store.mongodb.exception.MongoTableException;
import org.wso2.extension.siddhi.store.mongodb.util.Constant;
import org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoCursor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.table.record.BaseExpressionVisitor;
import io.siddhi.extension.store.mongodb.exception.MongoTableException;
import io.siddhi.extension.store.mongodb.util.Constant;
import io.siddhi.query.api.definition.Attribute;
import io.siddhi.query.api.expression.condition.Compare;
import org.wso2.extension.siddhi.store.mongodb.exception.MongoTableException;
import org.wso2.extension.siddhi.store.mongodb.util.Constant;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb.exception;
package io.siddhi.extension.store.mongodb.exception;

import io.siddhi.core.exception.SiddhiAppCreationException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb.util;
package io.siddhi.extension.store.mongodb.util;

import io.siddhi.query.api.definition.Attribute;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb.util;
package io.siddhi.extension.store.mongodb.util;

/**
* Class which holds the constants required by the MongoDB Event Table implementation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb.util;
package io.siddhi.extension.store.mongodb.util;

import com.mongodb.DBObject;
import com.mongodb.MongoClientOptions;
Expand All @@ -33,15 +33,15 @@
import com.mongodb.client.model.IndexOptions;
import io.siddhi.core.exception.SiddhiAppCreationException;
import io.siddhi.core.util.config.ConfigReader;
import io.siddhi.extension.store.mongodb.MongoCompiledCondition;
import io.siddhi.extension.store.mongodb.exception.MongoTableException;
import io.siddhi.query.api.annotation.Annotation;
import io.siddhi.query.api.definition.Attribute;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.bson.json.JsonParseException;
import org.wso2.extension.siddhi.store.mongodb.MongoCompiledCondition;
import org.wso2.extension.siddhi.store.mongodb.exception.MongoTableException;

import java.io.FileInputStream;
import java.io.FileNotFoundException;
Expand Down Expand Up @@ -69,11 +69,11 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;

import static org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants.DEFAULT_KEY_STORE_FILE;
import static org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants.DEFAULT_KEY_STORE_PASSWORD;
import static org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants.DEFAULT_TRUST_STORE_FILE;
import static org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants.DEFAULT_TRUST_STORE_PASSWORD;
import static org.wso2.extension.siddhi.store.mongodb.util.MongoTableConstants.VARIABLE_CARBON_HOME;
import static io.siddhi.extension.store.mongodb.util.MongoTableConstants.DEFAULT_KEY_STORE_FILE;
import static io.siddhi.extension.store.mongodb.util.MongoTableConstants.DEFAULT_KEY_STORE_PASSWORD;
import static io.siddhi.extension.store.mongodb.util.MongoTableConstants.DEFAULT_TRUST_STORE_FILE;
import static io.siddhi.extension.store.mongodb.util.MongoTableConstants.DEFAULT_TRUST_STORE_PASSWORD;
import static io.siddhi.extension.store.mongodb.util.MongoTableConstants.VARIABLE_CARBON_HOME;

/**
* Class which holds the utility methods which are used by various units in the MongoDB Event Table implementation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
import io.siddhi.core.exception.SiddhiAppCreationException;
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.extension.store.mongodb.exception.MongoTableException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.extension.siddhi.store.mongodb.exception.MongoTableException;

public class ConditionVisitorTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
import io.siddhi.core.exception.SiddhiAppCreationException;
import io.siddhi.core.stream.input.InputHandler;
import io.siddhi.extension.store.mongodb.exception.MongoTableException;
import io.siddhi.query.api.exception.DuplicateDefinitionException;
import io.siddhi.query.api.exception.SiddhiAppValidationException;
import org.apache.log4j.Logger;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.extension.siddhi.store.mongodb.exception.MongoTableException;

import java.util.HashMap;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* under the License.
*/

package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import com.mongodb.MongoClient;
import com.mongodb.MongoClientOptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* under the License.
*/

package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import com.mongodb.MongoClient;
import com.mongodb.MongoClientURI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* under the License.
*/

package org.wso2.extension.siddhi.store.mongodb;
package io.siddhi.extension.store.mongodb;

import io.siddhi.core.SiddhiAppRuntime;
import io.siddhi.core.SiddhiManager;
Expand Down
2 changes: 1 addition & 1 deletion component/src/test/resources/testngSecureSSL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<suite name="MonogStoreTestSuite" verbose="1">
<test name="MonogoStoreTest - Standalone">
<classes>
<class name="org.wso2.extension.siddhi.store.mongodb.MongoDBConnectionSSLTest"/>
<class name="io.siddhi.extension.store.mongodb.MongoDBConnectionSSLTest"/>
</classes>
</test>
</suite>
16 changes: 8 additions & 8 deletions component/src/test/resources/testngStandalone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<suite name="MonogStoreTestSuite" verbose="1">
<test name="MonogoStoreTest - Standalone">
<classes>
<class name="org.wso2.extension.siddhi.store.mongodb.DefineMongoTableTest"/>
<class name="org.wso2.extension.siddhi.store.mongodb.ConditionVisitorTest"/>
<class name="org.wso2.extension.siddhi.store.mongodb.ContainsMongoTableTest"/>
<class name="org.wso2.extension.siddhi.store.mongodb.DeleteFromMongoTableTest"/>
<class name="org.wso2.extension.siddhi.store.mongodb.InsertIntoMongoTableTest"/>
<class name="org.wso2.extension.siddhi.store.mongodb.JoinMongoTableTest"/>
<class name="org.wso2.extension.siddhi.store.mongodb.UpdateOrInsertMongoTableTest"/>
<class name="io.siddhi.extension.store.mongodb.DefineMongoTableTest"/>
<class name="io.siddhi.extension.store.mongodb.ConditionVisitorTest"/>
<class name="io.siddhi.extension.store.mongodb.ContainsMongoTableTest"/>
<class name="io.siddhi.extension.store.mongodb.DeleteFromMongoTableTest"/>
<class name="io.siddhi.extension.store.mongodb.InsertIntoMongoTableTest"/>
<class name="io.siddhi.extension.store.mongodb.JoinMongoTableTest"/>
<class name="io.siddhi.extension.store.mongodb.UpdateOrInsertMongoTableTest"/>
<!-- Skipping update test till set is implemented-->
<!--
<class name="org.wso2.extension.siddhi.store.mongodb.UpdateMongoTableTest" />
<class name="io.siddhi.extension.store.mongodb.UpdateMongoTableTest" />
-->
</classes>
</test>
Expand Down
2 changes: 1 addition & 1 deletion coverage-reports/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>siddhi-store-mongodb-parent</artifactId>
<groupId>org.wso2.extension.siddhi.store.mongodb</groupId>
<groupId>io.siddhi.extension.store.mongodb</groupId>
<version>2.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Latest API Docs is <a target="_blank" href="https://wso2-extensions.github.io/si

```
<dependency>
<groupId>org.wso2.extension.siddhi.store.mongodb</groupId>
<groupId>io.siddhi.extension.store.mongodb</groupId>
<artifactId>siddhi-store-mongodb</artifactId>
<version>x.x.x</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<version>5</version>
</parent>

<groupId>org.wso2.extension.siddhi.store.mongodb</groupId>
<groupId>io.siddhi.extension.store.mongodb</groupId>
<artifactId>siddhi-store-mongodb-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down

0 comments on commit a58c85c

Please sign in to comment.