You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by js...@apache.org on 2023/05/12 09:34:26 UTC
[unomi] branch UNOMI-444-always-redeploy-objects created (now 5dc3cfaf6)
This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a change to branch UNOMI-444-always-redeploy-objects
in repository https://gitbox.apache.org/repos/asf/unomi.git
at 5dc3cfaf6 UNOMI-444 redeploy unomi objects in case they are modified (#264)
This branch includes the following new commits:
new 5dc3cfaf6 UNOMI-444 redeploy unomi objects in case they are modified (#264)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[unomi] 01/01: UNOMI-444 redeploy unomi objects in case they are modified (#264)
Posted by js...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch UNOMI-444-always-redeploy-objects
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 5dc3cfaf68c682da97c61acadfac8fb171925df7
Author: MT BENTERKI <be...@gmail.com>
AuthorDate: Wed Mar 17 14:47:46 2021 +0100
UNOMI-444 redeploy unomi objects in case they are modified (#264)
---
.../impl/definitions/DefinitionsServiceImpl.java | 18 +++---------
.../services/impl/goals/GoalsServiceImpl.java | 19 ++++---------
.../services/impl/profiles/ProfileServiceImpl.java | 32 ++++++++--------------
.../services/impl/rules/RulesServiceImpl.java | 9 ++----
.../services/impl/segments/SegmentServiceImpl.java | 18 +++---------
5 files changed, 26 insertions(+), 70 deletions(-)
diff --git a/services/src/main/java/org/apache/unomi/services/impl/definitions/DefinitionsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/definitions/DefinitionsServiceImpl.java
index 7d95a2749..1a9b02459 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/definitions/DefinitionsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/definitions/DefinitionsServiceImpl.java
@@ -194,13 +194,8 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
try {
ConditionType conditionType = CustomObjectMapper.getObjectMapper().readValue(predefinedConditionURL, ConditionType.class);
- // Register only if condition type does not exist yet
- if (getConditionType(conditionType.getMetadata().getId()) == null) {
- setConditionType(conditionType);
- logger.info("Predefined condition type with id {} registered", conditionType.getMetadata().getId());
- } else {
- logger.info("The predefined condition type with id {} is already registered, this condition type will be skipped", conditionType.getMetadata().getId());
- }
+ setConditionType(conditionType);
+ logger.info("Predefined condition type with id {} registered", conditionType.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading condition definition " + predefinedConditionURL, e);
}
@@ -220,13 +215,8 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
try {
ActionType actionType = CustomObjectMapper.getObjectMapper().readValue(predefinedActionURL, ActionType.class);
- // Register only if action type does not exist yet
- if (getActionType(actionType.getMetadata().getId()) == null) {
- setActionType(actionType);
- logger.info("Predefined action type with id {} registered", actionType.getMetadata().getId());
- } else {
- logger.info("The predefined action type with id {} is already registered, this action type will be skipped", actionType.getMetadata().getId());
- }
+ setActionType(actionType);
+ logger.info("Predefined action type with id {} registered", actionType.getMetadata().getId());
} catch (Exception e) {
logger.error("Error while loading action definition " + predefinedActionURL, e);
}
diff --git a/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java
index 76cfc0024..0f7a9aa6f 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java
@@ -123,13 +123,9 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
if (goal.getMetadata().getScope() == null) {
goal.getMetadata().setScope("systemscope");
}
- // Register only if goal does not exist yet
- if (getGoal(goal.getMetadata().getId()) == null) {
- setGoal(goal);
- logger.info("Predefined goal with id {} registered", goal.getMetadata().getId());
- } else {
- logger.info("The predefined goal with id {} is already registered, this goal will be skipped", goal.getMetadata().getId());
- }
+
+ setGoal(goal);
+ logger.info("Predefined goal with id {} registered", goal.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading segment definition " + predefinedGoalURL, e);
}
@@ -277,13 +273,8 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
try {
Campaign campaign = CustomObjectMapper.getObjectMapper().readValue(predefinedCampaignURL, Campaign.class);
- // Register only if campaign does not exist yet
- if (getCampaign(campaign.getMetadata().getId()) == null) {
- setCampaign(campaign);
- logger.info("Predefined campaign with id {} registered", campaign.getMetadata().getId());
- } else {
- logger.info("The predefined campaign with id {} is already registered, this campaign will be skipped", campaign.getMetadata().getId());
- }
+ setCampaign(campaign);
+ logger.info("Predefined campaign with id {} registered", campaign.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading segment definition " + predefinedCampaignURL, e);
}
diff --git a/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java
index 1b4aff4d5..09c355edf 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java
@@ -965,19 +965,14 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
PersonaWithSessions persona = getObjectMapper().readValue(predefinedPersonaURL, PersonaWithSessions.class);
String itemId = persona.getPersona().getItemId();
- // Register only if persona does not exist yet
- if (persistenceService.load(itemId, Persona.class) == null) {
- persistenceService.save(persona.getPersona());
-
- List<PersonaSession> sessions = persona.getSessions();
- for (PersonaSession session : sessions) {
- session.setProfile(persona.getPersona());
- persistenceService.save(session);
- }
- logger.info("Predefined persona with id {} registered", itemId);
- } else {
- logger.info("The predefined persona with id {} is already registered, this persona will be skipped", itemId);
+ persistenceService.save(persona.getPersona());
+
+ List<PersonaSession> sessions = persona.getSessions();
+ for (PersonaSession session : sessions) {
+ session.setProfile(persona.getPersona());
+ persistenceService.save(session);
}
+ logger.info("Predefined persona with id {} registered", itemId);
} catch (IOException e) {
logger.error("Error while loading persona " + predefinedPersonaURL, e);
}
@@ -997,17 +992,12 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
try {
PropertyType propertyType = CustomObjectMapper.getObjectMapper().readValue(predefinedPropertyTypeURL, PropertyType.class);
- // Register only if property type does not exist yet
- if (getPropertyType(propertyType.getMetadata().getId()) == null) {
- setPropertyTypeTarget(predefinedPropertyTypeURL, propertyType);
+ setPropertyTypeTarget(predefinedPropertyTypeURL, propertyType);
- persistenceService.save(propertyType);
- bundlePropertyTypes.add(propertyType);
- logger.info("Predefined property type with id {} registered", propertyType.getMetadata().getId());
- } else {
- logger.info("The predefined property type with id {} is already registered, this property type will be skipped", propertyType.getMetadata().getId());
- }
+ persistenceService.save(propertyType);
+ bundlePropertyTypes.add(propertyType);
+ logger.info("Predefined property type with id {} registered", propertyType.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading properties " + predefinedPropertyTypeURL, e);
}
diff --git a/services/src/main/java/org/apache/unomi/services/impl/rules/RulesServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/rules/RulesServiceImpl.java
index bb02955e0..08e2b96e7 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/rules/RulesServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/rules/RulesServiceImpl.java
@@ -152,13 +152,8 @@ public class RulesServiceImpl implements RulesService, EventListenerService, Syn
try {
Rule rule = CustomObjectMapper.getObjectMapper().readValue(predefinedRuleURL, Rule.class);
- // Register only if rule does not exist yet
- if (getRule(rule.getMetadata().getId()) == null) {
- setRule(rule);
- logger.info("Predefined rule with id {} registered", rule.getMetadata().getId());
- } else {
- logger.info("The predefined rule with id {} is already registered, this rule will be skipped", rule.getMetadata().getId());
- }
+ setRule(rule);
+ logger.info("Predefined rule with id {} registered", rule.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading rule definition " + predefinedRuleURL, e);
}
diff --git a/services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java
index e4794bceb..7fddde43d 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java
@@ -199,13 +199,8 @@ public class SegmentServiceImpl extends AbstractServiceImpl implements SegmentSe
if (segment.getMetadata().getScope() == null) {
segment.getMetadata().setScope("systemscope");
}
- // Register only if segment does not exist yet
- if (getSegmentDefinition(segment.getMetadata().getId()) == null) {
- setSegmentDefinition(segment);
- logger.info("Predefined segment with id {} registered", segment.getMetadata().getId());
- } else {
- logger.info("The predefined segment with id {} is already registered, this segment will be skipped", segment.getMetadata().getId());
- }
+ setSegmentDefinition(segment);
+ logger.info("Predefined segment with id {} registered", segment.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading segment definition " + predefinedSegmentURL, e);
}
@@ -227,13 +222,8 @@ public class SegmentServiceImpl extends AbstractServiceImpl implements SegmentSe
if (scoring.getMetadata().getScope() == null) {
scoring.getMetadata().setScope("systemscope");
}
- // Register only if scoring plan does not exist yet
- if (getScoringDefinition(scoring.getMetadata().getId()) == null) {
- setScoringDefinition(scoring);
- logger.info("Predefined scoring with id {} registered", scoring.getMetadata().getId());
- } else {
- logger.info("The predefined scoring with id {} is already registered, this scoring will be skipped", scoring.getMetadata().getId());
- }
+ setScoringDefinition(scoring);
+ logger.info("Predefined scoring with id {} registered", scoring.getMetadata().getId());
} catch (IOException e) {
logger.error("Error while loading segment definition " + predefinedScoringURL, e);
}