database.jndiName=jdbc/billing   
database.url= ${SPRING_DATASOURCE_URL:jdbc:mysql://${SERVICE:localhost}:${PORT:3306}/${DATABASE:billdb}}
database.auth= 
database.type= org.apache.tomcat.jdbc.pool.DataSource
database.username= ${SPRING_DATASOURCE_USERNAME:cpandey}
database.password= ${SPRING_DATASOURCE_PASSWORD:chandan@1234}
database.defaultAutoCommit= true
database.defaultReadOnly= false
database.driverClassName= ${SPRING_DATASOURCE_DRIVER_CLASS_NAME:com.mysql.jdbc.Driver}
database.maxActive= 10
database.maxIdle= 5
database.minIdle= 3
database.initialSize= 10
database.maxWait= 1000
database.testOnBorrow= true
database.testOnConnect= true 
database.testOnReturn= false
database.testWhileIdle= false
database.validationQuery= SELECT 1 FROM DUAL
database.validationQueryTimeout= 1000
database.validatorClassName= 
database.logAbandoned= true
database.removeAbandoned= true
database.removeAbandonedTimeOut= 30000
database.timeBetweenEvictionRunsMillis= 30000
database.minEvictableIdleTimeMillis= 30000
database.validationInterval= 30000
database.jdbcInterceptors= 
     - "org.apache.tomcat.jdbc.pool.interceptor.ConnectionState"
     - "org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer" 

##JdbcInterceptors("org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;"+ "org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer");

package com.itlogiclab.billing.config;

import java.util.Objects;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;

import com.itlogiclab.billing.utils.BillingConstants;

@Configuration
@PropertySource("classpath:database-application2.properties")
@ConfigurationProperties(prefix = "database")
public class DataSourceConfigJndi{
	
	@Autowired
	private Environment env;

	private String jndiName;

	private String auth;

	private String type; 
	
...... More attribute 

	/**
	 * @return the name
	 */
	public String getJndiName() {
		return Objects.isNull(env.getProperty(BillingConstants.ENV_JNDI_NAME)) ? 
		jndiName : 
		env.getProperty(BillingConstants.ENV_JNDI_NAME);
	}


	/**
	 * @return the auth
	 */
	public String getAuth() {
		return Objects.isNull(env.getProperty(BillingConstants.ENV_AUTH)) ? 
		auth : 
		env.getProperty(BillingConstants.ENV_AUTH);
	}

.......... More getters
	
	

	/**
	 * @param env the env to set
	 */
	public void setEnv(Environment env) {
		this.env = env;
	}


	/**
	 * @param jndiName the jndiName to set
	 */
	public void setJndiName(String jndiName) {
		this.jndiName = jndiName;
	}


	/**
	 * @param auth the auth to set
	 */
	public void setAuth(String auth) {
		this.auth = auth;
	}
............ More Setters

 package com.itlogiclab.billing.config;

## Removing imports 

@Configuration
@EnableJpaRepositories(basePackages = "com.itlogiclab.billing.repos")
@EnableTransactionManagement
public class TomcatFactoryConfig {
	private static Logger logger = LogManager.getLogger(TomcatFactoryConfig.class); 

	@Bean
	public DataSourceConfigJndi getDataSourceConfig() {
		return new DataSourceConfigJndi();
	}
	
	@Bean
	public TomcatServletWebServerFactory getTomcatFactory() {
		TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
			@Override
			public TomcatWebServer getTomcatWebServer(Tomcat tomcat) {
				tomcat.enableNaming();
				return super.getTomcatWebServer(tomcat);
			}
			
			@Override
	        protected void postProcessContext(Context context) {
				
		    DataSourceConfigJndi jndiProps = getDataSourceConfig();
				logger.debug("DataSource Props: "+jndiProps);
				
				ContextResource resource = new ContextResource();
	            resource.setName(getDataSourceConfig().getJndiName());
	            resource.setType(DataSource.class.getName());
	            
	            resource.setProperty(BillingConstants.FACTORY, "org.apache.tomcat.jdbc.pool.DataSourceFactory");
	            
	            resource.setProperty(BillingConstants.DRIVER_CLASS_NAME, jndiProps.getDriverClassName());
	           

	            resource.setProperty(BillingConstants.URL, jndiProps.getUrl());
	            resource.setProperty(BillingConstants.USERNAME, jndiProps.getUsername());
	            resource.setProperty(BillingConstants.PASSWORD, jndiProps.getPassword());
	            esource.setProperty(BillingConstants.MIN_IDLE, jndiProps.getMinIdle());
	            resource.setProperty(BillingConstants.MAX_ACTIVE, jndiProps.getMaxActive());
	            resource.setProperty(BillingConstants.MAX_IDLE, jndiProps.getMaxIdle());
	            resource.setProperty(BillingConstants.MAX_WAIT, jndiProps.getMaxWait());
	            
	            ## Removing few other properties 
	            
	            context.getNamingResources().addResource(resource);  
	            ## Naming resource is created and register with tomcat
	        }
	    };
	    return tomcat;
	}
	
	@Bean(destroyMethod = "")
	public DataSource jndiDataSource() throws IllegalArgumentException, NamingException {
		JndiObjectFactoryBean bean = new JndiObjectFactoryBean();
		bean.setJndiName(BillingConstants.JAVA_COMP_ENV + getDataSourceConfig().getJndiName());
		bean.setProxyInterface(DataSource.class);
		bean.setLookupOnStartup(false);
		bean.afterPropertiesSet();
		return (DataSource) bean.getObject();
	}
	
	@Bean
	public EntityManagerFactory entityManagerFactory() throws SQLException, IllegalArgumentException, NamingException {
		
		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
		vendorAdapter.setDatabase(Database.MYSQL);
		vendorAdapter.setShowSql(true);
		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
		factory.setJpaVendorAdapter(vendorAdapter);
		factory.setPackagesToScan(new String[]{BillEntity.class.getPackage().getName()});
## Entities are are scanned and register with the hibernateJPAVendorAdaptor 
		factory.setDataSource(jndiDataSource());
		
		factory.afterPropertiesSet();
		return factory.getObject();
	}
	
	@Bean
	public PlatformTransactionManager transactionManager()throws SQLException, IllegalArgumentException, NamingException {
		JpaTransactionManager txManager = new JpaTransactionManager();
		txManager.setEntityManagerFactory(entityManagerFactory());
		return txManager;
	}
	
	
}