merge ebean

Author: garbagetown

README.md

@@ -13,6 +13,7 @@
 * [S2JDBC](demo-s2jdbc)
 * [DBFlute](demo-dbflute)
 * [Iciql](demo-iciql)
+* [Ebean](demo-ebean)
 
 Pull Requests Welcome :)
 

demo-ebean/pom.xml

@@ -34,20 +34,20 @@
 		</dependency>
 
 		<dependency>
-				<groupId>org.avaje.ebeanorm</groupId>
-				<artifactId>avaje-ebeanorm</artifactId>
-				<version>7.18.1</version>
+			<groupId>org.avaje.ebeanorm</groupId>
+			<artifactId>avaje-ebeanorm</artifactId>
+			<version>7.18.1</version>
 		</dependency>
 		<dependency>
-				<groupId>org.avaje.ebeanorm</groupId>
-				<artifactId>querybean-generator</artifactId>
-				<version>2.3.1</version>
-				<scope>provided</scope>
+			<groupId>org.avaje.ebeanorm</groupId>
+			<artifactId>querybean-generator</artifactId>
+			<version>2.3.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
-				<groupId>org.avaje.ebeanorm</groupId>
-				<artifactId>avaje-ebeanorm-querybean</artifactId>
-				<version>7.15.1</version>
+			<groupId>org.avaje.ebeanorm</groupId>
+			<artifactId>avaje-ebeanorm-querybean</artifactId>
+			<version>7.15.1</version>
 		</dependency>
 
 		<dependency>
@@ -62,11 +62,11 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-				<groupId>org.avaje.composite</groupId>
-				<artifactId>avaje-composite-testing-ebean</artifactId>
-				<version>4.1</version>
-				<type>pom</type>
-				<scope>test</scope>
+			<groupId>org.avaje.composite</groupId>
+			<artifactId>avaje-composite-testing-ebean</artifactId>
+			<version>4.1</version>
+			<type>pom</type>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
@@ -96,7 +96,6 @@
 				</executions>
 			</plugin>
 
-
 			<plugin>
 				<groupId>org.avaje.ebeanorm</groupId>
 				<artifactId>querybean-maven-plugin</artifactId>
@@ -125,8 +124,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-			
 		</plugins>
 	</build>
 

demo-ebean/src/main/java/com/example/EbeanFactroyBean.java

@@ -1,43 +1,43 @@
-package com.example;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
-import org.springframework.stereotype.Component;
-
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.ServerConfig;
-
-@Component
-public class EbeanFactroyBean implements FactoryBean<EbeanServer> {
-
-    private final DataSource dataSource;
-    
-    public EbeanFactroyBean(DataSource dataSource) {
-        this.dataSource = new TransactionAwareDataSourceProxy(dataSource);
-    }
-
-    @Override
-    public EbeanServer getObject() throws Exception {
-
-        ServerConfig config = new ServerConfig();
-        config.setName("db");
-        config.setDataSource(dataSource);
-        config.setDefaultServer(true);
-        config.setRegister(true);
-
-        return EbeanServerFactory.create(config);
-    }
-
-    @Override
-    public Class<?> getObjectType() {
-        return EbeanServer.class;
-    }
-
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
-}
+package com.example;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
+import org.springframework.stereotype.Component;
+
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.EbeanServerFactory;
+import com.avaje.ebean.config.ServerConfig;
+
+@Component
+public class EbeanFactroyBean implements FactoryBean<EbeanServer> {
+
+    private final DataSource dataSource;
+    
+    public EbeanFactroyBean(DataSource dataSource) {
+        this.dataSource = new TransactionAwareDataSourceProxy(dataSource);
+    }
+
+    @Override
+    public EbeanServer getObject() throws Exception {
+
+        ServerConfig config = new ServerConfig();
+        config.setName("default");
+        config.setDataSource(dataSource);
+        config.setDefaultServer(true);
+        config.setRegister(true);
+
+        return EbeanServerFactory.create(config);
+    }
+
+    @Override
+    public Class<?> getObjectType() {
+        return EbeanServer.class;
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+}

demo-ebean/src/main/resources/application.properties

@@ -1,2 +1,2 @@
-logging.level.org.avaje.ebean.SQL=DEBUG
-logging.level.org.avaje.ebean.TXN=DEBUG
+logging.level.org.avaje.ebean.SQL=DEBUG
+logging.level.org.avaje.ebean.TXN=DEBUG