directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject directory-kerby git commit: More diamond operator cleanup
Date Fri, 26 Oct 2018 10:31:52 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/trunk 741299429 -> 4fcc4d97d


More diamond operator cleanup


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4fcc4d97
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4fcc4d97
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4fcc4d97

Branch: refs/heads/trunk
Commit: 4fcc4d97d9263abfe324b7e4f49f7bcca05c074b
Parents: 7412994
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Oct 26 11:31:43 2018 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Oct 26 11:31:43 2018 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/kerby/has/common/spnego/AuthToken.java  | 2 +-
 .../java/org/apache/kerby/has/common/util/HasJaasLoginUtil.java  | 4 ++--
 .../src/main/java/org/apache/kerby/MavibotBackend.java           | 2 +-
 .../org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java    | 2 +-
 .../org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4fcc4d97/has-project/has-common/src/main/java/org/apache/kerby/has/common/spnego/AuthToken.java
----------------------------------------------------------------------
diff --git a/has-project/has-common/src/main/java/org/apache/kerby/has/common/spnego/AuthToken.java
b/has-project/has-common/src/main/java/org/apache/kerby/has/common/spnego/AuthToken.java
index 1bb7263..9c31fe9 100644
--- a/has-project/has-common/src/main/java/org/apache/kerby/has/common/spnego/AuthToken.java
+++ b/has-project/has-common/src/main/java/org/apache/kerby/has/common/spnego/AuthToken.java
@@ -38,7 +38,7 @@ public class AuthToken implements Principal {
   private static final String TYPE = "t";
 
   private static final Set<String> ATTRIBUTES =
-    new HashSet<String>(Arrays.asList(USER_NAME, PRINCIPAL, EXPIRES, TYPE));
+    new HashSet<>(Arrays.asList(USER_NAME, PRINCIPAL, EXPIRES, TYPE));
 
   private String userName;
   private String principal;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4fcc4d97/has-project/has-common/src/main/java/org/apache/kerby/has/common/util/HasJaasLoginUtil.java
----------------------------------------------------------------------
diff --git a/has-project/has-common/src/main/java/org/apache/kerby/has/common/util/HasJaasLoginUtil.java
b/has-project/has-common/src/main/java/org/apache/kerby/has/common/util/HasJaasLoginUtil.java
index a4c9590..3ab00e5 100644
--- a/has-project/has-common/src/main/java/org/apache/kerby/has/common/util/HasJaasLoginUtil.java
+++ b/has-project/has-common/src/main/java/org/apache/kerby/has/common/util/HasJaasLoginUtil.java
@@ -85,7 +85,7 @@ public class HasJaasLoginUtil {
     }
 
     private static final Map<String, String> BASIC_JAAS_OPTIONS =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     static {
         String jaasEnvVar = System.getenv("HADOOP_JAAS_DEBUG");
@@ -95,7 +95,7 @@ public class HasJaasLoginUtil {
     }
 
     private static final Map<String, String> TICKET_KERBEROS_OPTIONS =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     static {
         TICKET_KERBEROS_OPTIONS.put("doNotPrompt", "true");

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4fcc4d97/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
index 996b55c..efd8886 100644
--- a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
+++ b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
@@ -82,7 +82,7 @@ public class MavibotBackend extends AbstractIdentityBackend {
             database = rm.getManagedTree(DATA_TREE);
         } else {
             PersistedBTreeConfiguration<String, KrbIdentity> config =
-                    new PersistedBTreeConfiguration<String, KrbIdentity>();
+                    new PersistedBTreeConfiguration<>();
             // _no_ duplicates
             config.setAllowDuplicates(false);
             config.setBtreeType(BTreeTypeEnum.PERSISTED);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4fcc4d97/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
index d155c6d..1144d42 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/EncryptionUtil.java
@@ -91,7 +91,7 @@ public class EncryptionUtil {
     public static List<EncryptionKey> generateKeys(
             List<EncryptionType> encryptionTypes) throws KrbException {
         List<EncryptionKey> results =
-                new ArrayList<EncryptionKey>(encryptionTypes.size());
+                new ArrayList<>(encryptionTypes.size());
         for (EncryptionType eType : encryptionTypes) {
             EncryptionKey encKey = EncryptionHandler.random2Key(eType);
             encKey.setKvno(1);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4fcc4d97/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
index b6c69b3..b40fa04 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcNetwork.java
@@ -48,7 +48,7 @@ public abstract class KdcNetwork {
     private ServerSocket tcpServer;
     private DatagramChannel udpServer;
     private Map<InetSocketAddress, KdcUdpTransport> transports =
-            new HashMap<InetSocketAddress, KdcUdpTransport>();
+            new HashMap<>();
     private ByteBuffer recvBuffer;
 
     public synchronized void init() {


Mime
View raw message