fix warnings

Author: Ralf Eichinger

empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleApp.java

@@ -56,7 +56,7 @@ public static void main(String[] args) {
 
 
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args) {
         LOGGER.info("STARTING THE APPLICATION");
 
         LOGGER.info("Running DB Sample...");

empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleDB.java

@@ -19,7 +19,6 @@
 package org.apache.empire.samples.springboot;
 
 import org.apache.empire.data.DataType;
-import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBContext;
 import org.apache.empire.db.DBDatabase;
 import org.apache.empire.db.DBSQLScript;

empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/samples/springboot/SampleService.java

@@ -29,7 +29,7 @@
 import java.time.LocalDate;
 import java.util.List;
 
-@Transactional(readOnly = false)
+@Transactional
 @Service
 public class SampleService {
     private static final Logger LOGGER = LoggerFactory.getLogger(SampleService.class);
@@ -76,8 +76,8 @@ public void populateAndModify() {
             long idEmp1 = insertEmployee(idDevDep, "Peter", "Sharp", Gender.M, 25000);
             long idEmp2 = insertEmployee(idDevDep, "Fred", "Bloggs", Gender.M, 0);
             long idEmp3 = insertEmployee(idSalDep, "Emma", "White", Gender.F, 19500);
-            long idEmp4 = insertEmployee(idSalDep, "John", "Doe", Gender.M, 18800);
-            long idEmp5 = insertEmployee(idDevDep, "Sarah", "Smith", Gender.F, 44000);
+            insertEmployee(idSalDep, "John", "Doe", Gender.M, 18800);
+            insertEmployee(idDevDep, "Sarah", "Smith", Gender.F, 44000);
 
             // commit
             context.commit();
@@ -244,7 +244,7 @@ public void queryBeans() {
         LOGGER.info("First payment amount is {}", first.getAmount());
 
         // Query all males
-        BeanResult<Employee> result = new BeanResult<Employee>(Employee.class, EMP);
+        BeanResult<Employee> result = new BeanResult<>(Employee.class, EMP);
         result.getCommand().where(EMP.GENDER.is(Gender.M));
         result.fetch(context);
 
@@ -419,8 +419,7 @@ public void queryExample(QueryType queryType) {
         }
      */
         // Query Records and print output
-        DBReader reader = new DBReader(context);
-        try {
+        try (DBReader reader = new DBReader(context)) {
             // log select statement (but only once)
             if (queryType == QueryType.Reader) {
                 LOGGER.info("Running Query: {}", cmd.getSelect());
@@ -457,9 +456,6 @@ public void queryExample(QueryType queryType) {
                     break;
             }
             System.out.println("---------------------------------");
-        } finally {
-            // Always close Reader!
-            reader.close();
         }
     }
 
@@ -475,26 +471,26 @@ protected void queryRecordList() {
         // query now
         List<DBRecordBean> list = context.getUtils().queryRecordList(cmd, EMP, DBRecordBean.class);
         LOGGER.info("RecordList query found {} employees in Development department", list.size());
-        for (DBRecordBean record : list) {
-            Object[] key = record.getKey();
+        for (DBRecordBean recordBean : list) {
+            Object[] key = recordBean.getKey();
             // print info
-            String empName = StringUtils.concat(record.getString(EMP.LAST_NAME), ", ", record.getString(EMP.FIRST_NAME));
-            String phone = record.getString(EMP.PHONE_NUMBER);
-            BigDecimal salary = record.getDecimal(EMP.SALARY);
+            String empName = StringUtils.concat(recordBean.getString(EMP.LAST_NAME), ", ", recordBean.getString(EMP.FIRST_NAME));
+            String phone = recordBean.getString(EMP.PHONE_NUMBER);
+            BigDecimal salary = recordBean.getDecimal(EMP.SALARY);
             LOGGER.info("Employee[{}]: {}\tPhone: {}\tSalary: {}", StringUtils.toString(key), empName, phone, salary);
             // modify salary
-            BigDecimal newSalary = new BigDecimal(2000 + ((Math.random() * 200) - 100.0));
-            record.set(EMP.SALARY, newSalary);
+            BigDecimal newSalary = BigDecimal.valueOf(2000 + ((Math.random() * 200) - 100.0));
+            recordBean.set(EMP.SALARY, newSalary);
             // check
-            if (record.wasModified(EMP.SALARY)) {   // Salary was modified
-                LOGGER.info("Salary was modified for {}. New salary is {}", empName, record.getDecimal(EMP.SALARY));
+            if (recordBean.wasModified(EMP.SALARY)) {   // Salary was modified
+                LOGGER.info("Salary was modified for {}. New salary is {}", empName, recordBean.getDecimal(EMP.SALARY));
             }
-            // udpate the record
-            record.update(context);
+            // udpate the recordBean
+            recordBean.update(context);
 
             // convert to bean
             Employee employee = new Employee();
-            record.setBeanProperties(employee);
+            recordBean.setBeanProperties(employee);
             System.out.println(employee);
         }
     }

empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/springboot/DBContextSpring.java

@@ -4,16 +4,12 @@
 import org.apache.empire.db.context.DBContextBase;
 import org.apache.empire.db.context.DBRollbackManager;
 import org.apache.empire.dbms.DBMSHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 
 public class DBContextSpring extends DBContextBase implements AutoCloseable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DBContextSpring.class);
-
     private final DataSource dataSource;
     private final DBMSHandler dbmsHandler;
 

empire-db-examples/empire-db-example-spring-boot/src/main/java/org/apache/empire/springboot/EmpireDBConfig.java

@@ -3,8 +3,6 @@
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.db.DBContext;
 import org.apache.empire.dbms.DBMSHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,13 +11,12 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.sql.DataSource;
+import java.lang.reflect.InvocationTargetException;
 
 
 @Configuration
 @EnableConfigurationProperties(EmpireDBConfigProperties.class)
 public class EmpireDBConfig {
-    private static final Logger LOGGER = LoggerFactory.getLogger(EmpireDBConfig.class);
-
     private final EmpireDBConfigProperties empireDBConfigProperties;
 
     public EmpireDBConfig(EmpireDBConfigProperties empireDBConfigProperties) {
@@ -33,9 +30,10 @@ public DBContext dbContext(DataSource dataSource) {
             if (StringUtils.isEmpty(dbmsHandlerClass)) {
                 throw new RuntimeException("Configuration error: Fully qualified DBMS handler class path not found under application property 'empiredb.dbmsHandlerClass'");
             }
-            DBMSHandler dbmsHandler = (DBMSHandler) Class.forName(dbmsHandlerClass).newInstance();
+            DBMSHandler dbmsHandler = (DBMSHandler) Class.forName(dbmsHandlerClass).getDeclaredConstructor().newInstance();
             return new DBContextSpring(new TransactionAwareDataSourceProxy(dataSource), dbmsHandler);
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | InvocationTargetException |
+                 NoSuchMethodException e) {
             throw new RuntimeException("Failed to create DBMS handler for Empire DB", e);
         }
     }