Skip to content

Commit 02d648a

Browse files
authored
Merge pull request #448 from domaframework/support-quarkus
Support Quarkus
2 parents 1e49fef + aaa3be1 commit 02d648a

File tree

172 files changed

+2900
-1895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+2900
-1895
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.seasar.doma;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Target(ElementType.TYPE)
9+
@Retention(RetentionPolicy.RUNTIME)
10+
public @interface DaoImplementation {}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.seasar.doma;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Target(ElementType.TYPE)
9+
@Retention(RetentionPolicy.RUNTIME)
10+
public @interface DomainTypeImplementation {}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.seasar.doma;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Target(ElementType.TYPE)
9+
@Retention(RetentionPolicy.RUNTIME)
10+
public @interface EmbeddableTypeImplementation {}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.seasar.doma;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Target(ElementType.TYPE)
9+
@Retention(RetentionPolicy.RUNTIME)
10+
public @interface EntityTypeImplementation {}

doma-core/src/main/java/org/seasar/doma/internal/RuntimeConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.seasar.doma.jdbc.Naming;
1515
import org.seasar.doma.jdbc.QueryImplementors;
1616
import org.seasar.doma.jdbc.RequiresNewController;
17+
import org.seasar.doma.jdbc.ScriptFileLoader;
1718
import org.seasar.doma.jdbc.SqlFileRepository;
1819
import org.seasar.doma.jdbc.SqlLogType;
1920
import org.seasar.doma.jdbc.UnknownColumnHandler;
@@ -57,6 +58,11 @@ public SqlFileRepository getSqlFileRepository() {
5758
return config.getSqlFileRepository();
5859
}
5960

61+
@Override
62+
public ScriptFileLoader getScriptFileLoader() {
63+
return config.getScriptFileLoader();
64+
}
65+
6066
@Override
6167
public JdbcLogger getJdbcLogger() {
6268
return config.getJdbcLogger();

doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/AbstractDao.java renamed to doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,19 @@
1515
import org.seasar.doma.jdbc.DaoMethodNotFoundException;
1616
import org.seasar.doma.jdbc.QueryImplementors;
1717

18-
public abstract class AbstractDao implements ConfigProvider {
18+
public class DaoImplSupport implements ConfigProvider {
1919

20-
protected final Config __config;
20+
private final Config __config;
2121

22-
protected AbstractDao() {
23-
__config = null;
24-
}
25-
26-
protected AbstractDao(Config config) {
22+
public DaoImplSupport(Config config) {
2723
if (config == null) {
2824
throw new DomaNullPointerException("config");
2925
}
3026
validateConfig(config, null);
3127
this.__config = new RuntimeConfig(config, config.getDataSource());
3228
}
3329

34-
protected AbstractDao(Config config, Connection connection) {
30+
public DaoImplSupport(Config config, Connection connection) {
3531
if (config == null) {
3632
throw new DomaNullPointerException("config");
3733
}
@@ -48,7 +44,7 @@ protected AbstractDao(Config config, Connection connection) {
4844
this.__config = new RuntimeConfig(config, dataSource);
4945
}
5046

51-
protected AbstractDao(Config config, DataSource dataSource) {
47+
public DaoImplSupport(Config config, DataSource dataSource) {
5248
if (config == null) {
5349
throw new DomaNullPointerException("config");
5450
}
@@ -108,27 +104,27 @@ public Config getConfig() {
108104
return __config;
109105
}
110106

111-
protected DataSource getDataSource() {
107+
public DataSource getDataSource() {
112108
return __config.getDataSource();
113109
}
114110

115-
protected CommandImplementors getCommandImplementors() {
111+
public CommandImplementors getCommandImplementors() {
116112
return __config.getCommandImplementors();
117113
}
118114

119-
protected QueryImplementors getQueryImplementors() {
115+
public QueryImplementors getQueryImplementors() {
120116
return __config.getQueryImplementors();
121117
}
122118

123-
protected void entering(String callerClassName, String callerMethodName, Object... args) {
119+
public void entering(String callerClassName, String callerMethodName, Object... args) {
124120
__config.getJdbcLogger().logDaoMethodEntering(callerClassName, callerMethodName, args);
125121
}
126122

127-
protected void exiting(String callerClassName, String callerMethodName, Object result) {
123+
public void exiting(String callerClassName, String callerMethodName, Object result) {
128124
__config.getJdbcLogger().logDaoMethodExiting(callerClassName, callerMethodName, result);
129125
}
130126

131-
protected void throwing(String callerClassName, String callerMethodName, RuntimeException e) {
127+
public void throwing(String callerClassName, String callerMethodName, RuntimeException e) {
132128
__config.getJdbcLogger().logDaoMethodThrowing(callerClassName, callerMethodName, e);
133129
}
134130

doma-core/src/main/java/org/seasar/doma/jdbc/AbstractSqlFileRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected final SqlNode parse(String sql) {
109109
* @param path the SQL file path
110110
* @return the SQL string
111111
*/
112-
protected final String getSql(String path) {
112+
protected String getSql(String path) {
113113
try {
114114
return ResourceUtil.getResourceAsString(path);
115115
} catch (WrapException e) {

doma-core/src/main/java/org/seasar/doma/jdbc/Config.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ default SqlFileRepository getSqlFileRepository() {
5353
return ConfigSupport.defaultSqlFileRepository;
5454
}
5555

56+
/**
57+
* Returns the Script file loader.
58+
*
59+
* @return the Script file loader
60+
*/
61+
default ScriptFileLoader getScriptFileLoader() {
62+
return ConfigSupport.defaultScriptFileLoader;
63+
}
64+
5665
/**
5766
* Returns the JDBC logger.
5867
*

doma-core/src/main/java/org/seasar/doma/jdbc/ConfigSupport.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ public final class ConfigSupport {
55

66
public static SqlFileRepository defaultSqlFileRepository = new GreedyCacheSqlFileRepository();
77

8+
public static ScriptFileLoader defaultScriptFileLoader = new ScriptFileLoader() {};
9+
810
public static JdbcLogger defaultJdbcLogger = new UtilLoggingJdbcLogger();
911

1012
public static RequiresNewController defaultRequiresNewController = new RequiresNewController() {};
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.seasar.doma.jdbc;
2+
3+
import java.net.URL;
4+
import org.seasar.doma.internal.util.ResourceUtil;
5+
6+
public interface ScriptFileLoader {
7+
8+
default URL loadAsURL(String path) {
9+
return ResourceUtil.getResource(path);
10+
}
11+
}

0 commit comments

Comments
 (0)