directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [05/10] directory-kerby git commit: DIRKRB-402 Raw Types should be parameterized. Contributed by Gerard Gagliano.
Date Thu, 20 Aug 2015 02:38:14 GMT
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 <jiajia.li@intel.com>
Authored: Fri Aug 14 15:14:33 2015 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
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<Map.Entry<EncryptionType, EncryptionKey>> it = keys.entrySet().iterator();
         while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry) it.next();
+            Map.Entry<EncryptionType, EncryptionKey> 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<String, KrbIdentity> tmpMap =
-                new LinkedHashMap<String, KrbIdentity>(cacheSize) {
-                    private static final long serialVersionUID = -6911200685333503214L;
-
-            @Override
-            protected boolean removeEldestEntry(Map.Entry eldest) {
-                return size() > cacheSize;
-            }
-        };
+            new LinkedHashMap<String, KrbIdentity>(cacheSize) {
+                private static final long serialVersionUID = -6911200685333503214L;
+
+                @Override
+                protected boolean removeEldestEntry(Map.Entry<String, KrbIdentity>
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<String, KrbIdentity> tmpMap =
-                new LinkedHashMap<String, KrbIdentity>(storageSize) {
-                     private static final long serialVersionUID = 714064587685837472L;
+            new LinkedHashMap<String, KrbIdentity>(storageSize) {
+                private static final long serialVersionUID = 714064587685837472L;
 
-                    @Override
-                    protected boolean removeEldestEntry(Map.Entry eldest) {
-                        return size() > storageSize;
-                    }
-                };
+                @Override
+                protected boolean removeEldestEntry(Map.Entry<String, KrbIdentity>
eldest) {
+                    return size() > storageSize;
+                }
+            };
 
         storage = new ConcurrentHashMap<>(tmpMap);
     }


Mime
View raw message