mybatis / ibatis-2 / 586

Committed 26 May 2025 08:47PM UTC coverage: 65.53% (+0.02%) from 65.509%

Build # 586

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #290 from hazendaz/master

Minor code cleanup

Coverage Stats

1606 of 2810 branches covered (57.15%)

15 of 24 new or added lines in 13 files covered. (62.5%)

5072 of 7740 relevant lines covered (65.53%)

0.66 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/main/java/com/ibatis/sqlmap/engine/datasource/JndiDataSourceFactory.java

/*
 * Copyright 2004-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *    https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.ibatis.sqlmap.engine.datasource;

import com.ibatis.sqlmap.client.SqlMapException;

import java.util.Iterator;
import java.util.Map;
import java.util.Properties;

import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;

/**
 * DataSourceFactory implementation for JNDI.
 */
public class JndiDataSourceFactory implements DataSourceFactory {

  /** The data source. */
  private DataSource dataSource;

  public void initialize(Map properties) {
    try {
      InitialContext initCtx = null;
      Properties context = getContextProperties(properties);

      if (context == null) {
        initCtx = new InitialContext();
      } else {
        initCtx = new InitialContext(context);
      }

      if (properties.containsKey("DataSource")) {
        dataSource = (DataSource) initCtx.lookup((String) properties.get("DataSource"));
      } else if (properties.containsKey("DBJndiContext")) { // LEGACY --Backward compatibility
        dataSource = (DataSource) initCtx.lookup((String) properties.get("DBJndiContext"));
      } else if (properties.containsKey("DBFullJndiContext")) { // LEGACY --Backward
                                                                // compatibility
        dataSource = (DataSource) initCtx.lookup((String) properties.get("DBFullJndiContext"));
      } else if (properties.containsKey("DBInitialContext") && properties.containsKey("DBLookup")) {
        // LEGACY - Backward compatibility
        Context ctx = (Context) initCtx.lookup((String) properties.get("DBInitialContext"));
        dataSource = (DataSource) ctx.lookup((String) properties.get("DBLookup"));
      }

    } catch (NamingException e) {
      throw new SqlMapException("There was an error configuring JndiDataSourceTransactionPool. Cause: " + e, e);
    }
  }

  public DataSource getDataSource() {
    return dataSource;
  }

  /**
   * Gets the context properties.
   *
   * @param allProps
   *          the all props
   *
   * @return the context properties
   */
  private static Properties getContextProperties(Map allProps) {
    final String PREFIX = "context.";
    Properties contextProperties = null;
    Iterator keys = allProps.keySet().iterator();
    while (keys.hasNext()) {
      String key = (String) keys.next();
      String value = (String) allProps.get(key);
      if (key.startsWith(PREFIX)) {
        if (contextProperties == null) {
          contextProperties = new Properties();
        }
        contextProperties.put(key.substring(PREFIX.length()), value);
      }
    }
    return contextProperties;
  }

}

1	/*
2	* Copyright 2004-2025 the original author or authors.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* https://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16	package com.ibatis.sqlmap.engine.datasource;
17
18	import com.ibatis.sqlmap.client.SqlMapException;
19
20	import java.util.Iterator;
21	import java.util.Map;
22	import java.util.Properties;
23
24	import javax.naming.Context;
25	import javax.naming.InitialContext;
26	import javax.naming.NamingException;
27	import javax.sql.DataSource;
28
29	/**
30	* DataSourceFactory implementation for JNDI.
31	*/
32	public class JndiDataSourceFactory implements DataSourceFactory {	×
33
34	/** The data source. */
35	private DataSource dataSource;
36
37	public void initialize(Map properties) {
38	try {
39	InitialContext initCtx = null;	×
NEW 40	Properties context = getContextProperties(properties);	×
41
42	if (context == null) {	×
43	initCtx = new InitialContext();	×
44	} else {
45	initCtx = new InitialContext(context);	×
46	}
47
48	if (properties.containsKey("DataSource")) {	×
49	dataSource = (DataSource) initCtx.lookup((String) properties.get("DataSource"));	×
50	} else if (properties.containsKey("DBJndiContext")) { // LEGACY --Backward compatibility	×
51	dataSource = (DataSource) initCtx.lookup((String) properties.get("DBJndiContext"));	×
52	} else if (properties.containsKey("DBFullJndiContext")) { // LEGACY --Backward	×
53	// compatibility
54	dataSource = (DataSource) initCtx.lookup((String) properties.get("DBFullJndiContext"));	×
NEW 55	} else if (properties.containsKey("DBInitialContext") && properties.containsKey("DBLookup")) {	×
56	// LEGACY - Backward compatibility
57	Context ctx = (Context) initCtx.lookup((String) properties.get("DBInitialContext"));	×
58	dataSource = (DataSource) ctx.lookup((String) properties.get("DBLookup"));	×
59	}
60
61	} catch (NamingException e) {	×
62	throw new SqlMapException("There was an error configuring JndiDataSourceTransactionPool. Cause: " + e, e);	×
63	}	×
64	}	×
65
66	public DataSource getDataSource() {
67	return dataSource;	×
68	}
69
70	/**
71	* Gets the context properties.
72	*
73	* @param allProps
74	* the all props
75	*
76	* @return the context properties
77	*/
78	private static Properties getContextProperties(Map allProps) {
79	final String PREFIX = "context.";	×
NEW 80	Properties contextProperties = null;	×
81	Iterator keys = allProps.keySet().iterator();	×
82	while (keys.hasNext()) {	×
83	String key = (String) keys.next();	×
84	String value = (String) allProps.get(key);	×
85	if (key.startsWith(PREFIX)) {	×
86	if (contextProperties == null) {	×
87	contextProperties = new Properties();	×
88	}
89	contextProperties.put(key.substring(PREFIX.length()), value);	×
90	}
91	}	×
92	return contextProperties;	×
93	}
94
95	}

mybatis / ibatis-2 / 586

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous