#14 - Move to groupId: io.ebean artifactId: ebean-datasource

rbygrave · rbygrave · commit b346fbdb2c75 · 2018-10-26T01:00:04.000+13:00
diff --git a/pom.xml b/pom.xml
@@ -8,8 +8,9 @@
     <version>1.3</version>
   </parent>
 
-  <artifactId>avaje-datasource</artifactId>
-  <version>4.1.2-SNAPSHOT</version>
+  <groupId>io.ebean</groupId>
+  <artifactId>ebean-datasource</artifactId>
+  <version>4.2.1-SNAPSHOT</version>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/avaje-datasource.git</developerConnection>
@@ -19,9 +20,9 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-datasource-api</artifactId>
-      <version>4.1</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource-api</artifactId>
+      <version>4.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebean/datasource/core/Factory.java b/src/main/java/io/ebean/datasource/core/Factory.java
@@ -1,9 +1,9 @@
-package org.avaje.datasource.core;
+package io.ebean.datasource.core;
 
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourceFactory;
-import org.avaje.datasource.DataSourcePool;
-import org.avaje.datasource.pool.ConnectionPool;
+import io.ebean.datasource.pool.ConnectionPool;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceFactory;
+import io.ebean.datasource.DataSourcePool;
 
 /**
  * Service factory implementation.
diff --git a/src/main/java/io/ebean/datasource/delegate/ConnectionDelegator.java b/src/main/java/io/ebean/datasource/delegate/ConnectionDelegator.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.delegate;
+package io.ebean.datasource.delegate;
 
 import java.sql.*;
 import java.util.Map;
@@ -8,7 +8,7 @@
 public class ConnectionDelegator implements Connection {
 
   private final Connection delegate;
-  
+
   protected String currentSchema;
 
   public ConnectionDelegator(Connection delegate) {
diff --git a/src/main/java/io/ebean/datasource/delegate/PreparedStatementDelegator.java b/src/main/java/io/ebean/datasource/delegate/PreparedStatementDelegator.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.delegate;
+package io.ebean.datasource.delegate;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/src/main/java/io/ebean/datasource/pool/BusyConnectionBuffer.java b/src/main/java/io/ebean/datasource/pool/BusyConnectionBuffer.java
@@ -1,6 +1,5 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.pool.PooledConnectionStatistics.LoadValues;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -97,7 +96,7 @@ protected boolean remove(PooledConnection pc) {
   /**
    * Collect the load statistics from all the busy connections.
    */
