Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15029 Remove deprecated JndiHelper

This commit is contained in:
Sanne Grinovero 2022-01-14 13:10:02 +00:00 committed by Sanne Grinovero
parent 4eca44eecd
commit 1b2508e4e0
2 changed files with 1 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java
View File

@ -57,7 +57,7 @@ public class JndiServiceImpl implements JndiService {
* @return The extracted JNDI specific properties. * @return The extracted JNDI specific properties.
*/ */
@SuppressWarnings({ "unchecked" }) @SuppressWarnings({ "unchecked" })
public static Properties extractJndiProperties(Map configurationValues) { private static Properties extractJndiProperties(Map configurationValues) {
final Properties jndiProperties = new Properties(); final Properties jndiProperties = new Properties();
for ( Map.Entry entry : (Set<Map.Entry>) configurationValues.entrySet() ) { for ( Map.Entry entry : (Set<Map.Entry>) configurationValues.entrySet() ) {

83
hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java
View File

@ -1,83 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.internal.util.jndi;
import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.Name;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.hibernate.engine.jndi.internal.JndiServiceImpl;
/**
* Helper for dealing with JNDI.
*
* @deprecated As JNDI access should get routed through {@link org.hibernate.engine.jndi.spi.JndiService}
*/
@Deprecated
public final class JndiHelper {
private JndiHelper() {
}
/**
* Given a hodgepodge of properties, extract out the ones relevant for JNDI interaction.
*
* @param configurationValues The map of config values
*
* @return The extracted JNDI specific properties.
*/
@SuppressWarnings({ "unchecked" })
public static Properties extractJndiProperties(Map configurationValues) {
return JndiServiceImpl.extractJndiProperties( configurationValues );
}
public static InitialContext getInitialContext(Properties props) throws NamingException {
final Hashtable hash = extractJndiProperties( props );
return hash.size() == 0 ? new InitialContext() : new InitialContext( hash );
}
/**
* Bind val to name in ctx, and make sure that all intermediate contexts exist.
*
* @param ctx the root context
* @param name the name as a string
* @param val the object to be bound
*
* @throws NamingException Indicates a problem performing the bind.
*/
public static void bind(Context ctx, String name, Object val) throws NamingException {
try {
ctx.rebind(name, val);
}
catch (Exception e) {
Name n = ctx.getNameParser( "" ).parse( name );
while ( n.size() > 1 ) {
final String ctxName = n.get( 0 );
Context subctx = null;
try {
subctx = (Context) ctx.lookup( ctxName );
}
catch (NameNotFoundException ignore) {
}
if ( subctx != null ) {
ctx = subctx;
}
else {
ctx = ctx.createSubcontext( ctxName );
}
n = n.getSuffix( 1 );
}
ctx.rebind( n, val );
}
}
}