From f8ad85a75ae0d0b97702ee26fd544a71398224ae Mon Sep 17 00:00:00 2001 From: SgtJalau Date: Sat, 25 Dec 2021 19:28:59 +0100 Subject: [PATCH 1/4] Only run migrations if config boolean is set. Otherwise this leads to an error because migration credentials aren't set --- src/main/java/net/silthus/ebean/EbeanWrapper.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/silthus/ebean/EbeanWrapper.java b/src/main/java/net/silthus/ebean/EbeanWrapper.java index f2a9ddb..d92c924 100644 --- a/src/main/java/net/silthus/ebean/EbeanWrapper.java +++ b/src/main/java/net/silthus/ebean/EbeanWrapper.java @@ -2,10 +2,7 @@ import io.ebean.Database; import io.ebean.DatabaseFactory; -import io.ebean.migration.AutoRunner; -import io.ebean.migration.MigrationConfig; import io.ebean.migration.MigrationRunner; -import io.ebean.migration.auto.AutoMigrationRunner; import org.apache.commons.io.FileUtils; import java.io.File; @@ -105,7 +102,9 @@ public Database connect() { throw new RuntimeException("Unable to find " + driver.getIdentifier() + " driver class " + driver.getDriverClass() + " inside " + driverLocation.getAbsolutePath(), e); } - new MigrationRunner(config.getMigrationConfig()).run(); + if(config.isRunMigrations()) { + new MigrationRunner(config.getMigrationConfig()).run(); + } database = DatabaseFactory.create(config.getDatabaseConfig()); From 8c665e9e1155baab4461698f2c4d57ef0da4baa8 Mon Sep 17 00:00:00 2001 From: SgtJalau Date: Sat, 25 Dec 2021 20:33:19 +0100 Subject: [PATCH 2/4] Added support for BungeeCord --- build.gradle | 3 +++ .../java/net/silthus/ebean/EbeanWrapperBungee.java | 13 +++++++++++++ src/main/resources/bungee.yml | 4 ++++ 3 files changed, 20 insertions(+) create mode 100644 src/main/java/net/silthus/ebean/EbeanWrapperBungee.java create mode 100644 src/main/resources/bungee.yml diff --git a/build.gradle b/build.gradle index fe134f6..fd5d819 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,8 @@ repositories { mavenCentral() maven { url 'https://jitpack.io' } + + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { @@ -61,6 +63,7 @@ dependencies { api 'io.ebean:ebean:12.12.0' api 'io.ebean:ebean-querybean:12.12.1' + compileOnly "net.md-5:bungeecord-api:1.17-R0.1-SNAPSHOT" implementation 'io.ebean:ebean-migration:12.12.1' testImplementation group: 'com.h2database', name: 'h2', version: '1.4.200' diff --git a/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java b/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java new file mode 100644 index 0000000..f96230a --- /dev/null +++ b/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java @@ -0,0 +1,13 @@ +package net.silthus.ebean; + +import net.md_5.bungee.api.plugin.Plugin; + +/** + * Created by Maurice on 04.01.2017. + */ +public class EbeanWrapperBungee extends Plugin { + + @Override + public void onLoad() { + } +} diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml new file mode 100644 index 0000000..d8da32c --- /dev/null +++ b/src/main/resources/bungee.yml @@ -0,0 +1,4 @@ +name: EbeanWrapper +version: 1.0 +author: Silthus +main: net.silthus.ebean.EbeanWrapperBungee \ No newline at end of file From 1faa7fac9575b3111d1f137e0fc5072bf62c6c35 Mon Sep 17 00:00:00 2001 From: SgtJalau Date: Mon, 17 Jan 2022 16:38:52 +0100 Subject: [PATCH 3/4] feat: bungee support & fixed migrations running without data set --- build.gradle | 2 +- src/main/java/net/silthus/ebean/EbeanWrapperBungee.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index fd5d819..26bc3e5 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ dependencies { api 'io.ebean:ebean:12.12.0' api 'io.ebean:ebean-querybean:12.12.1' - compileOnly "net.md-5:bungeecord-api:1.17-R0.1-SNAPSHOT" + implementation "net.md-5:bungeecord-api:" + mcVersion + "-R0.1-SNAPSHOT" implementation 'io.ebean:ebean-migration:12.12.1' testImplementation group: 'com.h2database', name: 'h2', version: '1.4.200' diff --git a/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java b/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java index f96230a..d6b494d 100644 --- a/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java +++ b/src/main/java/net/silthus/ebean/EbeanWrapperBungee.java @@ -2,9 +2,6 @@ import net.md_5.bungee.api.plugin.Plugin; -/** - * Created by Maurice on 04.01.2017. - */ public class EbeanWrapperBungee extends Plugin { @Override From 55f5f0d0bc11cea64fa05299dc5272ee1464de48 Mon Sep 17 00:00:00 2001 From: SgtJalau Date: Tue, 18 Apr 2023 17:52:02 +0200 Subject: [PATCH 4/4] Bumped up ebean version to latest of 12 13 refactored a few things, so that will have to be done at a different time --- build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 26bc3e5..0590a37 100644 --- a/build.gradle +++ b/build.gradle @@ -55,23 +55,25 @@ repositories { } dependencies { - annotationProcessor 'io.ebean:querybean-generator:12.12.1' + annotationProcessor 'io.ebean:querybean-generator:12.16.1' implementation spigot(mcVersion) implementation group: 'commons-io', name: 'commons-io', version: '2.10.0' - api 'io.ebean:ebean:12.12.0' - api 'io.ebean:ebean-querybean:12.12.1' - implementation "net.md-5:bungeecord-api:" + mcVersion + "-R0.1-SNAPSHOT" - implementation 'io.ebean:ebean-migration:12.12.1' + api 'io.ebean:ebean:12.16.1' + api 'io.ebean:ebean-querybean:12.16.1' + implementation 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT' + implementation 'io.ebean:ebean-migration:12.16.1' +// implementation 'io.ebean:ebean-platform-all:12.16.3' testImplementation group: 'com.h2database', name: 'h2', version: '1.4.200' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' testImplementation 'org.mockito:mockito-core:3.12.4' testImplementation 'org.assertj:assertj-core:3.21.0' - testImplementation 'io.ebean:ebean-test:12.12.1' + testImplementation 'io.ebean:ebean-test:12.16.1' +// implementation 'io.ebean:ebean-ddl-generator:12.16.1' } shadowJar {