Move GlobalPoolLock and PoolUtilities into the pool package.

hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java

@@ -53,9 +53,7 @@ import com.zaxxer.hikari.proxy.ProxyFactory;
 import com.zaxxer.hikari.util.ConcurrentBag;
 import com.zaxxer.hikari.util.IBagStateListener;
 import com.zaxxer.hikari.util.DefaultThreadFactory;
-import com.zaxxer.hikari.util.GlobalPoolLock;
 import com.zaxxer.hikari.util.LeakTask;
-import com.zaxxer.hikari.util.PoolUtilities;
 
 /**
  * This is the primary connection pool class that provides the basic
@@ -334,7 +332,10 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
    @Override
    public final void suspendPool()
    {
-      if (poolState != POOL_SUSPENDED) {
+      if (suspendResumeLock == GlobalPoolLock.FAUX_LOCK) {
+         throw new IllegalStateException("Pool " + configuration.getPoolName() + " is not suspendable");
+      }
+      else if (poolState != POOL_SUSPENDED) {
          suspendResumeLock.suspend();
          poolState = POOL_SUSPENDED;
       }

hikaricp-common/src/main/java/com/zaxxer/hikari/pool/GlobalPoolLock.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.zaxxer.hikari.util;
+package com.zaxxer.hikari.pool;
 
 import java.util.concurrent.Semaphore;
 

hikaricp-common/src/main/java/com/zaxxer/hikari/pool/PoolUtilities.java

@@ -1,4 +1,4 @@
-package com.zaxxer.hikari.util;
+package com.zaxxer.hikari.pool;
 
 import static com.zaxxer.hikari.util.UtilityElf.createInstance;
 import static com.zaxxer.hikari.util.UtilityElf.createThreadPoolExecutor;
@@ -16,6 +16,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.util.DriverDataSource;
+import com.zaxxer.hikari.util.PropertyBeanSetter;
 
 public final class PoolUtilities
 {

hikaricp-common/src/main/java/com/zaxxer/hikari/util/UtilityElf.java

@@ -102,7 +102,7 @@ public final class UtilityElf
       }
 
       try {
-         Class<?> loaded = PoolUtilities.class.getClassLoader().loadClass(className);
+         Class<?> loaded = UtilityElf.class.getClassLoader().loadClass(className);
 
          Class<?>[] argClasses = new Class<?>[args.length];
          for (int i = 0; i < args.length; i++) {

hikaricp-common/src/test/java/com/zaxxer/hikari/ShutdownTest.java

@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import com.zaxxer.hikari.mocks.StubConnection;
 import com.zaxxer.hikari.pool.HikariPool;
-import com.zaxxer.hikari.util.PoolUtilities;
+import com.zaxxer.hikari.pool.PoolUtilities;
 import com.zaxxer.hikari.util.UtilityElf;
 
 /**