Repository: ranger Updated Branches: refs/heads/master 9a99e3f41 -> 2c57feaf8
RANGER-1636:Remove the pmd check error Signed-off-by: peng.jianhua <peng.jian...@zte.com.cn> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2c57feaf Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2c57feaf Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2c57feaf Branch: refs/heads/master Commit: 2c57feaf8b53f719d889f07a21cbdfafe6608dc4 Parents: 9a99e3f Author: peng.jianhua <peng.jian...@zte.com.cn> Authored: Tue Jun 13 00:20:44 2017 -0400 Committer: peng.jianhua <peng.jian...@zte.com.cn> Committed: Tue Jun 13 21:54:18 2017 -0400 ---------------------------------------------------------------------- .../org/apache/ranger/plugin/errors/TestValidationErrorCode.java | 1 - .../main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/2c57feaf/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java index 1b00c64..2c69bcc 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java @@ -20,7 +20,6 @@ package org.apache.ranger.plugin.errors; import com.google.common.collect.ImmutableSet; -import org.apache.ranger.plugin.model.validation.ValidationFailureDetails; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/ranger/blob/2c57feaf/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java index c4f7267..09b46bc 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java @@ -321,7 +321,7 @@ public class RangerKeyStore extends KeyStoreSpi { xxRangerKeyStore = new XXRangerKeyStore(); keyStoreExists = false; } - xxRangerKeyStore = mapToEntityBean(rangerKeyStore, xxRangerKeyStore, 0); + xxRangerKeyStore = mapToEntityBean(rangerKeyStore, xxRangerKeyStore); if (keyStoreExists) { xxRangerKeyStore = rangerKMSDao.update(xxRangerKeyStore); } else { @@ -334,7 +334,7 @@ public class RangerKeyStore extends KeyStoreSpi { } } - private XXRangerKeyStore mapToEntityBean(XXRangerKeyStore rangerKMSKeyStore, XXRangerKeyStore xxRangerKeyStore,int i) { + private XXRangerKeyStore mapToEntityBean(XXRangerKeyStore rangerKMSKeyStore, XXRangerKeyStore xxRangerKeyStore) { xxRangerKeyStore.setAlias(rangerKMSKeyStore.getAlias()); xxRangerKeyStore.setCreatedDate(rangerKMSKeyStore.getCreatedDate()); xxRangerKeyStore.setEncoded(rangerKMSKeyStore.getEncoded());