jdk-sandbox: comparison jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java

equal deleted inserted replaced

-:de98ed66757c
+:1d42311b6355
 /*
-* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 /**
 * Flag indicating whether we should prefetch CRLs.
 */
 private boolean prefetchCRLs = false;
-private final Cache valueCache;
+private final Cache<String, byte[][]> valueCache;
 private int cacheHits = 0;
 private int cacheMisses = 0;
 private int requests = 0;
 /**
 * Returns an LDAP CertStore. This method consults a cache of
 * CertStores (shared per JVM) using the LDAP server/port as a key.
 */
-private static final Cache certStoreCache = Cache.newSoftMemoryCache(185);
+private static final Cache<LDAPCertStoreParameters, CertStore>
+certStoreCache = Cache.newSoftMemoryCache(185);
 static synchronized CertStore getInstance(LDAPCertStoreParameters params)
 throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
-CertStore lcs = (CertStore) certStoreCache.get(params);
+CertStore lcs = certStoreCache.get(params);
 if (lcs == null) {
 lcs = CertStore.getInstance("LDAP", params);
 certStoreCache.put(params, lcs);
 } else {
 if (debug != null) {
 * @throws InvalidAlgorithmParameterException if creation fails
 */
 private void createInitialDirContext(String server, int port)
 throws InvalidAlgorithmParameterException {
 String url = "ldap://" + server + ":" + port;
-Hashtable<String,Object> env = new Hashtable<String,Object>();
+Hashtable<String,Object> env = new Hashtable<>();
 env.put(Context.INITIAL_CONTEXT_FACTORY,
 "com.sun.jndi.ldap.LdapCtxFactory");
 env.put(Context.PROVIDER_URL, url);
 try {
 ctx = new InitialDirContext(env);
 private Map<String, byte[][]> valueMap;
 private final List<String> requestedAttributes;
 LDAPRequest(String name) {
 this.name = name;
-requestedAttributes = new ArrayList<String>(5);
+requestedAttributes = new ArrayList<>(5);
 }
 String getName() {
 return name;
 }
 if (DEBUG && ((cacheHits + cacheMisses) % 50 == 0)) {
 System.out.println("Cache hits: " + cacheHits + "; misses: "
 + cacheMisses);
 }
 String cacheKey = name + "|" + attrId;
-byte[][] values = (byte[][])valueCache.get(cacheKey);
+byte[][] values = valueCache.get(cacheKey);
 if (values != null) {
 cacheHits++;
 return values;
 }
 cacheMisses++;
 requests++;
 if (requests % 5 == 0) {
 System.out.println("LDAP requests: " + requests);
 }
 }
-valueMap = new HashMap<String, byte[][]>(8);
+valueMap = new HashMap<>(8);
 String[] attrIds = requestedAttributes.toArray(STRING0);
 Attributes attrs;
 try {
 attrs = ctx.getAttributes(name, attrIds);
 } catch (NameNotFoundException e) {
 throw new CertStoreException(namingEx);
 }
 int n = encodedCert.length;
 if (n == 0) {
-return Collections.<X509Certificate>emptySet();
+return Collections.emptySet();
 }
-List<X509Certificate> certs = new ArrayList<X509Certificate>(n);
+List<X509Certificate> certs = new ArrayList<>(n);
 /* decode certs and check if they satisfy selector */
 for (int i = 0; i < n; i++) {
 ByteArrayInputStream bais = new ByteArrayInputStream(encodedCert[i]);
 try {
 Certificate cert = cf.generateCertificate(bais);
 throw new CertStoreException(namingEx);
 }
 int n = encodedCertPair.length;
 if (n == 0) {
-return Collections.<X509CertificatePair>emptySet();
+return Collections.emptySet();
 }
-List<X509CertificatePair> certPairs =
+List<X509CertificatePair> certPairs = new ArrayList<>(n);
-new ArrayList<X509CertificatePair>(n);
 /* decode each cert pair and add it to the Collection */
 for (int i = 0; i < n; i++) {
 try {
 X509CertificatePair certPair =
 X509CertificatePair.generateCertificatePair(encodedCertPair[i]);
 // Get the cert pairs
 Collection<X509CertificatePair> certPairs =
 getCertPairs(request, CROSS_CERT);
 // Find Certificates that match and put them in a list
-ArrayList<X509Certificate> matchingCerts =
+ArrayList<X509Certificate> matchingCerts = new ArrayList<>();
-new ArrayList<X509Certificate>();
 for (X509CertificatePair certPair : certPairs) {
 X509Certificate cert;
 if (forward != null) {
 cert = certPair.getForward();
 if ((cert != null) && forward.match(cert)) {
 }
 X509CertSelector xsel = (X509CertSelector) selector;
 int basicConstraints = xsel.getBasicConstraints();
 String subject = xsel.getSubjectAsString();
 String issuer = xsel.getIssuerAsString();
-HashSet<X509Certificate> certs = new HashSet<X509Certificate>();
+HashSet<X509Certificate> certs = new HashSet<>();
 if (debug != null) {
 debug.println("LDAPCertStore.engineGetCertificates() basicConstraints: "
 + basicConstraints);
 }
 throw new CertStoreException(namingEx);
 }
 int n = encodedCRL.length;
 if (n == 0) {
-return Collections.<X509CRL>emptySet();
+return Collections.emptySet();
 }
-List<X509CRL> crls = new ArrayList<X509CRL>(n);
+List<X509CRL> crls = new ArrayList<>(n);
 /* decode each crl and check if it matches selector */
 for (int i = 0; i < n; i++) {
 try {
 CRL crl = cf.generateCRL(new ByteArrayInputStream(encodedCRL[i]));
 if (sel.match(crl)) {
 }
 if (!(selector instanceof X509CRLSelector)) {
 throw new CertStoreException("need X509CRLSelector to find CRLs");
 }
 X509CRLSelector xsel = (X509CRLSelector) selector;
-HashSet<X509CRL> crls = new HashSet<X509CRL>();
+HashSet<X509CRL> crls = new HashSet<>();
 // Look in directory entry for issuer of cert we're checking.
 Collection<Object> issuerNames;
 X509Certificate certChecking = xsel.getCertificateChecking();
 if (certChecking != null) {
-issuerNames = new HashSet<Object>();
+issuerNames = new HashSet<>();
 X500Principal issuer = certChecking.getIssuerX500Principal();
 issuerNames.add(issuer.getName(X500Principal.RFC2253));
 } else {
 // But if we don't know which cert we're checking, try the directory
 // entries of all acceptable CRL issuers
 }
 } else {
 issuerName = (String)nameObject;
 }
 // If all we want is CA certs, try to get the (probably shorter) ARL
-Collection<X509CRL> entryCRLs = Collections.<X509CRL>emptySet();
+Collection<X509CRL> entryCRLs = Collections.emptySet();
 if (certChecking == null || certChecking.getBasicConstraints() != -1) {
 LDAPRequest request = new LDAPRequest(issuerName);
 request.addRequestedAttribute(CROSS_CERT);
 request.addRequestedAttribute(CA_CERT);
 request.addRequestedAttribute(ARL);
 LDAPCRLSelector(X509CRLSelector selector,
 Collection<X500Principal> certIssuers, String ldapDN)
 throws IOException {
 this.selector = selector == null ? new X509CRLSelector() : selector;
 this.certIssuers = certIssuers;
-issuerNames = new HashSet<Object>();
+issuerNames = new HashSet<>();
 issuerNames.add(ldapDN);
-issuers = new HashSet<X500Principal>();
+issuers = new HashSet<>();
 issuers.add(new X500Name(ldapDN).asX500Principal());
 }
 // we only override the get (accessor methods) since the set methods
 // will not be invoked by the code that uses this LDAPCRLSelector.
 public Collection<X500Principal> getIssuers() {

changeset 10785	1d42311b6355
parent 10782	01689c7b34ac
child 22089	ba496138fa35