• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision88 (tree)
Time2015-08-23 14:53:51
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/fwBatch/src/batch/status/JobDetailStatusImpl.java (revision 87)
+++ trunk/framework/fwBatch/src/batch/status/JobDetailStatusImpl.java (revision 88)
@@ -13,6 +13,7 @@
1313
1414 import org.apache.logging.log4j.LogManager;
1515
16+import common.db.jdbc.Jdbc;
1617 import common.sql.QueryUtil;
1718 import core.exception.PhysicalException;
1819 import core.exception.ThrowableUtil;
@@ -40,7 +41,8 @@
4041 map.put("BatSeq", Integer.valueOf(dseq));
4142
4243 String query = QueryUtil.getSqlFromFile("SelectJobDetailStatus", this.getClass());
43- try (PreparedStatement psmt = QueryUtil.statementReadonly(conn, query, map)) {
44+ try (PreparedStatement psmt = QueryUtil.createStatement(
45+ query, map, Jdbc.wrap(conn)::readonlyStatement)) {
4446 JobDetail rec = null;
4547 try (ResultSet rs = psmt.executeQuery()) {
4648 if (rs.next()) {
@@ -69,8 +71,9 @@
6971 LogManager.getLogger().debug(query);
7072 LogManager.getLogger().debug("jobseq={}", String.valueOf(seq));
7173
72- try (PreparedStatement psmt = QueryUtil.statementReadonly(
73- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
74+ try (PreparedStatement psmt = QueryUtil.createStatement(
75+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
76+ Jdbc.wrap(conn)::readonlyStatement)) {
7477 List<JobDetail> list = new ArrayList<>();
7578 try (ResultSet rs = psmt.executeQuery()) {
7679 while (rs.next()) {
@@ -107,7 +110,8 @@
107110 map.put("Message", msg);
108111
109112 String query = QueryUtil.getSqlFromFile("UpdateJobDetail", this.getClass());
110- try (PreparedStatement psmt = QueryUtil.statementExecute(conn, query, map)) {
113+ try (PreparedStatement psmt = QueryUtil.createStatement(
114+ query, map, Jdbc.wrap(conn)::prepareStatement)) {
111115 // ジョブ詳細管理テーブル更新
112116 return psmt.executeUpdate();
113117
@@ -146,7 +150,8 @@
146150 map.put("BatName", name);
147151
148152 String query = QueryUtil.getSqlFromFile("InsertJobDetail", this.getClass());
149- try (PreparedStatement psmt = QueryUtil.statementExecute(conn, query, map)) {
153+ try (PreparedStatement psmt = QueryUtil.createStatement(
154+ query, map, Jdbc.wrap(conn)::prepareStatement)) {
150155 // ジョブ管理テーブル更新
151156 int ret = psmt.executeUpdate();
152157 if (ret != 1) {
@@ -171,8 +176,9 @@
171176 public int deleteJobDetail(final Connection conn, final long seq) {
172177
173178 String query = QueryUtil.getSqlFromFile("DeleteJobDetail", this.getClass());
174- try (PreparedStatement psmt = QueryUtil.statementExecute(
175- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
179+ try (PreparedStatement psmt = QueryUtil.createStatement(
180+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
181+ Jdbc.wrap(conn)::prepareStatement)) {
176182 return psmt.executeUpdate();
177183 } catch (final SQLException ex) {
178184 ThrowableUtil.error(ex);
--- trunk/framework/fwBatch/src/batch/status/JobMasterInfoImpl.java (revision 87)
+++ trunk/framework/fwBatch/src/batch/status/JobMasterInfoImpl.java (revision 88)
@@ -10,7 +10,6 @@
1010
1111 import common.db.jdbc.Jdbc;
1212 import common.sql.QueryUtil;
13-
1413 import core.exception.PhysicalException;
1514 import core.exception.ThrowableUtil;
1615
@@ -32,8 +31,9 @@
3231 @Override
3332 public JobMaster getJobMasterInfo(final Connection conn, final String jobid) {
3433 String query = QueryUtil.getSqlFromFile("SelectJobInfo", this.getClass());
35- try (PreparedStatement psmt = QueryUtil.statementReadonly(
36- conn, query, Collections.singletonMap("JobId", jobid))) {
34+ try (PreparedStatement psmt = QueryUtil.createStatement(
35+ query, Collections.singletonMap("JobId", jobid),
36+ Jdbc.wrap(conn)::readonlyStatement)) {
3737 JobMaster ret = null;
3838 try (ResultSet rs = psmt.executeQuery()) {
3939 if (rs.next()) {
--- trunk/framework/fwBatch/src/batch/status/JobFileStatusImpl.java (revision 87)
+++ trunk/framework/fwBatch/src/batch/status/JobFileStatusImpl.java (revision 88)
@@ -14,6 +14,7 @@
1414
1515 import org.apache.logging.log4j.LogManager;
1616
17+import common.db.jdbc.Jdbc;
1718 import common.sql.QueryUtil;
1819 import core.exception.PhysicalException;
1920 import core.exception.ThrowableUtil;
@@ -44,7 +45,8 @@
4445 map.put("BatSeq", Integer.valueOf(dseq));
4546 map.put("FileSeq", Integer.valueOf(fseq));
4647
47- try (PreparedStatement psmt = QueryUtil.statementReadonly(conn, query, map)) {
48+ try (PreparedStatement psmt = QueryUtil.createStatement(
49+ query, map, Jdbc.wrap(conn)::readonlyStatement)) {
4850 // ジョブ管理テーブル読み込み
4951 JobFile ret = null;
5052 try (ResultSet rs = psmt.executeQuery()) {
@@ -71,8 +73,9 @@
7173 public List<JobFile> selectJobFiles(final Connection conn, final long seq) {
7274
7375 String query = QueryUtil.getSqlFromFile("SelectJobFileList", this.getClass());
74- try (PreparedStatement psmt = QueryUtil.statementReadonly(
75- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
76+ try (PreparedStatement psmt = QueryUtil.createStatement(
77+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
78+ Jdbc.wrap(conn)::readonlyStatement)) {
7679 List<JobFile> ret = new ArrayList<>();
7780 try (ResultSet rs = psmt.executeQuery()) {
7881 while (rs.next()) {
@@ -109,7 +112,8 @@
109112 map.put("FileSize", Long.valueOf(size));
110113
111114 String query = QueryUtil.getSqlFromFile("UpdateJobFile", this.getClass());
112- try (PreparedStatement psmt = QueryUtil.statementExecute(conn, query, map)) {
115+ try (PreparedStatement psmt = QueryUtil.createStatement(
116+ query, map, Jdbc.wrap(conn)::prepareStatement)) {
113117 return psmt.executeUpdate();
114118 } catch (final SQLException ex) {
115119 ThrowableUtil.error(ex);
@@ -127,8 +131,9 @@
127131 @Override
128132 public int deleteJobFile(final Connection conn, final long seq) {
129133 String query = QueryUtil.getSqlFromFile("DeleteJobFile", this.getClass());
130- try (PreparedStatement psmt = QueryUtil.statementExecute(
131- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
134+ try (PreparedStatement psmt = QueryUtil.createStatement(
135+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
136+ Jdbc.wrap(conn)::prepareStatement)) {
132137 // ファイル管理削除
133138 return psmt.executeUpdate();
134139 } catch (final SQLException ex) {
@@ -157,7 +162,8 @@
157162 map.put("Count", Integer.valueOf(0));
158163
159164 String query = QueryUtil.getSqlFromFile("InsertJobFile", this.getClass());
160- try (PreparedStatement psmt = QueryUtil.statementExecute(conn, query, map)) {
165+ try (PreparedStatement psmt = QueryUtil.createStatement(
166+ query, map, Jdbc.wrap(conn)::prepareStatement)) {
161167 // ファイル管理テーブル更新
162168 return psmt.executeUpdate();
163169 } catch (final SQLException ex) {
--- trunk/framework/fwBatch/src/batch/status/JobStatusImpl.java (revision 87)
+++ trunk/framework/fwBatch/src/batch/status/JobStatusImpl.java (revision 88)
@@ -15,11 +15,9 @@
1515 import java.util.Objects;
1616
1717 import batch.util.ParameterUtil;
18-
1918 import common.db.jdbc.Jdbc;
2019 import common.sql.QueryUtil;
2120 import common.sql.QueryUtil.StatementCreator;
22-
2321 import core.exception.PhysicalException;
2422 import core.exception.ThrowableUtil;
2523
@@ -73,7 +71,8 @@
7371 map.put("HostName", hostId);
7472
7573 String query = QueryUtil.getSqlFromFile("SelectJobStatus", this.getClass());
76- try (PreparedStatement psmt = QueryUtil.statementReadonly(conn, query, map)) {
74+ try (PreparedStatement psmt = QueryUtil.createStatement(
75+ query, map, Jdbc.wrap(conn)::readonlyStatement)) {
7776 List<Job> l = new ArrayList<>();
7877 try (ResultSet rs = psmt.executeQuery()) {
7978 while (rs.next()) {
@@ -99,8 +98,9 @@
9998 public Job getJobWithLock(final Connection conn, final long seq) {
10099
101100 String query = QueryUtil.getSqlFromFile("SelectJobStatusById", this.getClass());
102- try (PreparedStatement psmt = QueryUtil.statementReadonly(
103- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
101+ try (PreparedStatement psmt = QueryUtil.createStatement(
102+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
103+ Jdbc.wrap(conn)::readonlyStatement)) {
104104 Job ret = null;
105105 try (ResultSet rs = psmt.executeQuery()) {
106106 if (rs.next()) {
@@ -134,7 +134,8 @@
134134 map.put("JobSeq", Long.valueOf(seq));
135135
136136 String query = QueryUtil.getSqlFromFile("UpdateJobStatus", this.getClass());
137- try (PreparedStatement psmt = QueryUtil.statementExecute(conn, query, map)) {
137+ try (PreparedStatement psmt = QueryUtil.createStatement(
138+ query, map, Jdbc.wrap(conn)::prepareStatement)) {
138139 return psmt.executeUpdate();
139140
140141 } catch (final SQLException ex) {
@@ -160,7 +161,8 @@
160161 map.put("HostName", hostId);
161162
162163 String query = QueryUtil.getSqlFromFile("SelectJobStatusList", this.getClass());
163- try (PreparedStatement psmt = QueryUtil.statementReadonly(conn, query, map)) {
164+ try (PreparedStatement psmt = QueryUtil.createStatement(
165+ query, map, Jdbc.wrap(conn)::readonlyStatement)) {
164166 // バッチ管理テーブル読み込み
165167 List<Job> l = new ArrayList<>();
166168 try (ResultSet rs = psmt.executeQuery()) {
@@ -252,8 +254,9 @@
252254 public int deleteJob(final Connection conn, final long seq) {
253255
254256 String query = QueryUtil.getSqlFromFile("DeleteJobStatus", this.getClass());
255- try (PreparedStatement psmt = QueryUtil.statementExecute(
256- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
257+ try (PreparedStatement psmt = QueryUtil.createStatement(
258+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
259+ Jdbc.wrap(conn)::prepareStatement)) {
257260 return psmt.executeUpdate();
258261 } catch (final SQLException ex) {
259262 ThrowableUtil.error(ex);
@@ -272,8 +275,9 @@
272275 public Job getJob(final Connection conn, final long seq) {
273276
274277 String query = QueryUtil.getSqlFromFile("SelectJobStatusById", this.getClass());
275- try (PreparedStatement psmt = QueryUtil.statementReadonly(
276- conn, query, Collections.singletonMap("JobSeq", Long.valueOf(seq)))) {
278+ try (PreparedStatement psmt = QueryUtil.createStatement(
279+ query, Collections.singletonMap("JobSeq", Long.valueOf(seq)),
280+ Jdbc.wrap(conn)::readonlyStatement)) {
277281 // ジョブ管理テーブル読み込み
278282 Job ret = null;
279283 try (ResultSet rs = psmt.executeQuery()) {