Add HikariCp data source instead of JNDI

Author: Chamal-Peiris

pom.xml

@@ -71,6 +71,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.29</version>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>4.0.3</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/lk/ijse/dep/notes/WebAppInitializer.java renamed to src/main/java/lk/ijse/dep/note/WebAppInitializer.java

@@ -1,7 +1,7 @@
-package lk.ijse.dep.notes;
+package lk.ijse.dep.note;
 
-import lk.ijse.dep.notes.config.WebAppConfig;
-import lk.ijse.dep.notes.config.WebRootConfig;
+import lk.ijse.dep.note.config.WebAppConfig;
+import lk.ijse.dep.note.config.WebRootConfig;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {

src/main/java/lk/ijse/dep/notes/api/NoteController.java renamed to src/main/java/lk/ijse/dep/note/api/NoteController.java

@@ -1,4 +1,4 @@
-package lk.ijse.dep.notes.api;
+package lk.ijse.dep.note.api;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/lk/ijse/dep/notes/api/UserController.java renamed to src/main/java/lk/ijse/dep/note/api/UserController.java

@@ -1,4 +1,4 @@
-package lk.ijse.dep.notes.api;
+package lk.ijse.dep.note.api;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/lk/ijse/dep/note/config/JpaConfig.java

@@ -0,0 +1,38 @@
+package lk.ijse.dep.note.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.orm.jpa.JpaVendorAdapter;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.Database;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+
+import javax.sql.DataSource;
+import javax.xml.crypto.Data;
+
+@Configuration
+@PropertySource("classpath:application.yml")
+public class JpaConfig {
+    @Autowired
+    private Environment env;
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource ds, JpaVendorAdapter jpaVendorAdapter){
+        LocalContainerEntityManagerFactoryBean lcmfb = new LocalContainerEntityManagerFactoryBean();
+        lcmfb.setDataSource(ds);
+        lcmfb.setJpaVendorAdapter(jpaVendorAdapter);
+        lcmfb.setPackagesToScan("lk.ijse.dep.note.entity");
+        return lcmfb;
+    }
+
+    public JpaVendorAdapter jpaVendorAdapter(){
+        HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
+        jpaVendorAdapter.setShowSql(env.getProperty("jpa.show-sql",Boolean.class,false));
+        jpaVendorAdapter.setGenerateDdl(env.getProperty("jpa.generate-ddl",Boolean.class,false));
+        jpaVendorAdapter.setDatabasePlatform(env.getProperty("jpa.dialect"));
+        jpaVendorAdapter.setDatabase(Database.MYSQL);
+        return  jpaVendorAdapter;
+    }
+}

src/main/java/lk/ijse/dep/notes/config/WebAppConfig.java renamed to src/main/java/lk/ijse/dep/note/config/WebAppConfig.java

@@ -1,7 +1,7 @@
-package lk.ijse.dep.notes.config;
+package lk.ijse.dep.note.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lk.ijse.dep.notes.WebAppInitializer;
+import lk.ijse.dep.note.WebAppInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;

src/main/java/lk/ijse/dep/note/config/WebRootConfig.java

@@ -0,0 +1,9 @@
+package lk.ijse.dep.note.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import(JpaConfig.class)
+public class WebRootConfig {
+}

src/main/java/lk/ijse/dep/notes/entity/Note.java renamed to src/main/java/lk/ijse/dep/note/entity/Note.java

@@ -1,9 +1,8 @@
-package lk.ijse.dep.notes.entity;
+package lk.ijse.dep.note.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import net.bytebuddy.dynamic.loading.InjectionClassLoader;
 
 import javax.persistence.*;
 

src/main/java/lk/ijse/dep/notes/entity/SuperEntity.java renamed to src/main/java/lk/ijse/dep/note/entity/SuperEntity.java

@@ -1,4 +1,4 @@
-package lk.ijse.dep.notes.entity;
+package lk.ijse.dep.note.entity;
 
 import java.io.Serializable;
 

src/main/java/lk/ijse/dep/notes/entity/User.java renamed to src/main/java/lk/ijse/dep/note/entity/User.java

@@ -1,9 +1,8 @@
-package lk.ijse.dep.notes.entity;
+package lk.ijse.dep.note.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;