Skip to content

Commit

Permalink
Merge branch '4.5.x' into 4.6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sdelamo committed Sep 27, 2022
2 parents 6f2fed6 + fed81b9 commit dd93680
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import io.micronaut.context.ApplicationContext;
import io.micronaut.context.annotation.Parameter;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.annotation.Nullable;
import io.micronaut.inject.qualifiers.Qualifiers;
import org.jooq.ConverterProvider;
Expand All @@ -40,8 +39,7 @@
* @author Vladimir Kulev
* @since 1.2.0
*/
@Internal
abstract class AbstractJooqConfigurationFactory {
public class AbstractJooqConfigurationFactory {

/**
* Creates jOOQ {@link org.jooq.Configuration}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import io.micronaut.context.annotation.EachBean;
import io.micronaut.context.annotation.Factory;
import io.micronaut.context.annotation.Parameter;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.annotation.Nullable;
import io.micronaut.jdbc.DataSourceResolver;
import org.jooq.Configuration;
Expand All @@ -42,8 +41,7 @@
* @since 1.2.0
*/
@Factory
@Internal
final class JooqConfigurationFactory extends AbstractJooqConfigurationFactory {
public class JooqConfigurationFactory extends AbstractJooqConfigurationFactory {

/**
* Creates jOOQ {@link Configuration}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.micronaut.context.annotation.Factory;
import io.micronaut.context.annotation.Parameter;
import io.micronaut.context.annotation.Requires;
import io.micronaut.core.annotation.Internal;
import io.micronaut.core.annotation.Nullable;
import io.r2dbc.spi.ConnectionFactory;
import org.jooq.Configuration;
Expand All @@ -41,9 +40,8 @@
* @since 4.5.0
*/
@Requires(classes = ConnectionFactory.class)
@Internal
@Factory
final class R2dbcJooqConfigurationFactory extends AbstractJooqConfigurationFactory {
public class R2dbcJooqConfigurationFactory extends AbstractJooqConfigurationFactory {

/**
* Creates jOOQ {@link Configuration}. It will configure it with available jOOQ provider beans with the same
Expand Down

0 comments on commit dd93680

Please sign in to comment.