-  void collectStatistics(LoadValues values, boolean reset) {
+  void collectStatistics(PooledConnectionStatistics.LoadValues values, boolean reset) {
 
     for (int i = 0; i < slots.length; i++) {
       if (slots[i] != null) {
diff --git a/src/main/java/io/ebean/datasource/pool/ConnectionPool.java b/src/main/java/io/ebean/datasource/pool/ConnectionPool.java
@@ -1,13 +1,13 @@
-package org.avaje.datasource.pool;
-
-import org.avaje.datasource.DataSourceAlert;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourceConfigurationException;
-import org.avaje.datasource.DataSourceInitialiseException;
-import org.avaje.datasource.DataSourcePool;
-import org.avaje.datasource.DataSourcePoolListener;
-import org.avaje.datasource.PoolStatistics;
-import org.avaje.datasource.PoolStatus;
+package io.ebean.datasource.pool;
+
+import io.ebean.datasource.DataSourceAlert;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfigurationException;
+import io.ebean.datasource.DataSourceInitialiseException;
+import io.ebean.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePoolListener;
+import io.ebean.datasource.PoolStatistics;
+import io.ebean.datasource.PoolStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebean/datasource/pool/DataSourcePoolStatistics.java b/src/main/java/io/ebean/datasource/pool/DataSourcePoolStatistics.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.PoolStatistics;
+import io.ebean.datasource.PoolStatistics;
 
 /**
  * Represents aggregated statistics collected from the DataSourcePool.
diff --git a/src/main/java/io/ebean/datasource/pool/ExtendedPreparedStatement.java b/src/main/java/io/ebean/datasource/pool/ExtendedPreparedStatement.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/src/main/java/io/ebean/datasource/pool/ExtendedStatement.java b/src/main/java/io/ebean/datasource/pool/ExtendedStatement.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.delegate.PreparedStatementDelegator;
+import io.ebean.datasource.delegate.PreparedStatementDelegator;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/src/main/java/io/ebean/datasource/pool/FreeConnectionBuffer.java b/src/main/java/io/ebean/datasource/pool/FreeConnectionBuffer.java
@@ -1,6 +1,5 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.pool.PooledConnectionStatistics.LoadValues;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -100,7 +99,7 @@ int trim(long usedSince, long createdSince) {
   /**
    * Collect the load statistics from all the free connections.
    */
-  void collectStatistics(LoadValues values, boolean reset) {
+  void collectStatistics(PooledConnectionStatistics.LoadValues values, boolean reset) {
 
     for (PooledConnection c : freeBuffer) {
       values.plus(c.getStatistics().getValues(reset));
diff --git a/src/main/java/io/ebean/datasource/pool/PooledConnection.java b/src/main/java/io/ebean/datasource/pool/PooledConnection.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.delegate.ConnectionDelegator;
+import io.ebean.datasource.delegate.ConnectionDelegator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebean/datasource/pool/PooledConnectionQueue.java b/src/main/java/io/ebean/datasource/pool/PooledConnectionQueue.java
@@ -1,9 +1,8 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.PoolStatistics;
-import org.avaje.datasource.PoolStatus;
-import org.avaje.datasource.pool.ConnectionPool.Status;
-import org.avaje.datasource.pool.PooledConnectionStatistics.LoadValues;
+import io.ebean.datasource.PoolStatistics;
+import io.ebean.datasource.PoolStatus;
+import io.ebean.datasource.pool.ConnectionPool.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +40,7 @@ public class PooledConnectionQueue {
   /**
    * Currently accumulated load statistics.
    */
-  private LoadValues accumulatedValues = new LoadValues();
+  private PooledConnectionStatistics.LoadValues accumulatedValues = new PooledConnectionStatistics.LoadValues();
 
   /**
    * Main lock guarding all access
@@ -142,14 +141,14 @@ PoolStatistics getStatistics(boolean reset) {
     lock.lock();
     try {
 
-      LoadValues aggregate = collectedStats.getValues(reset);
+      PooledConnectionStatistics.LoadValues aggregate = collectedStats.getValues(reset);
 
       freeList.collectStatistics(aggregate, reset);
       busyList.collectStatistics(aggregate, reset);
 
       aggregate.plus(accumulatedValues);
 
-      this.accumulatedValues = (reset) ? new LoadValues() : aggregate;
+      this.accumulatedValues = (reset) ? new PooledConnectionStatistics.LoadValues() : aggregate;
 
       return new DataSourcePoolStatistics(aggregate.getCollectionStart(), aggregate.getCount(), aggregate.getErrorCount(), aggregate.getHwmMicros(), aggregate.getTotalMicros());
 
diff --git a/src/main/java/io/ebean/datasource/pool/PooledConnectionStatistics.java b/src/main/java/io/ebean/datasource/pool/PooledConnectionStatistics.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
@@ -42,7 +42,7 @@ public void add(PooledConnectionStatistics other) {
    */
   public void add(long durationNanos, boolean hasError) {
 
-    // This will be done in pretty much single threaded fashion 
+    // This will be done in pretty much single threaded fashion
     // as the Connections generally are not shared across threads
 
     if (hasError) {
diff --git a/src/main/java/io/ebean/datasource/pool/PstmtCache.java b/src/main/java/io/ebean/datasource/pool/PstmtCache.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -173,4 +173,4 @@ protected boolean removeEldestEntry(Map.Entry<String, ExtendedPreparedStatement>
 
 
 }
- 
+
diff --git a/src/main/java/io/ebean/datasource/pool/TransactionIsolation.java b/src/main/java/io/ebean/datasource/pool/TransactionIsolation.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
 import java.sql.Connection;
 
diff --git a/src/main/java/io/ebean/datasource/pool/message.properties b/src/main/java/io/ebean/datasource/pool/message.properties
diff --git a/src/main/java/io/ebean/datasource/pool/package.html b/src/main/java/io/ebean/datasource/pool/package.html
diff --git a/src/main/resources/META-INF/services/io.ebean.datasource.DataSourceFactory b/src/main/resources/META-INF/services/io.ebean.datasource.DataSourceFactory
@@ -0,0 +1 @@
+io.ebean.datasource.core.Factory
diff --git a/src/main/resources/META-INF/services/org.avaje.datasource.DataSourceFactory b/src/main/resources/META-INF/services/org.avaje.datasource.DataSourceFactory
diff --git a/src/test/java/io/ebean/datasource/FactoryTest.java b/src/test/java/io/ebean/datasource/FactoryTest.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource;
+package io.ebean.datasource;
 
-import org.avaje.datasource.core.Factory;
+import io.ebean.datasource.core.Factory;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -27,4 +27,4 @@ public void createPool() throws Exception {
     stmt.execute();
 
   }
-}
+}
diff --git a/src/test/java/io/ebean/datasource/pool/BusyConnectionBufferTest.java b/src/test/java/io/ebean/datasource/pool/BusyConnectionBufferTest.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
 
 import org.testng.annotations.Test;
diff --git a/src/test/java/io/ebean/datasource/pool/ConnectionPoolInterruptTest.java b/src/test/java/io/ebean/datasource/pool/ConnectionPoolInterruptTest.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
@@ -65,4 +65,4 @@ private void getConnectionAndDoWork(String threadName) {
     }
   }
 
-}
+}
diff --git a/src/test/java/io/ebean/datasource/pool/ConnectionPoolSpeedTest.java b/src/test/java/io/ebean/datasource/pool/ConnectionPoolSpeedTest.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterClass;
@@ -90,4 +90,4 @@ private void getAndCloseSome() throws SQLException {
     total += num;
   }
 
-}
+}
diff --git a/src/test/java/io/ebean/datasource/pool/ConnectionPoolTest.java b/src/test/java/io/ebean/datasource/pool/ConnectionPoolTest.java
@@ -1,7 +1,7 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.PoolStatistics;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.PoolStatistics;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
@@ -10,8 +10,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import javax.sql.DataSource;
-
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 public class ConnectionPoolTest {
@@ -119,7 +117,7 @@ public void getDelegate() throws SQLException {
     assertThat(underlying).isInstanceOf(org.h2.jdbc.JdbcConnection.class);
     connection.close();
   }
-  
+
   @Test
   public void testSchemaSwitch() throws SQLException {
     Connection conn = pool.getConnection();
@@ -129,7 +127,7 @@ public void testSchemaSwitch() throws SQLException {
     stmt.executeUpdate("CREATE TABLE TENANT_1.LOCAL_MODEL (id integer)");
     stmt.executeUpdate("CREATE TABLE TENANT_2.LOCAL_MODEL (id integer)");
     stmt.close();
-    
+
     conn.setSchema("TENANT_1");
     PreparedStatement ps1 = conn.prepareStatement("SELECT * from local_model");
     ps1.close();
@@ -144,4 +142,4 @@ public void testSchemaSwitch() throws SQLException {
     assertThat(ps1).isSameAs(ps2);  // test if pstmtCache is working
     assertThat(ps1).isNotSameAs(ps3); // test if datasource recognize schema change
   }
-}
+}
diff --git a/src/test/java/io/ebean/datasource/pool/ConnectionPoolTrimIdleTest.java b/src/test/java/io/ebean/datasource/pool/ConnectionPoolTrimIdleTest.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -127,4 +127,4 @@ public void run() {
       }
     }
   }
-}
+}
diff --git a/src/test/java/io/ebean/datasource/pool/ExtendedPreparedStatementTest.java b/src/test/java/io/ebean/datasource/pool/ExtendedPreparedStatementTest.java
@@ -1,6 +1,6 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -36,4 +36,4 @@ public void extraClose_expect_noObjectAlreadyClosedError() throws SQLException {
 			}
 		}
 	}
-}
+}
diff --git a/src/test/java/io/ebean/datasource/pool/FreeConnectionBufferTest.java b/src/test/java/io/ebean/datasource/pool/FreeConnectionBufferTest.java
@@ -1,4 +1,4 @@
-package org.avaje.datasource.pool;
+package io.ebean.datasource.pool;
 
 import org.mockito.Mockito;
 import org.testng.annotations.Test;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.avaje.datasource.delegate;`
	`1`	`+package io.ebean.datasource.delegate;`
`2`	`2`
`3`	`3`	`import java.io.InputStream;`
`4`	`4`	`import java.io.Reader;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.avaje.datasource.pool;`
	`1`	`+package io.ebean.datasource.pool;`
`2`	`2`
`3`	`3`	`import java.io.InputStream;`
`4`	`4`	`import java.io.Reader;`