diff --git a/src/main/java/io/statnett/k3a/authz/ldap/utils/StringUtils.java b/src/main/java/io/statnett/k3a/authz/ldap/utils/StringUtils.java index 7386c1b..ea2acd5 100644 --- a/src/main/java/io/statnett/k3a/authz/ldap/utils/StringUtils.java +++ b/src/main/java/io/statnett/k3a/authz/ldap/utils/StringUtils.java @@ -3,7 +3,7 @@ public final class StringUtils { public static boolean isBlank(final String s) { - return s == null || s.trim().length() == 0; + return s == null || s.trim().isEmpty(); } } diff --git a/src/main/java/io/statnett/k3a/authz/ldap/utils/cache/TimeoutCache.java b/src/main/java/io/statnett/k3a/authz/ldap/utils/cache/TimeoutCache.java index 90d37fc..cc63875 100644 --- a/src/main/java/io/statnett/k3a/authz/ldap/utils/cache/TimeoutCache.java +++ b/src/main/java/io/statnett/k3a/authz/ldap/utils/cache/TimeoutCache.java @@ -1,6 +1,5 @@ package io.statnett.k3a.authz.ldap.utils.cache; -import io.statnett.k3a.authz.ldap.utils.time.SystemTimeProvider; import io.statnett.k3a.authz.ldap.utils.time.TimeProvider; import java.util.HashMap; @@ -13,10 +12,6 @@ public final class TimeoutCache private final TimeProvider timeProvider; private final Map> map = new HashMap<>(); - public TimeoutCache() { - timeProvider = SystemTimeProvider.getInstance(); - } - public TimeoutCache(final TimeProvider timeProvider) { this.timeProvider = timeProvider; } @@ -31,10 +26,6 @@ private CacheResult(final long whenTimeoutMs, final V value) { this.value = value; } - public long getWhenTimeoutMs() { - return whenTimeoutMs; - } - public V getValue() { return value; } diff --git a/src/main/java/io/statnett/k3a/authz/ldap/utils/time/SystemTimeProvider.java b/src/main/java/io/statnett/k3a/authz/ldap/utils/time/SystemTimeProvider.java index 9aa0ef1..463dc25 100644 --- a/src/main/java/io/statnett/k3a/authz/ldap/utils/time/SystemTimeProvider.java +++ b/src/main/java/io/statnett/k3a/authz/ldap/utils/time/SystemTimeProvider.java @@ -3,12 +3,6 @@ public final class SystemTimeProvider implements TimeProvider { - private static final SystemTimeProvider INSTANCE = new SystemTimeProvider(); - - public static SystemTimeProvider getInstance() { - return INSTANCE; - } - @Override public long currentTimeMillis() { return System.currentTimeMillis(); diff --git a/src/test/java/io/statnett/k3a/authz/ldap/AbstractLdapAuthenticateCallbackHandlerIntegrationIT.java b/src/test/java/io/statnett/k3a/authz/ldap/AbstractLdapAuthenticateCallbackHandlerIntegrationIT.java index 5d76636..5fa1672 100644 --- a/src/test/java/io/statnett/k3a/authz/ldap/AbstractLdapAuthenticateCallbackHandlerIntegrationIT.java +++ b/src/test/java/io/statnett/k3a/authz/ldap/AbstractLdapAuthenticateCallbackHandlerIntegrationIT.java @@ -38,7 +38,8 @@ public abstract class AbstractLdapAuthenticateCallbackHandlerIntegrationIT { private static final String TOPIC_WITH_USER_ALLOW = "topic_with_user_principal"; private static final String TOPIC_WITH_GROUP_ALLOW = "topic_with_group_principal"; - public static final String JAAS_ADMIN_USER_LINE = "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"kafka\" password=\"kafka\" user_kafka=\"kafka\";"; + private static final String JAAS_ADMIN_USER_LINE = "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"kafka\" password=\"kafka\" user_kafka=\"kafka\";"; + private static final String ANY_HOST = "*"; private static LdapServer ldapServer; private static K3aEmbedded kafka; @@ -169,33 +170,37 @@ private void produce(final Producer producer, final String topi producer.flush(); } - public void addTopic(final String topicName) { + private void addTopic(final String topicName) { final NewTopic newTopic = new NewTopic(topicName, 1, (short) 1); try (final Admin admin = getSuperAdmin()) { admin.createTopics(Collections.singleton(newTopic)); } } - public void addProducer(final String topicName, final String principal) { + private void addProducer(final String topicName, final String principal) { addProducer(topicName, principal, AclPermissionType.ALLOW); } - public void addDeniedProducer(final String topicName, final String principal) { + private void addDeniedProducer(final String topicName, final String principal) { addProducer(topicName, principal, AclPermissionType.DENY); } private void addProducer(final String topicName, final String principal, final AclPermissionType permissionType) { - final AclBinding describeAclBinding = createBinding(topicName, principal, AclOperation.DESCRIBE, permissionType); - final AclBinding writeAclBinding = createBinding(topicName, principal, AclOperation.WRITE, permissionType); + final AclBinding describeAclBinding = createLiteralBinding(topicName, principal, AclOperation.DESCRIBE, permissionType); + final AclBinding writeAclBinding = createLiteralBinding(topicName, principal, AclOperation.WRITE, permissionType); final Collection aclBindings = Arrays.asList(describeAclBinding, writeAclBinding); try (final Admin admin = getSuperAdmin()) { admin.createAcls(aclBindings); } } - private AclBinding createBinding(final String topicName, final String principal, final AclOperation operation, final AclPermissionType permissionType) { - final ResourcePattern resourcePattern = new ResourcePattern(ResourceType.TOPIC, topicName, PatternType.LITERAL); - final AccessControlEntry accessControlEntry = new AccessControlEntry(principal, "*", operation, permissionType); + private AclBinding createLiteralBinding(final String topicName, final String principal, final AclOperation operation, final AclPermissionType permissionType) { + return createBinding(topicName, PatternType.LITERAL, principal, operation, permissionType); + } + + private AclBinding createBinding(final String topicName, final PatternType patternType, final String principal, final AclOperation operation, final AclPermissionType permissionType) { + final ResourcePattern resourcePattern = new ResourcePattern(ResourceType.TOPIC, topicName, patternType); + final AccessControlEntry accessControlEntry = new AccessControlEntry(principal, ANY_HOST, operation, permissionType); return new AclBinding(resourcePattern, accessControlEntry); } @@ -210,21 +215,21 @@ private static String assertValidUsernameAndPassword(final String s) { return s; } - public Admin getSuperAdmin() { + private Admin getSuperAdmin() { return getAdmin("kafka", "kafka"); } - public Admin getAdmin(final String username, final String password) { + private Admin getAdmin(final String username, final String password) { return AdminClient.create(getSaslConfig(username, password)); } - public Producer getProducer(final String username, final String password) { + private Producer getProducer(final String username, final String password) { final Map config = K3aTestUtils.producerProps(kafka); config.putAll(getSaslConfig(username, password)); return new KafkaProducer<>(config); } - public Map getSaslConfig(final String username, final String password) { + private Map getSaslConfig(final String username, final String password) { final Map map = new HashMap<>(); map.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServersForAdditionalPort(0)); map.put("security.protocol", "SASL_PLAINTEXT"); diff --git a/src/test/java/io/statnett/k3a/authz/ldap/LdapServer.java b/src/test/java/io/statnett/k3a/authz/ldap/LdapServer.java index aedaefc..391164d 100644 --- a/src/test/java/io/statnett/k3a/authz/ldap/LdapServer.java +++ b/src/test/java/io/statnett/k3a/authz/ldap/LdapServer.java @@ -10,7 +10,6 @@ public final class LdapServer { - private static final String LDAP_DOMAIN = "example.com"; private static final String LDAP_BASE_DN = "dc=example,dc=com"; public static final String LDAP_ADMIN_DN = "cn=admin," + LDAP_BASE_DN; public static final String LDAP_ADMIN_PASSWORD = "admin"; diff --git a/src/test/java/io/statnett/k3a/authz/ldap/utils/LdapUtilsTest.java b/src/test/java/io/statnett/k3a/authz/ldap/utils/LdapUtilsTest.java index c0a59c4..c9bc4ba 100644 --- a/src/test/java/io/statnett/k3a/authz/ldap/utils/LdapUtilsTest.java +++ b/src/test/java/io/statnett/k3a/authz/ldap/utils/LdapUtilsTest.java @@ -1,6 +1,5 @@ package io.statnett.k3a.authz.ldap.utils; -import io.statnett.k3a.authz.ldap.utils.LdapUtils; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/io/statnett/k3a/authz/ldap/utils/time/TestTimeProvider.java b/src/test/java/io/statnett/k3a/authz/ldap/utils/time/TestTimeProvider.java index 8727cf5..9517c06 100644 --- a/src/test/java/io/statnett/k3a/authz/ldap/utils/time/TestTimeProvider.java +++ b/src/test/java/io/statnett/k3a/authz/ldap/utils/time/TestTimeProvider.java @@ -1,7 +1,5 @@ package io.statnett.k3a.authz.ldap.utils.time; -import io.statnett.k3a.authz.ldap.utils.time.TimeProvider; - public final class TestTimeProvider implements TimeProvider { @@ -12,10 +10,6 @@ public long currentTimeMillis() { return ctm; } - public void set(final long ctm) { - this.ctm = ctm; - } - public void add(final long diff) { ctm += diff; }