1 files changed, 3 insertions, 38 deletions
diff --git a/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/core/WebConfig.java b/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/core/WebConfig.java
index 41d3791b..558a82a1 100644
--- a/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/core/WebConfig.java
+++ b/sliapi/springboot/src/main/java/org/onap/ccsdk/sli/core/sliapi/springboot/core/WebConfig.java
@@ -21,11 +21,14 @@
 package org.onap.ccsdk.sli.core.sliapi.springboot.core;
 
 import org.onap.logging.filter.spring.LoggingInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.orm.jpa.JpaTransactionManager;
@@ -48,43 +51,5 @@ import javax.sql.DataSource;
 @EnableTransactionManagement
 public class WebConfig implements WebMvcConfigurer {
 
-/*	@Bean
-	LoggingInterceptor loggingInterceptor() {
-		return new LoggingInterceptor();
-	}
 
-	public void addInterceptors(InterceptorRegistry registry) {	
-		registry.addInterceptor(loggingInterceptor()); // handles audit log entries
-	}*/
-
-	@Bean
-	public DataSource dataSource() {
-
-		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-		builder.setName("sdnctl");
-		return builder.setType(EmbeddedDatabaseType.DERBY).build();
-	}
-
-	@Bean
-	public EntityManagerFactory entityManagerFactory() {
-
-		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-		vendorAdapter.setGenerateDdl(true);
-
-		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-		factory.setJpaVendorAdapter(vendorAdapter);
-		factory.setPackagesToScan("org.onap.ccsdk.sli.core.sliapi.springboot.*");
-		factory.setDataSource(dataSource());
-		factory.afterPropertiesSet();
-
-		return factory.getObject();
-	}
-
-	@Bean
-	public PlatformTransactionManager transactionManager() {
-
-		JpaTransactionManager txManager = new JpaTransactionManager();
-		txManager.setEntityManagerFactory(entityManagerFactory());
-		return txManager;
-	}
 }
 \ No newline at end of file