This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 967cf84e047a08070f31f6fc5a0ed743618cf137 Author: Alex Rudyy <[email protected]> AuthorDate: Sun Sep 19 20:41:17 2021 +0100 QPID-8548: [Broker-J] Fix import order and formatting --- .../security/access/config/AclFileParser.java | 31 ++-- .../security/access/config/AclFileParserTest.java | 156 ++++++++++++--------- .../security/access/config/RuleSetCreatorTest.java | 52 +++++-- 3 files changed, 146 insertions(+), 93 deletions(-) diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java index 08ee994..ded49e9 100644 --- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java +++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java @@ -20,13 +20,6 @@ */ package org.apache.qpid.server.security.access.config; -import org.apache.qpid.server.configuration.IllegalConfigurationException; -import org.apache.qpid.server.logging.EventLoggerProvider; -import org.apache.qpid.server.security.Result; -import org.apache.qpid.server.security.access.plugins.RuleOutcome; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -50,6 +43,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.EventLoggerProvider; +import org.apache.qpid.server.security.Result; +import org.apache.qpid.server.security.access.plugins.RuleOutcome; + public final class AclFileParser { private static final Logger LOGGER = LoggerFactory.getLogger(AclFileParser.class); @@ -378,13 +379,17 @@ public final class AclFileParser return parseEnum(OBJECT_TYPE_MAP, text, line, "object type"); } - private <T extends Enum<T>> T parseEnum(final Map<String, T> map, final String text, final int line, final String typeDescription) + private <T extends Enum<T>> T parseEnum(final Map<String, T> map, + final String text, + final int line, + final String typeDescription) { - return Optional.ofNullable( - map.get(text.toUpperCase(Locale.ENGLISH)) - ).orElseThrow( - () -> new IllegalConfigurationException(String.format(PARSE_TOKEN_FAILED_MSG, line), - new IllegalArgumentException(String.format(INVALID_ENUM, typeDescription, text)))); + return Optional.ofNullable(map.get(text.toUpperCase(Locale.ENGLISH))) + .orElseThrow(() -> new IllegalConfigurationException(String.format(PARSE_TOKEN_FAILED_MSG, line), + new IllegalArgumentException(String.format( + INVALID_ENUM, + typeDescription, + text)))); } private Reader getReaderFromURLString(String urlString) diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java index 7cc1d0b..c1203ca 100644 --- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java +++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java @@ -18,13 +18,12 @@ */ package org.apache.qpid.server.security.access.config; -import org.apache.qpid.server.configuration.IllegalConfigurationException; -import org.apache.qpid.server.logging.EventLoggerProvider; -import org.apache.qpid.server.security.Result; -import org.apache.qpid.server.security.access.config.ObjectProperties.Property; -import org.apache.qpid.test.utils.UnitTestBase; -import org.junit.Test; -import org.mockito.Mockito; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; import java.io.File; import java.io.FileWriter; @@ -33,12 +32,14 @@ import java.io.PrintWriter; import java.io.Reader; import java.nio.CharBuffer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; +import org.junit.Test; +import org.mockito.Mockito; + +import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.EventLoggerProvider; +import org.apache.qpid.server.security.Result; +import org.apache.qpid.server.security.access.config.ObjectProperties.Property; +import org.apache.qpid.test.utils.UnitTestBase; public class AclFileParserTest extends UnitTestBase { @@ -318,8 +319,8 @@ public class AclFileParserTest extends UnitTestBase final ObjectProperties expectedProperties = new ObjectProperties(); expectedProperties.setName("value"); assertEquals("Rule has unexpected object properties", - expectedProperties, - rule.getAclAction().getAction().getProperties()); + expectedProperties, + rule.getAclAction().getAction().getProperties()); } /** @@ -338,8 +339,8 @@ public class AclFileParserTest extends UnitTestBase final ObjectProperties expectedProperties = new ObjectProperties(); expectedProperties.setName("value"); assertEquals("Rule has unexpected object properties", - expectedProperties, - rule.getAclAction().getAction().getProperties()); + expectedProperties, + rule.getAclAction().getAction().getProperties()); } /** @@ -358,7 +359,9 @@ public class AclFileParserTest extends UnitTestBase final ObjectProperties expectedProperties = new ObjectProperties(); expectedProperties.setName("name1"); expectedProperties.put(Property.OWNER, "owner1"); - assertEquals("Rule has unexpected operation", expectedProperties, rule.getAclAction().getAction().getProperties()); + assertEquals("Rule has unexpected operation", + expectedProperties, + rule.getAclAction().getAction().getProperties()); } /** @@ -369,8 +372,8 @@ public class AclFileParserTest extends UnitTestBase public void testValidRuleWithWildcardProperties() throws Exception { final RuleSet rules = writeACLConfig("ACL ALLOW all CREATE EXCHANGE routingKey = 'news.#'", - "ACL ALLOW all CREATE EXCHANGE routingKey = 'news.co.#'", - "ACL ALLOW all CREATE EXCHANGE routingKey = *.co.medellin"); + "ACL ALLOW all CREATE EXCHANGE routingKey = 'news.co.#'", + "ACL ALLOW all CREATE EXCHANGE routingKey = *.co.medellin"); assertEquals(3, rules.getAllRules().size()); final Rule rule1 = rules.getAllRules().get(0); @@ -380,45 +383,45 @@ public class AclFileParserTest extends UnitTestBase final ObjectProperties expectedProperties1 = new ObjectProperties(); expectedProperties1.put(Property.ROUTING_KEY, "news.#"); assertEquals("Rule has unexpected object properties", - expectedProperties1, - rule1.getAclAction().getAction().getProperties()); + expectedProperties1, + rule1.getAclAction().getAction().getProperties()); final Rule rule2 = rules.getAllRules().get(1); final ObjectProperties expectedProperties2 = new ObjectProperties(); expectedProperties2.put(Property.ROUTING_KEY, "news.co.#"); assertEquals("Rule has unexpected object properties", - expectedProperties2, - rule2.getAclAction().getAction().getProperties()); + expectedProperties2, + rule2.getAclAction().getAction().getProperties()); final Rule rule3 = rules.getAllRules().get(2); final ObjectProperties expectedProperties3 = new ObjectProperties(); expectedProperties3.put(Property.ROUTING_KEY, "*.co.medellin"); assertEquals("Rule has unexpected object properties", - expectedProperties3, - rule3.getAclAction().getAction().getProperties()); + expectedProperties3, + rule3.getAclAction().getAction().getProperties()); } @Test public void testOrderedValidRule() throws Exception { final RuleSet rules = writeACLConfig("5 ACL DENY all CREATE EXCHANGE", - "3 ACL ALLOW all CREATE EXCHANGE routingKey = 'news.co.#'", - "1 ACL ALLOW all CREATE EXCHANGE routingKey = *.co.medellin"); + "3 ACL ALLOW all CREATE EXCHANGE routingKey = 'news.co.#'", + "1 ACL ALLOW all CREATE EXCHANGE routingKey = *.co.medellin"); assertEquals(3, rules.getAllRules().size()); final Rule rule1 = rules.getAllRules().get(0); final ObjectProperties expectedProperties3 = new ObjectProperties(); expectedProperties3.put(Property.ROUTING_KEY, "*.co.medellin"); assertEquals("Rule has unexpected object properties", - expectedProperties3, - rule1.getAclAction().getAction().getProperties()); + expectedProperties3, + rule1.getAclAction().getAction().getProperties()); final Rule rule3 = rules.getAllRules().get(1); final ObjectProperties expectedProperties2 = new ObjectProperties(); expectedProperties2.put(Property.ROUTING_KEY, "news.co.#"); assertEquals("Rule has unexpected object properties", - expectedProperties2, - rule3.getAclAction().getAction().getProperties()); + expectedProperties2, + rule3.getAclAction().getAction().getProperties()); final Rule rule5 = rules.getAllRules().get(2); assertEquals("Rule has unexpected identity", "all", rule5.getIdentity()); @@ -426,8 +429,8 @@ public class AclFileParserTest extends UnitTestBase assertEquals("Rule has unexpected operation", ObjectType.EXCHANGE, rule5.getAction().getObjectType()); final ObjectProperties expectedProperties1 = new ObjectProperties(); assertEquals("Rule has unexpected object properties", - expectedProperties1, - rule5.getAclAction().getAction().getProperties()); + expectedProperties1, + rule5.getAclAction().getAction().getProperties()); } @Test @@ -436,8 +439,8 @@ public class AclFileParserTest extends UnitTestBase try { writeACLConfig("5 ACL DENY all CREATE EXCHANGE", - "3 ACL ALLOW all CREATE EXCHANGE routingKey = 'news.co.#'", - "5 ACL ALLOW all CREATE EXCHANGE routingKey = *.co.medellin"); + "3 ACL ALLOW all CREATE EXCHANGE routingKey = 'news.co.#'", + "5 ACL ALLOW all CREATE EXCHANGE routingKey = *.co.medellin"); fail("fail"); } catch (IllegalConfigurationException ce) @@ -469,8 +472,8 @@ public class AclFileParserTest extends UnitTestBase assertEquals("Rule has unexpected operation", ObjectType.EXCHANGE, rule.getAction().getObjectType()); final ObjectProperties expectedProperties = new ObjectProperties("AmQ.dIrect"); assertEquals("Rule has unexpected object properties", - expectedProperties, - rule.getAclAction().getAction().getProperties()); + expectedProperties, + rule.getAclAction().getAction().getProperties()); } /** @@ -482,8 +485,8 @@ public class AclFileParserTest extends UnitTestBase public void testCommentsSupported() throws Exception { final RuleSet rules = writeACLConfig("#Comment", - "ACL DENY-LOG user1 ACCESS VIRTUALHOST # another comment", - " # final comment with leading whitespace"); + "ACL DENY-LOG user1 ACCESS VIRTUALHOST # another comment", + " # final comment with leading whitespace"); assertEquals(1, rules.getAllRules().size()); final Rule rule = rules.getAllRules().get(0); @@ -491,8 +494,8 @@ public class AclFileParserTest extends UnitTestBase assertEquals("Rule has unexpected operation", LegacyOperation.ACCESS, rule.getAction().getOperation()); assertEquals("Rule has unexpected operation", ObjectType.VIRTUALHOST, rule.getAction().getObjectType()); assertEquals("Rule has unexpected object properties", - EMPTY, - rule.getAclAction().getAction().getProperties()); + EMPTY, + rule.getAclAction().getAction().getProperties()); } /** @@ -531,7 +534,7 @@ public class AclFileParserTest extends UnitTestBase public void testLineContinuation() throws Exception { final RuleSet rules = writeACLConfig("ACL DENY-LOG user1 \\", - "ACCESS VIRTUALHOST"); + "ACCESS VIRTUALHOST"); assertEquals(1, rules.getAllRules().size()); final Rule rule = rules.getAllRules().get(0); @@ -539,56 +542,56 @@ public class AclFileParserTest extends UnitTestBase assertEquals("Rule has unexpected operation", LegacyOperation.ACCESS, rule.getAction().getOperation()); assertEquals("Rule has unexpected operation", ObjectType.VIRTUALHOST, rule.getAction().getObjectType()); assertEquals("Rule has unexpected object properties", - EMPTY, - rule.getAclAction().getAction().getProperties()); + EMPTY, + rule.getAclAction().getAction().getProperties()); } @Test public void testUserRuleParsing() throws Exception { validateRule(writeACLConfig("ACL ALLOW user1 CREATE USER"), - "user1", LegacyOperation.CREATE, ObjectType.USER, EMPTY); + "user1", LegacyOperation.CREATE, ObjectType.USER, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 CREATE USER name=\"otherUser\""), - "user1", LegacyOperation.CREATE, ObjectType.USER, new ObjectProperties("otherUser")); + "user1", LegacyOperation.CREATE, ObjectType.USER, new ObjectProperties("otherUser")); validateRule(writeACLConfig("ACL ALLOW user1 DELETE USER"), - "user1", LegacyOperation.DELETE, ObjectType.USER, EMPTY); + "user1", LegacyOperation.DELETE, ObjectType.USER, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 DELETE USER name=\"otherUser\""), - "user1", LegacyOperation.DELETE, ObjectType.USER, new ObjectProperties("otherUser")); + "user1", LegacyOperation.DELETE, ObjectType.USER, new ObjectProperties("otherUser")); validateRule(writeACLConfig("ACL ALLOW user1 UPDATE USER"), - "user1", LegacyOperation.UPDATE, ObjectType.USER, EMPTY); + "user1", LegacyOperation.UPDATE, ObjectType.USER, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 UPDATE USER name=\"otherUser\""), - "user1", LegacyOperation.UPDATE, ObjectType.USER, new ObjectProperties("otherUser")); + "user1", LegacyOperation.UPDATE, ObjectType.USER, new ObjectProperties("otherUser")); validateRule(writeACLConfig("ACL ALLOW user1 ALL USER"), - "user1", LegacyOperation.ALL, ObjectType.USER, EMPTY); + "user1", LegacyOperation.ALL, ObjectType.USER, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 ALL USER name=\"otherUser\""), - "user1", LegacyOperation.ALL, ObjectType.USER, new ObjectProperties("otherUser")); + "user1", LegacyOperation.ALL, ObjectType.USER, new ObjectProperties("otherUser")); } @Test public void testGroupRuleParsing() throws Exception { validateRule(writeACLConfig("ACL ALLOW user1 CREATE GROUP"), - "user1", LegacyOperation.CREATE, ObjectType.GROUP, EMPTY); + "user1", LegacyOperation.CREATE, ObjectType.GROUP, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 CREATE GROUP name=\"groupName\""), - "user1", LegacyOperation.CREATE, ObjectType.GROUP, new ObjectProperties("groupName")); + "user1", LegacyOperation.CREATE, ObjectType.GROUP, new ObjectProperties("groupName")); validateRule(writeACLConfig("ACL ALLOW user1 DELETE GROUP"), - "user1", LegacyOperation.DELETE, ObjectType.GROUP, EMPTY); + "user1", LegacyOperation.DELETE, ObjectType.GROUP, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 DELETE GROUP name=\"groupName\""), - "user1", LegacyOperation.DELETE, ObjectType.GROUP, new ObjectProperties("groupName")); + "user1", LegacyOperation.DELETE, ObjectType.GROUP, new ObjectProperties("groupName")); validateRule(writeACLConfig("ACL ALLOW user1 UPDATE GROUP"), - "user1", LegacyOperation.UPDATE, ObjectType.GROUP, EMPTY); + "user1", LegacyOperation.UPDATE, ObjectType.GROUP, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 UPDATE GROUP name=\"groupName\""), - "user1", LegacyOperation.UPDATE, ObjectType.GROUP, new ObjectProperties("groupName")); + "user1", LegacyOperation.UPDATE, ObjectType.GROUP, new ObjectProperties("groupName")); validateRule(writeACLConfig("ACL ALLOW user1 ALL GROUP"), - "user1", LegacyOperation.ALL, ObjectType.GROUP, EMPTY); + "user1", LegacyOperation.ALL, ObjectType.GROUP, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 ALL GROUP name=\"groupName\""), - "user1", LegacyOperation.ALL, ObjectType.GROUP, new ObjectProperties("groupName")); + "user1", LegacyOperation.ALL, ObjectType.GROUP, new ObjectProperties("groupName")); } /** @@ -626,24 +629,32 @@ public class AclFileParserTest extends UnitTestBase public void testManagementRuleParsing() throws Exception { validateRule(writeACLConfig("ACL ALLOW user1 ALL MANAGEMENT"), - "user1", LegacyOperation.ALL, ObjectType.MANAGEMENT, EMPTY); + "user1", LegacyOperation.ALL, ObjectType.MANAGEMENT, EMPTY); validateRule(writeACLConfig("ACL ALLOW user1 ACCESS MANAGEMENT"), - "user1", LegacyOperation.ACCESS, ObjectType.MANAGEMENT, EMPTY); + "user1", LegacyOperation.ACCESS, ObjectType.MANAGEMENT, EMPTY); } @Test public void testDynamicRuleParsing() throws Exception { validateRule(writeACLConfig("ACL ALLOW all ACCESS VIRTUALHOST connection_limit=10 connection_frequency_limit=12"), - Rule.ALL, LegacyOperation.ACCESS, ObjectType.VIRTUALHOST, EMPTY); + Rule.ALL, LegacyOperation.ACCESS, ObjectType.VIRTUALHOST, EMPTY); } @Test public void testBrokerRuleParsing() throws Exception { - validateRule(writeACLConfig("ACL ALLOW user1 CONFIGURE BROKER"), "user1", LegacyOperation.CONFIGURE, ObjectType.BROKER, EMPTY); - validateRule(writeACLConfig("ACL ALLOW user1 ALL BROKER"), "user1", LegacyOperation.ALL, ObjectType.BROKER, EMPTY); + validateRule(writeACLConfig("ACL ALLOW user1 CONFIGURE BROKER"), + "user1", + LegacyOperation.CONFIGURE, + ObjectType.BROKER, + EMPTY); + validateRule(writeACLConfig("ACL ALLOW user1 ALL BROKER"), + "user1", + LegacyOperation.ALL, + ObjectType.BROKER, + EMPTY); } @Test @@ -676,7 +687,8 @@ public class AclFileParserTest extends UnitTestBase doThrow(RuntimeException.class).when(reader).read(); doThrow(RuntimeException.class).when(reader).read(Mockito.any(CharBuffer.class)); doThrow(RuntimeException.class).when(reader).read(Mockito.any(char[].class)); - doThrow(RuntimeException.class).when(reader).read(Mockito.any(char[].class), Mockito.anyInt(), Mockito.anyInt()); + doThrow(RuntimeException.class).when(reader) + .read(Mockito.any(char[].class), Mockito.anyInt(), Mockito.anyInt()); try { new AclFileParser().readAndParse(reader); @@ -688,13 +700,19 @@ public class AclFileParserTest extends UnitTestBase } } - private void validateRule(final RuleSet rules, String username, LegacyOperation operation, ObjectType objectType, ObjectProperties objectProperties) + private void validateRule(final RuleSet rules, + String username, + LegacyOperation operation, + ObjectType objectType, + ObjectProperties objectProperties) { assertEquals(1, rules.getAllRules().size()); final Rule rule = rules.getAllRules().get(0); assertEquals("Rule has unexpected identity", username, rule.getIdentity()); assertEquals("Rule has unexpected operation", operation, rule.getAction().getOperation()); assertEquals("Rule has unexpected operation", objectType, rule.getAction().getObjectType()); - assertEquals("Rule has unexpected object properties", objectProperties, rule.getAclAction().getAction().getProperties()); + assertEquals("Rule has unexpected object properties", + objectProperties, + rule.getAclAction().getAction().getProperties()); } } diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleSetCreatorTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleSetCreatorTest.java index e0508fb..98d543b 100644 --- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleSetCreatorTest.java +++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleSetCreatorTest.java @@ -18,28 +18,48 @@ */ package org.apache.qpid.server.security.access.config; -import junit.framework.TestCase; -import org.apache.qpid.server.logging.EventLoggerProvider; -import org.apache.qpid.server.security.access.plugins.RuleOutcome; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.junit.Test; import org.mockito.Mockito; -public class RuleSetCreatorTest extends TestCase +import org.apache.qpid.server.logging.EventLoggerProvider; +import org.apache.qpid.server.security.access.plugins.RuleOutcome; +import org.apache.qpid.test.utils.UnitTestBase; + +public class RuleSetCreatorTest extends UnitTestBase { @Test public void testAddRule() { final RuleSetCreator creator = new RuleSetCreator(); creator.addRule(4, Rule.ALL, RuleOutcome.ALLOW, LegacyOperation.ACCESS); - creator.addRule(3, Rule.ALL, RuleOutcome.DENY, LegacyOperation.PUBLISH, ObjectType.EXCHANGE, new AclRulePredicates()); + creator.addRule(3, + Rule.ALL, + RuleOutcome.DENY, + LegacyOperation.PUBLISH, + ObjectType.EXCHANGE, + new AclRulePredicates()); creator.addRule(6, Rule.ALL, RuleOutcome.ALLOW, LegacyOperation.ACCESS); - creator.addRule(7, Rule.ALL, RuleOutcome.DENY, LegacyOperation.PUBLISH, ObjectType.EXCHANGE, new AclRulePredicates()); + creator.addRule(7, + Rule.ALL, + RuleOutcome.DENY, + LegacyOperation.PUBLISH, + ObjectType.EXCHANGE, + new AclRulePredicates()); RuleSet ruleSet = creator.createRuleSet(Mockito.mock(EventLoggerProvider.class)); assertNotNull(ruleSet); assertEquals(2, ruleSet.getAllRules().size()); - assertEquals(new Rule(Rule.ALL, new AclAction(LegacyOperation.ACCESS), RuleOutcome.ALLOW), ruleSet.getAllRules().get(1)); - assertEquals(new Rule(Rule.ALL, new AclAction(LegacyOperation.PUBLISH, ObjectType.EXCHANGE, new AclRulePredicates()), RuleOutcome.DENY), ruleSet.getAllRules().get(0)); + assertEquals(new Rule(Rule.ALL, new AclAction(LegacyOperation.ACCESS), RuleOutcome.ALLOW), + ruleSet.getAllRules().get(1)); + assertEquals(new Rule(Rule.ALL, + new AclAction(LegacyOperation.PUBLISH, ObjectType.EXCHANGE, new AclRulePredicates()), + RuleOutcome.DENY), ruleSet.getAllRules().get(0)); } @Test @@ -48,7 +68,12 @@ public class RuleSetCreatorTest extends TestCase final RuleSetCreator creator = new RuleSetCreator(); try { - creator.addRule(3, Rule.ALL, RuleOutcome.DENY, LegacyOperation.DELETE, ObjectType.MANAGEMENT, new ObjectProperties()); + creator.addRule(3, + Rule.ALL, + RuleOutcome.DENY, + LegacyOperation.DELETE, + ObjectType.MANAGEMENT, + new ObjectProperties()); fail("An exception is required"); } catch (IllegalArgumentException e) @@ -62,8 +87,13 @@ public class RuleSetCreatorTest extends TestCase { final RuleSetCreator creator = new RuleSetCreator(); creator.addRule(4, Rule.ALL, RuleOutcome.ALLOW, LegacyOperation.ACCESS); - creator.addRule(3, Rule.ALL, RuleOutcome.DENY, LegacyOperation.PUBLISH, ObjectType.EXCHANGE, new AclRulePredicates()); + creator.addRule(3, + Rule.ALL, + RuleOutcome.DENY, + LegacyOperation.PUBLISH, + ObjectType.EXCHANGE, + new AclRulePredicates()); assertTrue(creator.isValidNumber(5)); assertFalse(creator.isValidNumber(4)); } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
