Repository: incubator-unomi Updated Branches: refs/heads/master 728296e6a -> e7054ad8f
UNOMI-128 Fix unit test compilation Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e7054ad8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e7054ad8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e7054ad8 Branch: refs/heads/master Commit: e7054ad8f6d16aa3fff9383cd13fa142b631c4d2 Parents: 728296e Author: Serge Huber <[email protected]> Authored: Tue Oct 31 14:12:40 2017 +0100 Committer: Serge Huber <[email protected]> Committed: Tue Oct 31 14:12:40 2017 +0100 ---------------------------------------------------------------------- .../router/api/services/ImportExportConfigurationService.java | 1 + .../src/test/java/org/apache/unomi/itests/ProfileExportIT.java | 6 ++++-- .../java/org/apache/unomi/itests/ProfileImportActorsIT.java | 2 +- .../java/org/apache/unomi/itests/ProfileImportBasicIT.java | 3 +-- .../java/org/apache/unomi/itests/ProfileImportRankingIT.java | 2 +- .../org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java | 2 +- .../java/org/apache/unomi/itests/ProfileImportSurfersIT.java | 2 +- .../apache/unomi/itests/ProfileImportSurfersOverwriteIT.java | 2 +- .../java/org/apache/unomi/itests/PropertiesUpdateActionIT.java | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportExportConfigurationService.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportExportConfigurationService.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportExportConfigurationService.java index 0ee8753..1cf670a 100644 --- a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportExportConfigurationService.java +++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportExportConfigurationService.java @@ -47,6 +47,7 @@ public interface ImportExportConfigurationService<T> { * Saves the specified import/export configuration in the context server. * * @param configuration the import/export configuration to be saved + * @param updateRunningRoute set to true if running routes should be updated too * @return the newly saved import/export configuration */ T save(T configuration, boolean updateRunningRoute); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java index b21db8f..1391497 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java @@ -45,7 +45,9 @@ import javax.inject.Inject; import javax.ws.rs.core.MediaType; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -110,7 +112,7 @@ public class ProfileExportIT extends BaseIT { exportConfiguration.getProperties().put("destination", "file://" + exportDir.getAbsolutePath() + "?fileName=profiles-actors-export.csv"); exportConfiguration.setActive(true); - ExportConfiguration savedExportConfig = exportConfigurationService.save(exportConfiguration); + ExportConfiguration savedExportConfig = exportConfigurationService.save(exportConfiguration, true); CloseableHttpClient httpclient = HttpClients.createDefault(); HttpPut httpPut = new HttpPut(URL + "/configUpdate/exportConfigAdmin"); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java index 7335754..c8de826 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java @@ -106,7 +106,7 @@ public class ProfileImportActorsIT extends BaseIT { importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&consumer.delay=10m&move=.done"); importConfigActors.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigActors); + ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigActors, true); CloseableHttpClient httpclient = HttpClients.createDefault(); HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java index c51f102..513c839 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java @@ -18,7 +18,6 @@ package org.apache.unomi.itests; import org.apache.unomi.api.PartialList; import org.apache.unomi.api.Profile; -import org.apache.unomi.api.PropertyType; import org.apache.unomi.api.services.ProfileService; import org.apache.unomi.router.api.ImportConfiguration; import org.apache.unomi.router.api.RouterConstants; @@ -75,7 +74,7 @@ public class ProfileImportBasicIT extends BaseIT { importConfiguration.getProperties().put("mapping", mapping); importConfiguration.setActive(true); - importConfigurationService.save(importConfiguration); + importConfigurationService.save(importConfiguration, true); } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java index 8633d8d..447b422 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java @@ -109,7 +109,7 @@ public class ProfileImportRankingIT extends BaseIT { importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&consumer.delay=10m&move=.done"); importConfigRanking.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigRanking); + ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigRanking, true); CloseableHttpClient httpclient = HttpClients.createDefault(); HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java index 7ee0e8e..4991e20 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java @@ -93,7 +93,7 @@ public class ProfileImportSurfersDeleteIT extends BaseIT { importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&consumer.delay=10m&move=.done"); importConfigSurfersDelete.setActive(true); - ImportConfiguration savedImportConfigDelete = importConfigurationService.save(importConfigSurfersDelete); + ImportConfiguration savedImportConfigDelete = importConfigurationService.save(importConfigSurfersDelete, true); CloseableHttpClient httpclient = HttpClients.createDefault(); HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java index e9ebcd4..df5ee49 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java @@ -103,7 +103,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=2-surfers-test.csv&consumer.delay=10m&move=.done"); importConfigSurfers.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers); + ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers, true); //Wait for data to be processed Thread.sleep(10000); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java index fb03b25..8f97c3f 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java @@ -93,7 +93,7 @@ public class ProfileImportSurfersOverwriteIT extends BaseIT { importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&consumer.delay=10m&move=.done"); importConfigSurfers.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers); + ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers, true); CloseableHttpClient httpclient = HttpClients.createDefault(); HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7054ad8/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java b/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java index e92aff8..6105b83 100644 --- a/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/PropertiesUpdateActionIT.java @@ -102,7 +102,7 @@ public class PropertiesUpdateActionIT extends BaseIT { propertyToUpdate.put("properties.firstName", "UPDATED FIRST NAME"); updateProperties.setProperty(UpdatePropertiesAction.PROPS_TO_UPDATE, propertyToUpdate); - updateProperties.setProperty(UpdatePropertiesAction.PROFILE_TARGET_ID_KEY, PROFILE_TEST_ID); + updateProperties.setProperty(UpdatePropertiesAction.TARGET_ID_KEY, PROFILE_TEST_ID); int changes = eventService.send(updateProperties); LOGGER.info("Changes of the event : {}", changes);
