shopizer-developers
Changes
pom.xml 12(+10 -2)
shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties 2(+1 -1)
shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties 2(+1 -1)
sm-search/pom.xml 23(+3 -20)
sm-shop/.classpath 2(+1 -1)
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class 0(+0 -0)
sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class 0(+0 -0)
Details
pom.xml 12(+10 -2)
diff --git a/pom.xml b/pom.xml
index 57cec24..38644be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,13 @@
<commons-collections4.version>4.0</commons-collections4.version>
<commons-validator.version>1.5.1</commons-validator.version>
<org.apache.httpcomponent.version>4.5.2</org.apache.httpcomponent.version>
- <infinispan.version>6.0.2.Final</infinispan.version>
<javax.inject.version>1</javax.inject.version>
<javax.el.version>2.2.4</javax.el.version>
+
+ <!-- external systems -->
<c3p0-version>0.9.5.2</c3p0-version>
+ <org.elasticsearch-version>2.4.1</org.elasticsearch-version>
+ <infinispan.version>6.0.2.Final</infinispan.version>
<!-- DON'T AS IT OVERWRITES SPRING -->
<!--<spring.version>4.2.1.RELEASE</spring.version>-->
<!--<spring-data.version>Gosling-RELEASE</spring-data.version>-->
@@ -104,7 +107,12 @@
<artifactId>c3p0</artifactId>
<version>${c3p0-version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>${org.elasticsearch-version}</version>
+ </dependency>
</dependencies>
diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index ff65afe..b785316 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Thu Nov 10 09:33:21 EST 2016
+#Fri Nov 11 10:11:04 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-canadapost
diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 991104c..3d9ad9a 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Thu Nov 10 09:33:20 EST 2016
+#Fri Nov 11 10:11:03 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
sm-search/pom.xml 23(+3 -20)
diff --git a/sm-search/pom.xml b/sm-search/pom.xml
index fe57587..b2fdf80 100644
--- a/sm-search/pom.xml
+++ b/sm-search/pom.xml
@@ -28,8 +28,8 @@
<org.aspectj-version>1.6.10</org.aspectj-version>
- <org.elasticsearch-version>2.3.4</org.elasticsearch-version>
- <io.searchbox.jest-version>2.0.2</io.searchbox.jest-version>
+ <org.elasticsearch-version>2.4.1</org.elasticsearch-version>
+ <io.searchbox.jest-version>2.0.3</io.searchbox.jest-version>
@@ -86,24 +86,7 @@
<version>${org.aspectj-version}</version>
</dependency>
- <!-- Logging -->
-<!-- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j-version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${org.slf4j-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j-version}</version>
- <scope>runtime</scope>
- </dependency> -->
+
<!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
<dependency>
diff --git a/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java b/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java
index 19c3e6b..c47550d 100644
--- a/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java
+++ b/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java
@@ -1,21 +1,6 @@
package com.shopizer.search.services.impl;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import io.searchbox.action.Action;
-import io.searchbox.client.JestClient;
-import io.searchbox.client.JestResult;
-import io.searchbox.core.Bulk;
-import io.searchbox.core.Delete;
-import io.searchbox.core.Get;
-import io.searchbox.core.Index;
-import io.searchbox.core.Search;
-import io.searchbox.core.SearchResult;
-import io.searchbox.core.search.aggregation.MetricAggregation;
-import io.searchbox.core.search.aggregation.TermsAggregation;
-import io.searchbox.indices.CreateIndex;
-import io.searchbox.indices.IndicesExists;
-import io.searchbox.indices.mapping.PutMapping;
-import io.searchbox.params.Parameters;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,16 +13,11 @@ import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
-import javax.inject.Inject;
-
-
-
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.springframework.beans.factory.annotation.Qualifier;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
@@ -55,6 +35,21 @@ import com.shopizer.search.services.field.LongField;
import com.shopizer.search.services.field.StringField;
import com.shopizer.search.utils.SearchClient;
+import io.searchbox.action.Action;
+import io.searchbox.client.JestClient;
+import io.searchbox.client.JestResult;
+import io.searchbox.core.Bulk;
+import io.searchbox.core.Delete;
+import io.searchbox.core.Get;
+import io.searchbox.core.Index;
+import io.searchbox.core.Search;
+import io.searchbox.core.SearchResult;
+import io.searchbox.core.search.aggregation.TermsAggregation;
+import io.searchbox.indices.CreateIndex;
+import io.searchbox.indices.IndicesExists;
+import io.searchbox.indices.mapping.PutMapping;
+import io.searchbox.params.Parameters;
+
/**
* https://www.found.no/foundation/java-clients-for-elasticsearch/
* https://github.com/searchbox-io/Jest/blob/master/jest/README.md
@@ -182,10 +177,11 @@ public class SearchDelegateImpl implements SearchDelegate {
CreateIndex.Builder createIndex = new CreateIndex.Builder(index);
- //.Builder(index);
+
+ //set settings to the index
if(settings!=null) {
createIndex.settings(
- Settings.builder()
+ Settings.settingsBuilder()
.loadFromSource(settings)
.build()
.getAsMap());
diff --git a/sm-search/src/test/java/com/shopizer/test/TestDelete.java b/sm-search/src/test/java/com/shopizer/test/TestDelete.java
index d0a4abf..28776b9 100644
--- a/sm-search/src/test/java/com/shopizer/test/TestDelete.java
+++ b/sm-search/src/test/java/com/shopizer/test/TestDelete.java
@@ -2,6 +2,7 @@ package com.shopizer.test;
import javax.inject.Inject;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@@ -23,13 +24,13 @@ import com.shopizer.search.services.SearchService;
/**
* @author carlsamson
*/
+@Ignore
public class TestDelete {
@Inject
private SearchService searchService;
@Test
- //@Ignore
public void testDelete() throws Exception {
searchService.deleteObject("product_en_default", "product_en", "1");
diff --git a/sm-search/src/test/java/com/shopizer/test/TestGet.java b/sm-search/src/test/java/com/shopizer/test/TestGet.java
index 5e3c43c..a021b19 100644
--- a/sm-search/src/test/java/com/shopizer/test/TestGet.java
+++ b/sm-search/src/test/java/com/shopizer/test/TestGet.java
@@ -32,18 +32,20 @@ import com.shopizer.search.services.SearchService;
* @author carlsamson
*
*/
+//@Ignore
public class TestGet {
@Inject
private SearchService searchService;
@Test
- //@Ignore
public void testGet() throws Exception {
/** requires to index at least a product first **/
GetResponse response = searchService.getObject("product_en_default", "product_en", "1");
+ Assert.notNull(response);
+
Map<String, Object> fieldMap = response.getFieldMap();
diff --git a/sm-search/src/test/java/com/shopizer/test/TestIndex.java b/sm-search/src/test/java/com/shopizer/test/TestIndex.java
index e301fc5..1795022 100644
--- a/sm-search/src/test/java/com/shopizer/test/TestIndex.java
+++ b/sm-search/src/test/java/com/shopizer/test/TestIndex.java
@@ -37,13 +37,13 @@ import com.shopizer.search.services.SearchService;
* @author carlsamson
*
*/
+@Ignore
public class TestIndex {
@Inject
private SearchService searchService;
- //@Test
- @Ignore
+ @Test
public void testIndex() throws Exception {
//String jsonData = "{\"id\":\"1\",\"name\":\"Sac de plage en tissu recyclé M4858\",\"price\":\"45.99\",\"categories\":[\"sac\",\"accessoires\"],\"store\":\"default\",\"availability\":\"*\",\"available\":\"true\",\"lang\":\"fr\",\"description\":\"Sac de plage vintage en tissu et cuir recyclés\"}";
diff --git a/sm-search/src/test/java/com/shopizer/test/TestSearch.java b/sm-search/src/test/java/com/shopizer/test/TestSearch.java
index 22fe1bf..7b8ef8b 100644
--- a/sm-search/src/test/java/com/shopizer/test/TestSearch.java
+++ b/sm-search/src/test/java/com/shopizer/test/TestSearch.java
@@ -60,14 +60,13 @@ import com.shopizer.search.services.SearchService;
DependencyInjectionTestExecutionListener.class,
})
-
+@Ignore
public class TestSearch {
@Inject
private SearchService searchService;
- //@Test
- @Ignore
+ @Test
public void testSearch() throws Exception {
String facets = "\"aggregations\": {\"categories\": {\"terms\": {\"field\": \"categories\"}},\"manufacturer\": {\"terms\": {\"field\": \"manufacturer\"}}}";
diff --git a/sm-search/src/test/java/com/shopizer/test/TestSearchKeywords.java b/sm-search/src/test/java/com/shopizer/test/TestSearchKeywords.java
index 8907bc3..04145fa 100644
--- a/sm-search/src/test/java/com/shopizer/test/TestSearchKeywords.java
+++ b/sm-search/src/test/java/com/shopizer/test/TestSearchKeywords.java
@@ -2,6 +2,7 @@ package com.shopizer.test;
import javax.inject.Inject;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@@ -39,14 +40,13 @@ import com.shopizer.search.services.SearchService;
DependencyInjectionTestExecutionListener.class,
})
-
+@Ignore
public class TestSearchKeywords {
@Inject
private SearchService searchService;
@Test
- //@Ignore
public void testSearchKeywords() throws Exception {
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 3e76762..1e8d04d 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Thu Nov 10 09:33:21 EST 2016
+#Fri Nov 11 10:11:04 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
index fe57587..b2fdf80 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
@@ -28,8 +28,8 @@
<org.aspectj-version>1.6.10</org.aspectj-version>
- <org.elasticsearch-version>2.3.4</org.elasticsearch-version>
- <io.searchbox.jest-version>2.0.2</io.searchbox.jest-version>
+ <org.elasticsearch-version>2.4.1</org.elasticsearch-version>
+ <io.searchbox.jest-version>2.0.3</io.searchbox.jest-version>
@@ -86,24 +86,7 @@
<version>${org.aspectj-version}</version>
</dependency>
- <!-- Logging -->
-<!-- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j-version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${org.slf4j-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j-version}</version>
- <scope>runtime</scope>
- </dependency> -->
+
<!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
<dependency>
sm-shop/.classpath 2(+1 -1)
diff --git a/sm-shop/.classpath b/sm-shop/.classpath
index b130f32..fc5f96c 100644
--- a/sm-shop/.classpath
+++ b/sm-shop/.classpath
@@ -27,7 +27,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index 1d54bba..6ed751c 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 35395bc..859c9c4 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index 75e0b53..15330c2 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
#FileLock
-#Thu Nov 10 17:00:59 EST 2016
-id=158504214a9b9ec0e9905fe7daf7562c5c9906b555b
+#Fri Nov 11 10:14:48 EST 2016
+id=15853f4987273bb1fbaeab7ec544c11143710108c1e
method=file
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class
index 78fda20..8f1d36d 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class
index 80b4d9a..e812413 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class
index 2750625..603320f 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class
index 153010d..f3be656 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class differ
diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class
index 75db926..3b97392 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class differ
diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index c42bea6..e0f1b8b 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Thu Nov 10 16:48:39 EST 2016
+#Fri Nov 11 10:11:07 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop