- add xls importation features with the self-build framework Excel ETL

acheype · Nov 2, 2017 · e586088 · e586088
1 parent 7094267
commit e586088
Show file tree

Hide file tree

Showing 154 changed files with 5,736 additions and 929 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -18,5 +18,7 @@
     "trailing": true,
     "smarttabs": true,
     "white": true,
-    "predef": ["angular"]
+    "predef": [
+        "angular"
+    ]
 }
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -1,25 +1,25 @@
 {
-  "generator-jhipster": {
-    "baseName": "malariaplantdb",
-    "packageName": "nc.ird.malariaplantdb",
-    "packageFolder": "nc/ird/malariaplantdb",
-    "authenticationType": "xauth",
-    "hibernateCache": "ehcache",
-    "clusteredHttpSession": "no",
-    "websocket": "no",
-    "databaseType": "sql",
-    "devDatabaseType": "h2Memory",
-    "prodDatabaseType": "postgresql",
-    "searchEngine": "elasticsearch",
-    "useSass": true,
-    "buildTool": "maven",
-    "frontendBuilder": "grunt",
-    "javaVersion": "8",
-    "enableTranslation": false,
-    "rememberMeKey": "cb0f037ff3c3646f9796359f3916f7e654f33744",
-    "enableSocialSignIn": false,
-    "testFrameworks": [
-      "gatling"
-    ]
-  }
-}
+    "generator-jhipster": {
+        "baseName": "malariaplantdb",
+        "packageName": "nc.ird.malariaplantdb",
+        "packageFolder": "nc/ird/malariaplantdb",
+        "authenticationType": "xauth",
+        "hibernateCache": "ehcache",
+        "clusteredHttpSession": "no",
+        "websocket": "no",
+        "databaseType": "sql",
+        "devDatabaseType": "h2Memory",
+        "prodDatabaseType": "postgresql",
+        "searchEngine": "elasticsearch",
+        "useSass": true,
+        "buildTool": "maven",
+        "frontendBuilder": "grunt",
+        "javaVersion": "8",
+        "enableTranslation": false,
+        "rememberMeKey": "cb0f037ff3c3646f9796359f3916f7e654f33744",
+        "enableSocialSignIn": false,
+        "testFrameworks": [
+            "gatling"
+        ]
+    }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -4,10 +4,10 @@ var fs = require('fs');
 
 var parseString = require('xml2js').parseString;
 // Returns the second occurence of the version number
