Merge branch 'master' of archives.plil.fr:LeClubInfo/etunicorn-server

Geoffrey PREUD'HOMME
2 parents 80ff6022 8cbe108c
Showing 15 changed files with 259 additions and 36 deletions Show diff stats
.idea/dataSources.local.xml
.idea/dataSources.xml
.idea/dataSources/0d8f27ad-8161-4ee1-8557-56db7fbf44cc/storage.xml
.idea/dataSources/a06fd1f6-5928-4430-a317-e5ebc0e00a82/storage.xml
.idea/dataSources/a88dec51-cb33-4875-a137-6d17703d6d6c/storage.xml
.idea/dataSources/ebfeef5a-f196-4340-9424-14e4e8aaadbb.xml
.idea/dataSources/ebfeef5a-f196-4340-9424-14e4e8aaadbb/storage.xml
.idea/modules.xml
etunicorn-server.iml
pom.xml
src/main/java/etunicorn/Application.java
src/main/java/etunicorn/Personne.java
src/main/java/etunicorn/databaseConfiguration/SQLiteDialect.java
src/main/main.iml
src/main/ressources/application.yml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal">
+    <data-source name="etunicorn.db" uuid="ebfeef5a-f196-4340-9424-14e4e8aaadbb">
+      <database-info product="SQLite" version="3.8.11" jdbc-version="2.1" driver-name="SQLiteJDBC" driver-version="native" />
+      <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
+      <secret-storage>master_key</secret-storage>
+      <auth-required>false</auth-required>
+    </data-source>
+  </component>
+</project>
 \ No newline at end of file
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="etunicorn.db" uuid="ebfeef5a-f196-4340-9424-14e4e8aaadbb">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/etunicorn.db</jdbc-url>
+    </data-source>
+  </component>
+</project>
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<storage-settings staging-layout="plain" base-layout="schema-zip" language="H2"/>
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<storage-settings staging-layout="plain" base-layout="schema-zip" language="H2"/>
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<storage-settings staging-layout="plain" base-layout="schema-zip" language="H2"/>
 \ No newline at end of file
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataSource name="etunicorn.db">
+  <database-model serializer="dbm" rdbms="SQLITE" format-version="4.0">
+    <root id="1"/>
+    <schema id="2" parent="1">
+      <Current>1</Current>
+      <Visible>1</Visible>
+    </schema>
+    <table id="3" parent="2" name="personne"/>
+    <column id="4" parent="3" name="id">
+      <DataType>INTEGER(0,-1)|4</DataType>
+    </column>
+    <column id="5" parent="3" name="carte">
+      <Position>1</Position>
+      <DataType>VARCHAR(0,-1)|12</DataType>
+    </column>
+    <column id="6" parent="3" name="login">
+      <Position>2</Position>
+      <DataType>VARCHAR(0,-1)|12</DataType>
+    </column>
+    <column id="7" parent="3" name="naissance">
+      <Position>3</Position>
+      <DataType>TIMESTAMP(0,-1)|12</DataType>
+    </column>
+    <key id="8" parent="3">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+  </database-model>
+</dataSource>
 \ No newline at end of file
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<storage-settings staging-layout="plain" base-layout="schema-zip" language="SQLite"/>
 \ No newline at end of file
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/etunicorn-server.iml" filepath="$PROJECT_DIR$/etunicorn-server.iml" />
-      <module fileurl="file://$PROJECT_DIR$/src/main/main.iml" filepath="$PROJECT_DIR$/src/main/main.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/ressources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.16.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-rest:1.4.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.4.RELEASE" level="project" />
@@ -83,6 +85,6 @@
     <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" />
-    <orderEntry type="library" name="Maven: com.h2database:h2:1.4.193" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.16.1" level="project" />
   </component>
 -</module>
+</module>
 \ No newline at end of file
@@ -30,10 +30,13 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.16.1</version>
         </dependency>
+        
     </dependencies>
     <properties>
@@ -42,6 +45,13 @@
     <build>
+        <resources>
+            <resource>
+                <directory>
+                    src/main/ressources
+                </directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -2,14 +2,24 @@ package etunicorn;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+<<<<<<< HEAD
 import org.springframework.context.annotation.Bean;
+=======
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+
+import javax.sql.DataSource;
+>>>>>>> 8cbe108cd842b37e3fe6c969ad942e5651d557b3
 /**
  * Created by geoffrey on 28/01/17.
  */
 @SpringBootApplication
+@EnableAutoConfiguration
 public class Application {
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
@@ -23,4 +33,11 @@ public class Application {
             // ...
         };
     }
+
+    public DataSource dataSource(){
+        DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
+        dataSourceBuilder.driverClassName("org.sqlite.JDBC");
+        dataSourceBuilder.url("jdbc:sqlite:etunicorn.db");
+        return dataSourceBuilder.build();
+    }
 }
