Skip to content

Add QueryDsl support #253

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Add QueryDsl support #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eaf687
Remove unnecessary SuppressWarnings
backpaper0 Nov 4, 2024
db6db4f
Add QueryDsl auto configuration
backpaper0 Nov 4, 2024
979e241
Add test
backpaper0 Nov 4, 2024
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
13 changes: 12 additions & 1 deletion ...autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.seasar.doma.jdbc.SqlFileRepository;
import org.seasar.doma.jdbc.criteria.Entityql;
import org.seasar.doma.jdbc.criteria.NativeSql;
import org.seasar.doma.jdbc.criteria.QueryDsl;
import org.seasar.doma.jdbc.dialect.Db2Dialect;
import org.seasar.doma.jdbc.dialect.Dialect;
import org.seasar.doma.jdbc.dialect.H2Dialect;
Expand Down Expand Up @@ -146,7 +147,6 @@ public DomaConfigBuilder domaConfigBuilder() {
return new DomaConfigBuilder(domaProperties);
}

@SuppressWarnings("deprecation")
@Bean
@ConditionalOnMissingBean(Config.class)
public DomaConfig config(DataSource dataSource, Dialect dialect,
Expand Down Expand Up @@ -190,4 +190,15 @@ public NativeSql nativeSql(Config config) {
return new NativeSql(config);
}
}

@Configuration
@ConditionalOnClass({ QueryDsl.class })
public static class QueryDslConfiguration {

@Bean
@ConditionalOnMissingBean(QueryDsl.class)
public QueryDsl queryDsl(Config config) {
return new QueryDsl(config);
}
}
}
37 changes: 34 additions & 3 deletions ...configure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package org.seasar.doma.boot.autoconfigure;

import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import java.sql.SQLException;
import java.sql.SQLTimeoutException;
Expand All @@ -27,6 +30,7 @@
import org.seasar.doma.jdbc.UtilLoggingJdbcLogger;
import org.seasar.doma.jdbc.criteria.Entityql;
import org.seasar.doma.jdbc.criteria.NativeSql;
import org.seasar.doma.jdbc.criteria.QueryDsl;
import org.seasar.doma.jdbc.dialect.Dialect;
import org.seasar.doma.jdbc.dialect.H2Dialect;
import org.seasar.doma.jdbc.dialect.MysqlDialect;
Expand Down Expand Up @@ -255,6 +259,24 @@ public void testJdbcLoggerSlf4J() {
assertThat(jdbcLogger.getClass().getSimpleName(), is("Slf4jJdbcLogger"));
}

@Test
public void testAutoRegisteredQueryDsl() {
this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
this.context.refresh();
QueryDsl queryDsl = this.context.getBean(QueryDsl.class);
assertNotNull(queryDsl);
}

@Test
public void testQueryDslWithConfig() {
this.context.register(MyQueryDslConfig.class, DomaAutoConfiguration.class,
DataSourceAutoConfiguration.class);
this.context.refresh();
Map<String, QueryDsl> queryDslBeans = this.context.getBeansOfType(QueryDsl.class);
assertEquals(1, queryDslBeans.size());
assertNotNull(queryDslBeans.get("myQueryDsl"));
}

@After
public void tearDown() {
if (this.context != null) {
Expand Down Expand Up @@ -341,4 +363,13 @@ public NativeSql myNativeSql(Config config) {
return new NativeSql(config);
}
}

@Configuration
public static class MyQueryDslConfig {

@Bean
public QueryDsl myQueryDsl(Config config) {
return new QueryDsl(config);
}
}
}