Skip to content
This repository was archived by the owner on Oct 24, 2020. It is now read-only.

Commit 842feee

Browse files
nakamura-tonakamura-to
committed
Use Java 11
1 parent 70f3d65 commit 842feee

20 files changed

+72
-90
lines changed

‎deployment/src/main/java/org/seasar/doma/quarkus/deployment/DomaProcessor.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.List;
2020
import java.util.Optional;
2121
import org.jboss.jandex.DotName;
22-
import org.jboss.jandex.IndexView;
2322
import org.seasar.doma.DaoImplementation;
2423
import org.seasar.doma.quarkus.runtime.DomaProducer;
2524
import org.seasar.doma.quarkus.runtime.DomaRecorder;
@@ -51,15 +50,15 @@ DomaSettingsBuildItem domaSettings(
5150
List<JdbcDataSourceBuildItem> dataSources,
5251
ApplicationArchivesBuildItem applicationArchives,
5352
LaunchModeBuildItem launchMode) {
54-
DomaSettingsFactory factory =
53+
var factory =
5554
new DomaSettingsFactory(buildTimeConfig, dataSources, applicationArchives, launchMode);
5655
return new DomaSettingsBuildItem(factory.create());
5756
}
5857

5958
@BuildStep
6059
Optional<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFile(
6160
DomaSettingsBuildItem settings) {
62-
String sqlLoadScript = settings.getSettings().sqlLoadScript;
61+
var sqlLoadScript = settings.getSettings().sqlLoadScript;
6362
if (sqlLoadScript == null) {
6463
return Optional.empty();
6564
}
@@ -69,12 +68,12 @@ Optional<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFile(
6968
@BuildStep
7069
NativeImageResourceBuildItem nativeImageResources(DomaSettingsBuildItem settings) {
7170
List<String> resources = new ArrayList<>();
72-
String sqlLoadScript = settings.getSettings().sqlLoadScript;
71+
var sqlLoadScript = settings.getSettings().sqlLoadScript;
7372
if (sqlLoadScript != null) {
7473
resources.add(sqlLoadScript);
7574
}
76-
DomaResourceScanner scanner = new DomaResourceScanner();
77-
List<String> scannedResources = scanner.scan();
75+
var scanner = new DomaResourceScanner();
76+
var scannedResources = scanner.scan();
7877
resources.addAll(scannedResources);
7978
return new NativeImageResourceBuildItem(resources);
8079
}
@@ -83,9 +82,9 @@ NativeImageResourceBuildItem nativeImageResources(DomaSettingsBuildItem settings
8382
ReflectiveClassBuildItem reflectiveClasses(BeanArchiveIndexBuildItem beanArchiveIndex) {
8483
List<String> classes = new ArrayList<>();
8584
classes.add(ScriptExecutor.class.getName());
86-
IndexView indexView = beanArchiveIndex.getIndex();
87-
DomaClassScanner scanner = new DomaClassScanner(indexView);
88-
List<String> scannedClasses = scanner.scan();
85+
var indexView = beanArchiveIndex.getIndex();
86+
var scanner = new DomaClassScanner(indexView);
87+
var scannedClasses = scanner.scan();
8988
classes.addAll(scannedClasses);
9089
return new ReflectiveClassBuildItem(true, true, classes.toArray(new String[0]));
9190
}

‎deployment/src/main/java/org/seasar/doma/quarkus/deployment/DomaResourceScanner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ private void collect(Path resource, Set<String> files) {
3434
try {
3535
Files.walkFileTree(
3636
resource,
37-
new SimpleFileVisitor<Path>() {
37+
new SimpleFileVisitor<>() {
3838
@Override
3939
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
40-
String fileName = resource.relativize(file).toString();
40+
var fileName = resource.relativize(file).toString();
4141
if (fileName.endsWith(".sql") || fileName.endsWith(".script")) {
4242
LOGGER.debugf("resource found: %s", fileName);
4343
files.add(fileName);

‎deployment/src/main/java/org/seasar/doma/quarkus/deployment/DomaSettingsFactory.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
55
import io.quarkus.deployment.builditem.LaunchModeBuildItem;
66
import java.nio.file.Files;
7-
import java.nio.file.Path;
87
import java.util.List;
98
import java.util.Objects;
10-
import java.util.Optional;
119
import java.util.stream.Stream;
1210
import org.jboss.logging.Logger;
1311
import org.seasar.doma.quarkus.runtime.DomaSettings;
@@ -33,8 +31,8 @@ public class DomaSettingsFactory {
3331
}
3432

3533
DomaSettings create() {
36-
DomaSettings settings = new DomaSettings();
37-
DataSourceDependentItems items = dataSourceDependentItems();
34+
var settings = new DomaSettings();
35+
var items = dataSourceDependentItems();
3836
settings.dataSourceName = items.dataSourceName;
3937
settings.dialect = items.dialect;
4038
settings.sqlFileRepository = buildTimeConfig.sqlFileRepository;
@@ -51,21 +49,21 @@ DomaSettings create() {
5149
}
5250

5351
private DataSourceDependentItems dataSourceDependentItems() {
54-
DataSourceDependentItems items = new DataSourceDependentItems();
55-
Optional<String> dataSourceName = buildTimeConfig.datasourceName;
56-
Optional<DomaSettings.DialectType> dialect = buildTimeConfig.dialect;
52+
var items = new DataSourceDependentItems();
53+
var dataSourceName = buildTimeConfig.datasourceName;
54+
var dialect = buildTimeConfig.dialect;
5755

5856
if (dataSourceName.isPresent()) {
5957
items.dataSourceName = dataSourceName.get();
6058
if (dialect.isPresent()) {
6159
items.dialect = dialect.get();
6260
} else {
63-
Optional<JdbcDataSourceBuildItem> dataSource =
61+
var dataSource =
6462
dataSources.stream()
6563
.filter(it -> dataSourceName.get().equals(it.getName()))
6664
.findFirst();
6765
if (dataSource.isPresent()) {
68-
String dbKind = dataSource.get().getDbKind();
66+
var dbKind = dataSource.get().getDbKind();
6967
items.dialect = inferDialectType(dbKind);
7068
} else {
7169
throw new IllegalStateException(
@@ -76,7 +74,7 @@ private DataSourceDependentItems dataSourceDependentItems() {
7674
}
7775
}
7876
} else {
79-
Optional<JdbcDataSourceBuildItem> dataSource =
77+
var dataSource =
8078
Stream.concat(
8179
dataSources.stream().filter(JdbcDataSourceBuildItem::isDefault),
8280
dataSources.stream())
@@ -86,7 +84,7 @@ private DataSourceDependentItems dataSourceDependentItems() {
8684
if (dialect.isPresent()) {
8785
items.dialect = dialect.get();
8886
} else {
89-
String dbKind = dataSource.get().getDbKind();
87+
var dbKind = dataSource.get().getDbKind();
9088
items.dialect = inferDialectType(dbKind);
9189
}
9290
} else {
@@ -120,12 +118,12 @@ private DomaSettings.DialectType inferDialectType(String dbKind) {
120118
}
121119

122120
private String sqlLoadScript() {
123-
Optional<String> sqlLoadScript = buildTimeConfig.sqlLoadScript;
121+
var sqlLoadScript = buildTimeConfig.sqlLoadScript;
124122
if (sqlLoadScript.isPresent()) {
125123
if (sqlLoadScript.get().equals(DomaBuildTimeConfig.SQL_LOAD_SCRIPT_NO_FILE)) {
126124
return null;
127125
} else {
128-
Path path = applicationArchives.getRootArchive().getChildPath(sqlLoadScript.get());
126+
var path = applicationArchives.getRootArchive().getChildPath(sqlLoadScript.get());
129127
if (path == null || Files.isDirectory(path)) {
130128
throw new IllegalStateException(
131129
String.format(
@@ -137,7 +135,7 @@ private String sqlLoadScript() {
137135
}
138136
} else {
139137
if (launchMode.getLaunchMode().isDevOrTest()) {
140-
Path path =
138+
var path =
141139
applicationArchives
142140
.getRootArchive()
143141
.getChildPath(DomaBuildTimeConfig.SQL_LOAD_SCRIPT_DEFAULT);
@@ -153,7 +151,7 @@ private String sqlLoadScript() {
153151
}
154152

155153
private DomaSettings.LogSettings log() {
156-
DomaBuildTimeConfig.LogBuildTimeConfig log = buildTimeConfig.log;
154+
var log = buildTimeConfig.log;
157155
return new DomaSettings.LogSettings(log.sql, log.dao, log.closingFailure);
158156
}
159157

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/HotReplacementResource.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.seasar.doma.quarkus.deployment;
22

3-
import java.lang.reflect.Method;
4-
import java.net.URL;
53
import java.nio.file.Files;
64
import java.nio.file.Paths;
75
import javax.inject.Inject;
@@ -10,7 +8,6 @@
108
import javax.ws.rs.Produces;
119
import javax.ws.rs.core.MediaType;
1210
import org.seasar.doma.jdbc.ScriptFileLoader;
13-
import org.seasar.doma.jdbc.SqlFile;
1411
import org.seasar.doma.jdbc.SqlFileRepository;
1512
import org.seasar.doma.jdbc.dialect.Dialect;
1613

@@ -31,16 +28,16 @@ public class HotReplacementResource {
3128
@Path("/sql")
3229
@Produces(MediaType.TEXT_PLAIN)
3330
public String sql() throws Exception {
34-
Method method = getClass().getMethod("sql");
35-
SqlFile sqlFile = sqlFileRepository.getSqlFile(method, SQL_FILE, dialect);
31+
var method = getClass().getMethod("sql");
32+
var sqlFile = sqlFileRepository.getSqlFile(method, SQL_FILE, dialect);
3633
return sqlFile.getSql();
3734
}
3835

3936
@GET
4037
@Path("/script")
4138
@Produces(MediaType.TEXT_PLAIN)
4239
public String script() throws Exception {
43-
URL url = scriptFileLoader.loadAsURL(SCRIPT_FILE);
44-
return String.join("\n", Files.readAllLines(Paths.get(url.toURI())));
40+
var url = scriptFileLoader.loadAsURL(SCRIPT_FILE);
41+
return Files.readString(Paths.get(url.toURI()));
4542
}
4643
}

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/HotReplacementTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,20 @@ public static void tearDownPort() {
4444

4545
@Test
4646
public void sql() {
47-
RestAssured.when().get("/hot/sql").then().body(is("select\n*\nfrom\nemployee"));
47+
RestAssured.when().get("/hot/sql").then().body(is("select\n*\nfrom\nemployee\n"));
4848
runner.modifyResourceFile(
4949
HotReplacementResource.SQL_FILE, s -> s.replaceAll("employee", "department"));
50-
RestAssured.when().get("/hot/sql").then().body(is("select\n*\nfrom\ndepartment"));
50+
RestAssured.when().get("/hot/sql").then().body(is("select\n*\nfrom\ndepartment\n"));
5151
}
5252

5353
@Test
5454
public void script() {
55-
RestAssured.when().get("/hot/script").then().body(is("create table employee (\n id int\n)"));
55+
RestAssured.when().get("/hot/script").then().body(is("create table employee (\n id int\n)\n"));
5656
runner.modifyResourceFile(
5757
HotReplacementResource.SCRIPT_FILE, s -> s.replaceAll("employee", "department"));
58-
RestAssured.when().get("/hot/script").then().body(is("create table department (\n id int\n)"));
58+
RestAssured.when()
59+
.get("/hot/script")
60+
.then()
61+
.body(is("create table department (\n id int\n)\n"));
5962
}
6063
}

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/MultipleConfigsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ void test() {
6666
assertNotNull(inventoryConfig);
6767
assertNotNull(inventoryConfig.getDataSource());
6868
assertNotEquals(defaultConfig, inventoryConfig);
69-
Config selectedDefaultConfig = configInstance.select(Default.Literal.INSTANCE).get();
69+
var selectedDefaultConfig = configInstance.select(Default.Literal.INSTANCE).get();
7070
assertEquals(defaultConfig, selectedDefaultConfig);
71-
Config selectedInventoryConfig =
71+
var selectedInventoryConfig =
7272
configInstance.select(new org.seasar.doma.quarkus.Config.Literal("inventory")).get();
7373
assertEquals(inventoryConfig, selectedInventoryConfig);
7474
}

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/OverrideBeanTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ SqlFileRepository sqlFileRepository() {
5050

5151
@ApplicationScoped
5252
TransactionManager transactionManager(DataSource dataSource, JdbcLogger jdbcLogger) {
53-
LocalTransactionDataSource localTransactionDataSource =
54-
new LocalTransactionDataSource(dataSource);
53+
var localTransactionDataSource = new LocalTransactionDataSource(dataSource);
5554
return new LocalTransactionManager(
5655
localTransactionDataSource.getLocalTransaction(jdbcLogger));
5756
}

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/OverrideConfigTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public Dialect getDialect() {
4848

4949
@Test
5050
void test() {
51-
System.out.println(config);
5251
assertTrue(config.toString().contains("MyConfig"));
5352
}
5453
}

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/ScriptExecutorNoFileTest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import io.quarkus.test.QuarkusUnitTest;
6-
import java.sql.Connection;
7-
import java.sql.ResultSet;
8-
import java.sql.Statement;
96
import javax.inject.Inject;
107
import javax.sql.DataSource;
118
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -38,9 +35,9 @@ public class ScriptExecutorNoFileTest {
3835
@Test
3936
public void test() throws Exception {
4037
Integer count = null;
41-
try (Connection connection = dataSource.getConnection()) {
42-
try (Statement statement = connection.createStatement()) {
43-
try (ResultSet resultSet =
38+
try (var connection = dataSource.getConnection()) {
39+
try (var statement = connection.createStatement()) {
40+
try (var resultSet =
4441
statement.executeQuery(
4542
"select count(*) from information_schema.tables where table_name = 'EMPLOYEE'")) {
4643
if (resultSet.next()) {

‎deployment/src/test/java/org/seasar/doma/quarkus/deployment/ScriptExecutorOtherFileTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import io.quarkus.test.QuarkusUnitTest;
6-
import java.sql.Connection;
7-
import java.sql.ResultSet;
8-
import java.sql.Statement;
96
import javax.inject.Inject;
107
import javax.sql.DataSource;
118
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -37,10 +34,10 @@ public class ScriptExecutorOtherFileTest {
3734

3835
@Test
3936
public void test() throws Exception {
40-
int count = 0;
41-
try (Connection connection = dataSource.getConnection()) {
42-
try (Statement statement = connection.createStatement()) {
43-
try (ResultSet resultSet = statement.executeQuery("select id from department")) {
37+
var count = 0;
38+
try (var connection = dataSource.getConnection()) {
39+
try (var statement = connection.createStatement()) {
40+
try (var resultSet = statement.executeQuery("select id from department")) {
4441
while (resultSet.next()) {
4542
count++;
4643
}

0 commit comments

Comments
 (0)