Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9EA5218AF7 for ; Thu, 20 Aug 2015 02:38:10 +0000 (UTC) Received: (qmail 49781 invoked by uid 500); 20 Aug 2015 02:38:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 49618 invoked by uid 500); 20 Aug 2015 02:38:10 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 49433 invoked by uid 99); 20 Aug 2015 02:38:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Aug 2015 02:38:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3BB16E7D97; Thu, 20 Aug 2015 02:38:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Thu, 20 Aug 2015 02:38:14 -0000 Message-Id: <1f65d469fb764a0dbca12bc2b352e8e4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/10] directory-kerby git commit: DIRKRB-402 Raw Types should be parameterized. Contributed by Gerard Gagliano. DIRKRB-402 Raw Types should be parameterized. Contributed by Gerard Gagliano. Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/67df19ae Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/67df19ae Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/67df19ae Branch: refs/heads/pkinit-support Commit: 67df19aed93740c1e9f8d391bd7d1ddf0ac9549d Parents: d54038a Author: plusplusjiajia Authored: Fri Aug 14 15:14:33 2015 +0800 Committer: plusplusjiajia Committed: Fri Aug 14 15:14:33 2015 +0800 ---------------------------------------------------------------------- .../kerberos/kdc/identitybackend/IdentityZNode.java | 4 ++-- .../kerb/identity/CacheableIdentityService.java | 16 ++++++++-------- .../identity/backend/MemoryIdentityBackend.java | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/67df19ae/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java ---------------------------------------------------------------------- diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java index 3cf82b2..5c41a71 100644 --- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java +++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java @@ -327,9 +327,9 @@ public class IdentityZNode { if (ZKUtil.checkExists(this.zk, IdentityZNodeHelper.getKeysZNode(this.identityName)) == -1) { ZKUtil.createWithParents(this.zk, IdentityZNodeHelper.getKeysZNode(this.identityName)); } - Iterator it = keys.entrySet().iterator(); + Iterator> it = keys.entrySet().iterator(); while (it.hasNext()) { - Map.Entry pair = (Map.Entry) it.next(); + Map.Entry pair = it.next(); EncryptionType key = (EncryptionType) pair.getKey(); ZKUtil.createWithParents(this.zk, IdentityZNodeHelper.getKeyTypeZNode(this.identityName, key.getName())); EncryptionKey value = (EncryptionKey) pair.getValue(); http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/67df19ae/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/CacheableIdentityService.java ---------------------------------------------------------------------- diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/CacheableIdentityService.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/CacheableIdentityService.java index 8bd174a..f53220c 100644 --- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/CacheableIdentityService.java +++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/CacheableIdentityService.java @@ -52,14 +52,14 @@ public class CacheableIdentityService private void init() { Map tmpMap = - new LinkedHashMap(cacheSize) { - private static final long serialVersionUID = -6911200685333503214L; - - @Override - protected boolean removeEldestEntry(Map.Entry eldest) { - return size() > cacheSize; - } - }; + new LinkedHashMap(cacheSize) { + private static final long serialVersionUID = -6911200685333503214L; + + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > cacheSize; + } + }; idCache = new ConcurrentHashMap<>(tmpMap); } http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/67df19ae/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/MemoryIdentityBackend.java ---------------------------------------------------------------------- diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/MemoryIdentityBackend.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/MemoryIdentityBackend.java index 38e47e7..5b4ee1e 100644 --- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/MemoryIdentityBackend.java +++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/MemoryIdentityBackend.java @@ -41,14 +41,14 @@ public class MemoryIdentityBackend extends AbstractIdentityBackend { protected void doInitialize() { Map tmpMap = - new LinkedHashMap(storageSize) { - private static final long serialVersionUID = 714064587685837472L; + new LinkedHashMap(storageSize) { + private static final long serialVersionUID = 714064587685837472L; - @Override - protected boolean removeEldestEntry(Map.Entry eldest) { - return size() > storageSize; - } - }; + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > storageSize; + } + }; storage = new ConcurrentHashMap<>(tmpMap); }