You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by GitBox <gi...@apache.org> on 2021/06/24 16:43:07 UTC
[GitHub] [unomi] sergehuber opened a new pull request #314: UNOMI-492 Make rules engine more robust when some rules are invalid (null actions)
sergehuber opened a new pull request #314:
URL: https://github.com/apache/unomi/pull/314
Here's what was achieved in this PR:
- Make sure we handle null actions gracefully instead of generating a NPE and blocking loading of further rules
- Add an integration test to test the case of null actions in rule
- Improve logging when rules have null or empty conditions and actions
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [unomi] sergehuber commented on a change in pull request #314: UNOMI-492 Make rules engine more robust when some rules are invalid (null actions)
Posted by GitBox <gi...@apache.org>.
sergehuber commented on a change in pull request #314:
URL: https://github.com/apache/unomi/pull/314#discussion_r658622779
##########
File path: itests/src/test/java/org/apache/unomi/itests/RuleServiceIT.java
##########
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package org.apache.unomi.itests;
+
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.rules.Rule;
+import org.apache.unomi.api.services.DefinitionsService;
+import org.apache.unomi.api.services.RulesService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.junit.Before;
+import org.junit.Test;
+import org.ops4j.pax.exam.util.Filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Integration tests for the Unomi rule service.
+ */
+public class RuleServiceIT extends BaseIT {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(RuleServiceIT.class);
+
+ private final static String TEST_RULE_ID = "test-rule-id";
+ public static final String TEST_SCOPE = "test-scope";
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected RulesService rulesService;
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected PersistenceService persistenceService;
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected DefinitionsService definitionsService;
+
+ @Before
+ public void setUp() {
+ TestUtils.removeAllProfiles(definitionsService, persistenceService);
+ }
+
+ @Test
+ public void testRuleWithNullActions() throws InterruptedException {
+ Set<Metadata> ruleMetadatas = rulesService.getRuleMetadatas();
+ int initialRuleCount = ruleMetadatas.size();
+ Metadata metadata = new Metadata(TEST_RULE_ID);
+ metadata.setName(TEST_RULE_ID + "_name");
+ metadata.setDescription(TEST_RULE_ID + "_description");
+ metadata.setScope(TEST_SCOPE);
+ Rule nullRule = new Rule(metadata);
+ nullRule.setCondition(null);
+ nullRule.setActions(null);
+ rulesService.setRule(nullRule);
+ LOGGER.info("Waiting for rules to refresh from persistence...");
+ int loopCount = 0;
+ int lastRuleCount = initialRuleCount;
+ while (loopCount < 20 && lastRuleCount == initialRuleCount) {
+ Thread.sleep(1000);
+ ruleMetadatas = rulesService.getRuleMetadatas();
+ lastRuleCount = ruleMetadatas.size();
+ loopCount++;
+ }
+ assertEquals("Rule not properly saved", initialRuleCount + 1, lastRuleCount);
Review comment:
yes you are right I need to correct that. Thanks for catching it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [unomi] sergehuber merged pull request #314: UNOMI-492 Make rules engine more robust when some rules are invalid (null actions)
Posted by GitBox <gi...@apache.org>.
sergehuber merged pull request #314:
URL: https://github.com/apache/unomi/pull/314
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@unomi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [unomi] jkevan commented on a change in pull request #314: UNOMI-492 Make rules engine more robust when some rules are invalid (null actions)
Posted by GitBox <gi...@apache.org>.
jkevan commented on a change in pull request #314:
URL: https://github.com/apache/unomi/pull/314#discussion_r658519584
##########
File path: itests/src/test/java/org/apache/unomi/itests/RuleServiceIT.java
##########
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package org.apache.unomi.itests;
+
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.rules.Rule;
+import org.apache.unomi.api.services.DefinitionsService;
+import org.apache.unomi.api.services.RulesService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.junit.Before;
+import org.junit.Test;
+import org.ops4j.pax.exam.util.Filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Integration tests for the Unomi rule service.
+ */
+public class RuleServiceIT extends BaseIT {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(RuleServiceIT.class);
+
+ private final static String TEST_RULE_ID = "test-rule-id";
+ public static final String TEST_SCOPE = "test-scope";
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected RulesService rulesService;
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected PersistenceService persistenceService;
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected DefinitionsService definitionsService;
+
+ @Before
+ public void setUp() {
+ TestUtils.removeAllProfiles(definitionsService, persistenceService);
+ }
+
+ @Test
+ public void testRuleWithNullActions() throws InterruptedException {
+ Set<Metadata> ruleMetadatas = rulesService.getRuleMetadatas();
+ int initialRuleCount = ruleMetadatas.size();
+ Metadata metadata = new Metadata(TEST_RULE_ID);
+ metadata.setName(TEST_RULE_ID + "_name");
+ metadata.setDescription(TEST_RULE_ID + "_description");
+ metadata.setScope(TEST_SCOPE);
+ Rule nullRule = new Rule(metadata);
+ nullRule.setCondition(null);
+ nullRule.setActions(null);
+ rulesService.setRule(nullRule);
+ LOGGER.info("Waiting for rules to refresh from persistence...");
+ int loopCount = 0;
+ int lastRuleCount = initialRuleCount;
+ while (loopCount < 20 && lastRuleCount == initialRuleCount) {
+ Thread.sleep(1000);
+ ruleMetadatas = rulesService.getRuleMetadatas();
+ lastRuleCount = ruleMetadatas.size();
+ loopCount++;
+ }
+ assertEquals("Rule not properly saved", initialRuleCount + 1, lastRuleCount);
Review comment:
I think we should add a call to ruleService.getAllRules when it is registered.
Because the NPE from UNOMI-492 was generated at this moment:
```
java.lang.NullPointerException: null
at org.apache.unomi.services.impl.ParserHelper.resolveActionTypes(ParserHelper.java:101) ~[!/:?]
at org.apache.unomi.services.impl.rules.RulesServiceImpl.getAllRules(RulesServiceImpl.java:252) ~[!/:?]
```
ruleService.getRuleMetadatas() doesnt process the condition types and the actions.
ruleService.getRule(), ruleService.getAllRules() does
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [unomi] sergehuber commented on a change in pull request #314: UNOMI-492 Make rules engine more robust when some rules are invalid (null actions)
Posted by GitBox <gi...@apache.org>.
sergehuber commented on a change in pull request #314:
URL: https://github.com/apache/unomi/pull/314#discussion_r658766113
##########
File path: itests/src/test/java/org/apache/unomi/itests/RuleServiceIT.java
##########
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package org.apache.unomi.itests;
+
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.rules.Rule;
+import org.apache.unomi.api.services.DefinitionsService;
+import org.apache.unomi.api.services.RulesService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.junit.Before;
+import org.junit.Test;
+import org.ops4j.pax.exam.util.Filter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Integration tests for the Unomi rule service.
+ */
+public class RuleServiceIT extends BaseIT {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(RuleServiceIT.class);
+
+ private final static String TEST_RULE_ID = "test-rule-id";
+ public static final String TEST_SCOPE = "test-scope";
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected RulesService rulesService;
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected PersistenceService persistenceService;
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected DefinitionsService definitionsService;
+
+ @Before
+ public void setUp() {
+ TestUtils.removeAllProfiles(definitionsService, persistenceService);
+ }
+
+ @Test
+ public void testRuleWithNullActions() throws InterruptedException {
+ Set<Metadata> ruleMetadatas = rulesService.getRuleMetadatas();
+ int initialRuleCount = ruleMetadatas.size();
+ Metadata metadata = new Metadata(TEST_RULE_ID);
+ metadata.setName(TEST_RULE_ID + "_name");
+ metadata.setDescription(TEST_RULE_ID + "_description");
+ metadata.setScope(TEST_SCOPE);
+ Rule nullRule = new Rule(metadata);
+ nullRule.setCondition(null);
+ nullRule.setActions(null);
+ rulesService.setRule(nullRule);
+ LOGGER.info("Waiting for rules to refresh from persistence...");
+ int loopCount = 0;
+ int lastRuleCount = initialRuleCount;
+ while (loopCount < 20 && lastRuleCount == initialRuleCount) {
+ Thread.sleep(1000);
+ ruleMetadatas = rulesService.getRuleMetadatas();
+ lastRuleCount = ruleMetadatas.size();
+ loopCount++;
+ }
+ assertEquals("Rule not properly saved", initialRuleCount + 1, lastRuleCount);
Review comment:
Ok I've modified the test to simply use getRule
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@unomi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org