From f85fa772bff7dd25a1b76e98bf44934cbf9af709 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 4 Oct 2017 21:06:55 +1300
Subject: [PATCH] #1147 - Refactor move DbMigration internals into
 io.ebeaninternal - change to use DbMigration.create() - move
 DbMigrationFactory.create() method

---
 .../java/io/ebean/dbmigration/DbMigration.java   |  9 ++++++++-
 .../io/ebean/dbmigration/DbMigrationFactory.java | 16 ----------------
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 src/main/java/io/ebean/dbmigration/DbMigrationFactory.java

diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java
index 505664739..0680e06af 100644
--- a/src/main/java/io/ebean/dbmigration/DbMigration.java
+++ b/src/main/java/io/ebean/dbmigration/DbMigration.java
@@ -6,6 +6,8 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.ServiceLoader;
 
 /**
  * Generates DDL migration scripts based on changes to the current model.
@@ -39,7 +41,12 @@ public interface DbMigration {
    * Create a DbMigration implementation to use.
    */
   static DbMigration create() {
-    return DbMigrationFactory.create();
+
+    Iterator<DbMigration> loader = ServiceLoader.load(DbMigration.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for DbMigration?");
   }
 
   /**
diff --git a/src/main/java/io/ebean/dbmigration/DbMigrationFactory.java b/src/main/java/io/ebean/dbmigration/DbMigrationFactory.java
deleted file mode 100644
index 4256af1f4..000000000
--- a/src/main/java/io/ebean/dbmigration/DbMigrationFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.ebean.dbmigration;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-class DbMigrationFactory {
-
-  static DbMigration create() {
-
-    Iterator<DbMigration> loader = ServiceLoader.load(DbMigration.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for DbMigration?");
-  }
-}