stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8344023: Unnecessary Hashtable usage in LdapClient.defaultBinaryAttrs

Browse Source 
Reviewed-by: dfuchs, aefimov
This commit is contained in:
Andrey Turbanov 2024-11-13 19:25:08 +00:00
parent 5e01c40b19
commit ffea9809a7
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/java.naming/share/classes/com/sun/jndi/ldap/LdapClient.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -28,6 +28,7 @@ package com.sun.jndi.ldap;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.Set;
import java.util.Vector; import java.util.Vector;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@ -86,32 +87,23 @@ public final class LdapClient implements PooledConnection {
static final boolean caseIgnore = true; static final boolean caseIgnore = true;
// Default list of binary attributes // Default list of binary attributes
private static final Hashtable<String, Boolean> defaultBinaryAttrs = private static final Set<String> defaultBinaryAttrs = Set.of(
new Hashtable<>(23,0.75f); "userpassword", //2.5.4.35
static { "javaserializeddata", //1.3.6.1.4.1.42.2.27.4.1.8
defaultBinaryAttrs.put("userpassword", Boolean.TRUE); //2.5.4.35 "javaserializedobject", //1.3.6.1.4.1.42.2.27.4.1.2
defaultBinaryAttrs.put("javaserializeddata", Boolean.TRUE); "jpegphoto", //0.9.2342.19200300.100.1.60
//1.3.6.1.4.1.42.2.27.4.1.8 "audio", //0.9.2342.19200300.100.1.55
defaultBinaryAttrs.put("javaserializedobject", Boolean.TRUE); "thumbnailphoto", //1.3.6.1.4.1.1466.101.120.35
// 1.3.6.1.4.1.42.2.27.4.1.2 "thumbnaillogo", //1.3.6.1.4.1.1466.101.120.36
defaultBinaryAttrs.put("jpegphoto", Boolean.TRUE); "usercertificate", //2.5.4.36
//0.9.2342.19200300.100.1.60 "cacertificate", //2.5.4.37
defaultBinaryAttrs.put("audio", Boolean.TRUE); //0.9.2342.19200300.100.1.55 "certificaterevocationlist",//2.5.4.39
defaultBinaryAttrs.put("thumbnailphoto", Boolean.TRUE); "authorityrevocationlist", //2.5.4.38
//1.3.6.1.4.1.1466.101.120.35 "crosscertificatepair", //2.5.4.40
defaultBinaryAttrs.put("thumbnaillogo", Boolean.TRUE); "photo", //0.9.2342.19200300.100.1.7
//1.3.6.1.4.1.1466.101.120.36 "personalsignature", //0.9.2342.19200300.100.1.53
defaultBinaryAttrs.put("usercertificate", Boolean.TRUE); //2.5.4.36 "x500uniqueidentifier" //2.5.4.45
defaultBinaryAttrs.put("cacertificate", Boolean.TRUE); //2.5.4.37 );
defaultBinaryAttrs.put("certificaterevocationlist", Boolean.TRUE);
//2.5.4.39
defaultBinaryAttrs.put("authorityrevocationlist", Boolean.TRUE); //2.5.4.38
defaultBinaryAttrs.put("crosscertificatepair", Boolean.TRUE); //2.5.4.40
defaultBinaryAttrs.put("photo", Boolean.TRUE); //0.9.2342.19200300.100.1.7
defaultBinaryAttrs.put("personalsignature", Boolean.TRUE);
//0.9.2342.19200300.100.1.53
defaultBinaryAttrs.put("x500uniqueidentifier", Boolean.TRUE); //2.5.4.45
}
private static final String DISCONNECT_OID = "1.3.6.1.4.1.1466.20036"; private static final String DISCONNECT_OID = "1.3.6.1.4.1.1466.20036";
@ -790,7 +782,7 @@ public final class LdapClient implements PooledConnection {
String id = attrid.toLowerCase(Locale.ENGLISH); String id = attrid.toLowerCase(Locale.ENGLISH);
return id.contains(";binary") || return id.contains(";binary") ||
defaultBinaryAttrs.containsKey(id) || defaultBinaryAttrs.contains(id) ||
((binaryAttrs != null) && (binaryAttrs.containsKey(id))); ((binaryAttrs != null) && (binaryAttrs.containsKey(id)));
} }