-var parseVersionFromPomXml = function() {
+var parseVersionFromPomXml = function () {
     var version;
     var pomXml = fs.readFileSync('pom.xml', "utf8");
-    parseString(pomXml, function (err, result){
+    parseString(pomXml, function (err, result) {
         version = result.project.version[0];
     });
     return version;
@@ -16,8 +16,8 @@ var parseVersionFromPomXml = function() {
 // usemin custom step
 var useminAutoprefixer = {
     name: 'autoprefixer',
-    createConfig: function(context, block) {
-        if(block.src.length === 0) {
+    createConfig: function (context, block) {
+        if (block.src.length === 0) {
             return {};
         } else {
             return require('grunt-usemin/lib/config/cssmin').createConfig(context, block); // Reuse cssmins createConfig
@@ -101,7 +101,7 @@ module.exports = function (grunt) {
         browserSync: {
             dev: {
                 bsFiles: {
-                    src : [
+                    src: [
                         'src/main/webapp/**/*.html',
                         'src/main/webapp/scripts/**/*.html',
                         'src/main/webapp/**/*.json',
@@ -185,9 +185,9 @@ module.exports = function (grunt) {
                             js: ['concat', 'uglifyjs'],
                             css: ['cssmin', useminAutoprefixer] // Let cssmin concat files so it corrects relative paths to fonts and images
                         },
-                            post: {}
-                        }
+                        post: {}
                     }
+                }
             }
         },
         usemin: {
@@ -227,7 +227,7 @@ module.exports = function (grunt) {
         cssmin: {
             // src and dest is configured in a subtask called "generated" by usemin
         },
-        ngtemplates:    {
+        ngtemplates: {
             dist: {
                 cwd: 'src/main/webapp',
                 src: ['scripts/app/**/*.html', 'scripts/components/**/*.html'],
@@ -271,7 +271,7 @@ module.exports = function (grunt) {
                     cwd: 'src/main/webapp',
                     dest: '<%= yeoman.dist %>/assets/fonts',
                     src: [
-                      'bower_components/bootstrap/fonts/*.*'
+                        'bower_components/bootstrap/fonts/*.*'
                     ]
                 }]
             },
@@ -297,11 +297,11 @@ module.exports = function (grunt) {
                 }]
             },
             generateOpenshiftDirectory: {
-                    expand: true,
-                    dest: 'deploy/openshift',
-                    src: [
-                        'pom.xml',
-                        'src/main/**'
+                expand: true,
+                dest: 'deploy/openshift',
+                src: [
+                    'pom.xml',
+                    'src/main/**'
                 ]
             }
         },

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "grunt-svgmin": "2.0.1",
     "grunt-text-replace": "0.4.0",
     "grunt-usemin": "3.0.0",
-    "grunt-angular-templates":"0.5.7",
+    "grunt-angular-templates": "0.5.7",
     "load-grunt-tasks": "3.1.0",
     "grunt-karma": "0.11.0",
     "time-grunt": "1.1.0",

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -68,20 +69,29 @@
         <citeproc-java.version>0.6</citeproc-java.version>
         <citation-styles.version>1.0.1-SNAPSHOT</citation-styles.version>
         <citation-locales.version>1.0.1-SNAPSHOT</citation-locales.version>
+        <lombok.version>1.16.18</lombok.version>
+        <commons-beanutils.version>1.9.3</commons-beanutils.version>
+        <jxls.version>1.0.6</jxls.version>
+        <reflections.version>0.9.9</reflections.version>
         <run.addResources>false</run.addResources>
         <spring-security.version>4.0.2.RELEASE</spring-security.version>
         <springfox.version>2.0.3</springfox.version>
         <!-- Sonar properties -->
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <sonar-maven-plugin.version>2.6</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.7.4.201502262128</jacoco-maven-plugin.version>
-        <sonar.exclusions>src/main/webapp/assets/**/*.*, src/main/webapp/bower_components/**/*.*, src/main/webapp/dist/**/*.*</sonar.exclusions>
+        <sonar.exclusions>src/main/webapp/assets/**/*.*, src/main/webapp/bower_components/**/*.*,
+            src/main/webapp/dist/**/*.*
+        </sonar.exclusions>
         <sonar.java.codeCoveragePlugin>jacoco</sonar.java.codeCoveragePlugin>
-        <sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec</sonar.jacoco.itReportPath>
+        <sonar.jacoco.itReportPath>${project.testresult.directory}/coverage/jacoco/jacoco-it.exec
+        </sonar.jacoco.itReportPath>
         <sonar.jacoco.reportPath>${project.testresult.directory}/coverage/jacoco/jacoco.exec</sonar.jacoco.reportPath>
 
-        <sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma</sonar.javascript.jstestdriver.reportsPath>
-        <sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info</sonar.javascript.lcov.reportPath>
+        <sonar.javascript.jstestdriver.reportsPath>${project.testresult.directory}/karma
+        </sonar.javascript.jstestdriver.reportsPath>
+        <sonar.javascript.lcov.reportPath>${project.testresult.directory}/coverage/report-lcov/lcov.info
+        </sonar.javascript.lcov.reportPath>
 
         <sonar.sources>${project.basedir}/src/main/</sonar.sources>
         <sonar.surefire.reportsPath>${project.testresult.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -403,7 +413,35 @@
             <artifactId>locales</artifactId>
             <version>${citation-locales.version}</version>
         </dependency>
-</dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>${commons-beanutils.version}</version>
+        </dependency>
+        <!-- JXLS -->
+        <dependency>
+            <groupId>net.sf.jxls</groupId>
+            <artifactId>jxls-core</artifactId>
+            <version>${jxls.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jxls</groupId>
+            <artifactId>jxls-reader</artifactId>
+            <version>${jxls.version}</version>
+        </dependency>
+        <!-- Reflexion tools -->
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections.version}</version>
+        </dependency>
+    </dependencies>
     <build>
         <defaultGoal>spring-boot:run</defaultGoal>
         <resources>
@@ -482,11 +520,14 @@
                 <configuration>
                     <rules>
                         <requireMavenVersion>
-                            <message>You are running an older version of Maven. JHipster requires at least Maven 3.0</message>
+                            <message>You are running an older version of Maven. JHipster requires at least Maven 3.0
+                            </message>
                             <version>[3.0.0,)</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
-                            <message>You are running an older version of Java. JHipster requires at least JDK ${java.version}</message>
+                            <message>You are running an older version of Java. JHipster requires at least JDK
+                                ${java.version}
+                            </message>
                             <version>[${java.version}.0,)</version>
                         </requireJavaVersion>
                     </rules>
@@ -583,7 +624,9 @@
                 <version>${liquibase.version}</version>
                 <configuration>
                     <changeLogFile>src/main/resources/config/liquibase/master.xml</changeLogFile>
-                    <diffChangeLogFile>src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
+                    <diffChangeLogFile>
+                        src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml
+                    </diffChangeLogFile>
                     <driver></driver>
                     <url></url>
                     <defaultSchemaName></defaultSchemaName>

diff --git a/src/main/java/nc/ird/malariaplantdb/Application.java b/src/main/java/nc/ird/malariaplantdb/Application.java
@@ -2,7 +2,6 @@
 
 import nc.ird.malariaplantdb.config.Constants;
 import nc.ird.malariaplantdb.config.JHipsterProperties;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;

diff --git a/src/main/java/nc/ird/malariaplantdb/ApplicationWebXml.java b/src/main/java/nc/ird/malariaplantdb/ApplicationWebXml.java
@@ -1,7 +1,6 @@
 package nc.ird.malariaplantdb;
 
 import nc.ird.malariaplantdb.config.Constants;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.builder.SpringApplicationBuilder;

diff --git a/src/main/java/nc/ird/malariaplantdb/aop/logging/LoggingAspect.java b/src/main/java/nc/ird/malariaplantdb/aop/logging/LoggingAspect.java
@@ -1,7 +1,6 @@
 package nc.ird.malariaplantdb.aop.logging;
 
 import nc.ird.malariaplantdb.config.Constants;
-
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;

diff --git a/src/main/java/nc/ird/malariaplantdb/async/ExceptionHandlingAsyncTaskExecutor.java b/src/main/java/nc/ird/malariaplantdb/async/ExceptionHandlingAsyncTaskExecutor.java
@@ -1,14 +1,14 @@
 package nc.ird.malariaplantdb.async;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.task.AsyncTaskExecutor;
 
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
 public class ExceptionHandlingAsyncTaskExecutor implements AsyncTaskExecutor,
     InitializingBean, DisposableBean {
 

diff --git a/src/main/java/nc/ird/malariaplantdb/config/AsyncConfiguration.java b/src/main/java/nc/ird/malariaplantdb/config/AsyncConfiguration.java
@@ -1,19 +1,19 @@
 package nc.ird.malariaplantdb.config;
 
 import nc.ird.malariaplantdb.async.ExceptionHandlingAsyncTaskExecutor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.*;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
-import java.util.concurrent.Executor;
-
 import javax.inject.Inject;
+import java.util.concurrent.Executor;
 
 @Configuration
 @EnableAsync

diff --git a/src/main/java/nc/ird/malariaplantdb/config/CacheConfiguration.java b/src/main/java/nc/ird/malariaplantdb/config/CacheConfiguration.java
@@ -7,8 +7,10 @@
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.*;
 import org.springframework.cache.ehcache.EhCacheCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.util.Assert;
 
 import javax.annotation.PreDestroy;

diff --git a/src/main/java/nc/ird/malariaplantdb/config/CloudDatabaseConfiguration.java b/src/main/java/nc/ird/malariaplantdb/config/CloudDatabaseConfiguration.java
@@ -3,7 +3,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.config.java.AbstractCloudConfig;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 import javax.sql.DataSource;
 

diff --git a/src/main/java/nc/ird/malariaplantdb/config/DatabaseConfiguration.java b/src/main/java/nc/ird/malariaplantdb/config/DatabaseConfiguration.java
@@ -1,12 +1,11 @@
 package nc.ird.malariaplantdb.config;
 
-import nc.ird.malariaplantdb.config.liquibase.AsyncSpringLiquibase;
-
 import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.datatype.hibernate4.Hibernate4Module;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import liquibase.integration.spring.SpringLiquibase;
+import nc.ird.malariaplantdb.config.liquibase.AsyncSpringLiquibase;
 import org.h2.tools.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +16,6 @@
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

diff --git a/src/main/java/nc/ird/malariaplantdb/config/JHipsterProperties.java b/src/main/java/nc/ird/malariaplantdb/config/JHipsterProperties.java
@@ -1,9 +1,9 @@
 package nc.ird.malariaplantdb.config;
 
-import javax.validation.constraints.NotNull;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * Properties specific to JHipster.
  *

diff --git a/src/main/java/nc/ird/malariaplantdb/config/JacksonConfiguration.java b/src/main/java/nc/ird/malariaplantdb/config/JacksonConfiguration.java
@@ -1,13 +1,14 @@
 package nc.ird.malariaplantdb.config;
 
-import nc.ird.malariaplantdb.domain.util.*;
-
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import java.time.*;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import nc.ird.malariaplantdb.domain.util.JSR310DateTimeSerializer;
+import nc.ird.malariaplantdb.domain.util.JSR310LocalDateDeserializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+import java.time.*;
 
 @Configuration
 public class JacksonConfiguration {