Skip to content

Commit dd93680

Browse files
committed
Merge branch '4.5.x' into 4.6.x
2 parents 6f2fed6 + fed81b9 commit dd93680

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

jooq/src/main/java/io/micronaut/configuration/jooq/AbstractJooqConfigurationFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.micronaut.context.ApplicationContext;
1919
import io.micronaut.context.annotation.Parameter;
20-
import io.micronaut.core.annotation.Internal;
2120
import io.micronaut.core.annotation.Nullable;
2221
import io.micronaut.inject.qualifiers.Qualifiers;
2322
import org.jooq.ConverterProvider;
@@ -40,8 +39,7 @@
4039
* @author Vladimir Kulev
4140
* @since 1.2.0
4241
*/
43-
@Internal
44-
abstract class AbstractJooqConfigurationFactory {
42+
public class AbstractJooqConfigurationFactory {
4543

4644
/**
4745
* Creates jOOQ {@link org.jooq.Configuration}.

jooq/src/main/java/io/micronaut/configuration/jooq/JooqConfigurationFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.micronaut.context.annotation.EachBean;
2020
import io.micronaut.context.annotation.Factory;
2121
import io.micronaut.context.annotation.Parameter;
22-
import io.micronaut.core.annotation.Internal;
2322
import io.micronaut.core.annotation.Nullable;
2423
import io.micronaut.jdbc.DataSourceResolver;
2524
import org.jooq.Configuration;
@@ -42,8 +41,7 @@
4241
* @since 1.2.0
4342
*/
4443
@Factory
45-
@Internal
46-
final class JooqConfigurationFactory extends AbstractJooqConfigurationFactory {
44+
public class JooqConfigurationFactory extends AbstractJooqConfigurationFactory {
4745

4846
/**
4947
* Creates jOOQ {@link Configuration}.

jooq/src/main/java/io/micronaut/configuration/jooq/R2dbcJooqConfigurationFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.micronaut.context.annotation.Factory;
2121
import io.micronaut.context.annotation.Parameter;
2222
import io.micronaut.context.annotation.Requires;
23-
import io.micronaut.core.annotation.Internal;
2423
import io.micronaut.core.annotation.Nullable;
2524
import io.r2dbc.spi.ConnectionFactory;
2625
import org.jooq.Configuration;
@@ -41,9 +40,8 @@
4140
* @since 4.5.0
4241
*/
4342
@Requires(classes = ConnectionFactory.class)
44-
@Internal
4543
@Factory
46-
final class R2dbcJooqConfigurationFactory extends AbstractJooqConfigurationFactory {
44+
public class R2dbcJooqConfigurationFactory extends AbstractJooqConfigurationFactory {
4745

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

0 commit comments

Comments
 (0)