@@ -9,6 +9,7 @@ import java.util.Date;
 @Entity
 public class Personne {
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
@@ -0,0 +1,159 @@
+package etunicorn.databaseConfiguration;
+
+/**
+ * Created by badet on 29/01/2017.
+ */
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.function.SQLFunctionTemplate;
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.dialect.function.VarArgsSQLFunction;
+import org.hibernate.type.StringType;
+
+import java.sql.Types;
+
+public class SQLiteDialect extends Dialect {
+    public SQLiteDialect() {
+        registerColumnType(Types.BIT, "integer");
+        registerColumnType(Types.TINYINT, "tinyint");
+        registerColumnType(Types.SMALLINT, "smallint");
+        registerColumnType(Types.INTEGER, "integer");
+        registerColumnType(Types.BIGINT, "bigint");
+        registerColumnType(Types.FLOAT, "float");
+        registerColumnType(Types.REAL, "real");
+        registerColumnType(Types.DOUBLE, "double");
+        registerColumnType(Types.NUMERIC, "numeric");
+        registerColumnType(Types.DECIMAL, "decimal");
+        registerColumnType(Types.CHAR, "char");
+        registerColumnType(Types.VARCHAR, "varchar");
+        registerColumnType(Types.LONGVARCHAR, "longvarchar");
+        registerColumnType(Types.DATE, "date");
+        registerColumnType(Types.TIME, "time");
+        registerColumnType(Types.TIMESTAMP, "timestamp");
+        registerColumnType(Types.BINARY, "blob");
+        registerColumnType(Types.VARBINARY, "blob");
+        registerColumnType(Types.LONGVARBINARY, "blob");
+        // registerColumnType(Types.NULL, "null");
+        registerColumnType(Types.BLOB, "blob");
+        registerColumnType(Types.CLOB, "clob");
+        registerColumnType(Types.BOOLEAN, "integer");
+
+        registerFunction( "concat", new VarArgsSQLFunction(StringType.INSTANCE, "", "||", "") );
+        registerFunction( "mod", new SQLFunctionTemplate( StringType.INSTANCE, "?1 % ?2" ) );
+        registerFunction( "substr", new StandardSQLFunction("substr", StringType.INSTANCE) );
+        registerFunction( "substring", new StandardSQLFunction( "substr", StringType.INSTANCE) );
+    }
+
+    public boolean supportsIdentityColumns() {
+        return true;
+    }
+
+  /*
+  public boolean supportsInsertSelectIdentity() {
+    return true; // As specify in NHibernate dialect
+  }
+  */
+
+    public boolean hasDataTypeInIdentityColumn() {
+        return false; // As specify in NHibernate dialect
+    }
+
+  /*
+  public String appendIdentitySelectToInsert(String insertString) {
+    return new StringBuffer(insertString.length()+30). // As specify in NHibernate dialect
+      append(insertString).
+      append("; ").append(getIdentitySelectString()).
+      toString();
+  }
+  */
+
+    public String getIdentityColumnString() {
+        // return "integer primary key autoincrement";
+        return "integer";
+    }
+
+    public String getIdentitySelectString() {
+        return "select last_insert_rowid()";
+    }
+
+    public boolean supportsLimit() {
+        return true;
+    }
+
+    protected String getLimitString(String query, boolean hasOffset) {
+        return new StringBuffer(query.length()+20).
+                append(query).
+                append(hasOffset ? " limit ? offset ?" : " limit ?").
+                toString();
+    }
+
+    public boolean supportsTemporaryTables() {
+        return true;
+    }
+
+    public String getCreateTemporaryTableString() {
+        return "create temporary table if not exists";
+    }
+
+    public boolean dropTemporaryTableAfterUse() {
+        return false;
+    }
+
+    public boolean supportsCurrentTimestampSelection() {
+        return true;
+    }
+
+    public boolean isCurrentTimestampSelectStringCallable() {
+        return false;
+    }
+
+    public String getCurrentTimestampSelectString() {
+        return "select current_timestamp";
+    }
+
+    public boolean supportsUnionAll() {
+        return true;
+    }
+
+    public boolean hasAlterTable() {
+        return false; // As specify in NHibernate dialect
+    }
+
+    public boolean dropConstraints() {
+        return false;
+    }
+
+    public String getAddColumnString() {
+        return "add column";
+    }
+
+    public String getForUpdateString() {
+        return "";
+    }
+
+    public boolean supportsOuterJoinForUpdate() {
+        return false;
+    }
+
+    public String getDropForeignKeyString() {
+        throw new UnsupportedOperationException("No drop foreign key syntax supported by SQLiteDialect");
+    }
+
+    public String getAddForeignKeyConstraintString(String constraintName,
+                                                   String[] foreignKey, String referencedTable, String[] primaryKey,
+                                                   boolean referencesPrimaryKey) {
+        throw new UnsupportedOperationException("No add foreign key syntax supported by SQLiteDialect");
+    }
+
+    public String getAddPrimaryKeyConstraintString(String constraintName) {
+        throw new UnsupportedOperationException("No add primary key syntax supported by SQLiteDialect");
+    }
+
+    public boolean supportsIfExistsBeforeTableName() {
+        return true;
+    }
+
+    public boolean supportsCascadeDelete() {
+        return false;
+    }
+}
 \ No newline at end of file
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-core:2.5.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.11" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.22" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" level="project" />
-  </component>
-</module>
 \ No newline at end of file
@@ -0,0 +1,5 @@
+spring:
+  jpa:
+    database-platform: etunicorn.databaseConfiguration.SQLiteDialect
+    hibernate:
+      ddl-auto: create-drop
 \ No newline at end of file