Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove FlywayTeamsObjectResolver completely #21617

Merged
merged 1 commit into from
Nov 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@
import org.flywaydb.core.api.Location;
import org.flywaydb.core.api.callback.Callback;
import org.flywaydb.core.api.migration.JavaMigration;
import org.flywaydb.core.internal.command.DbBaseline;
import org.flywaydb.core.internal.command.DbClean;
import org.flywaydb.core.internal.command.DbInfo;
import org.flywaydb.core.internal.command.DbMigrate;
import org.flywaydb.core.internal.command.DbRepair;
import org.flywaydb.core.internal.command.DbSchemas;
import org.flywaydb.core.internal.command.DbValidate;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.logging.Logger;
Expand Down Expand Up @@ -302,21 +295,6 @@ public RuntimeReinitializedClassBuildItem reinitInsertRowLock() {
"org.flywaydb.core.internal.database.InsertRowLock");
}

/**
* Commands are executed through reflection, see {@link org.flywaydb.core.internal.FlywayTeamsObjectResolver}
*/
@BuildStep
public ReflectiveClassBuildItem commands() {
return new ReflectiveClassBuildItem(false, false,
DbBaseline.class,
DbClean.class,
DbInfo.class,
DbMigrate.class,
DbRepair.class,
DbSchemas.class,
DbValidate.class);
}

public static final class MigrationStateBuildItem extends SimpleBuildItem {

final Set<String> hasMigrations;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package io.quarkus.flyway.runtime.graal;

import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.configuration.ClassicConfiguration;
import org.flywaydb.core.api.output.CleanResult;
import org.flywaydb.core.internal.callback.CallbackExecutor;
import org.flywaydb.core.internal.command.DbClean;
import org.flywaydb.core.internal.database.base.Database;
import org.flywaydb.core.internal.database.base.Schema;
import org.flywaydb.core.internal.schemahistory.SchemaHistory;

import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;

/**
* Avoid using reflection
*/
@TargetClass(Flyway.class)
public final class FlywaySubstitutions {

@Alias
private ClassicConfiguration configuration;

@Substitute
private CleanResult doClean(
Database database, SchemaHistory schemaHistory, Schema[] schemas, CallbackExecutor callbackExecutor) {
return new DbClean(database, schemaHistory, schemas, callbackExecutor, configuration).clean();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package io.quarkus.flyway.runtime.graal;

import org.flywaydb.core.internal.FlywayTeamsObjectResolver;

import com.oracle.svm.core.annotate.Delete;
import com.oracle.svm.core.annotate.TargetClass;

/**
* Remove this class as it's not supposed to be used
*/
@Delete
@TargetClass(FlywayTeamsObjectResolver.class)
public final class FlywayTeamsObjectResolverSubstitutions {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package io.quarkus.flyway.runtime.graal;

import org.flywaydb.core.api.configuration.Configuration;
import org.flywaydb.core.internal.database.base.Database;
import org.flywaydb.core.internal.database.sqlserver.SQLServerDatabase;
import org.flywaydb.core.internal.database.sqlserver.SQLServerDatabaseType;
import org.flywaydb.core.internal.jdbc.JdbcConnectionFactory;
import org.flywaydb.core.internal.jdbc.StatementInterceptor;

import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;

@TargetClass(SQLServerDatabaseType.class)
public final class SQLServerDatabaseTypeSubstitutions {
@Substitute
public Database createDatabase(Configuration configuration, JdbcConnectionFactory jdbcConnectionFactory,
StatementInterceptor statementInterceptor) {
return new SQLServerDatabase(configuration, jdbcConnectionFactory, statementInterceptor);
}
}