Skip to content

Commit 19e6fb0

Browse files
gmfeinberggmfeinberg
committed
Fix warnings related to Eclipse failure to recognize chained assignment to
an AutoCloseable class (QueryRequest)
1 parent 3b4a9ed commit 19e6fb0

File tree

8 files changed

+110
-91
lines changed

8 files changed

+110
-91
lines changed

‎driver/src/test/java/oracle/nosql/driver/BasicTest.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,8 +1218,8 @@ public void testNullJsonNull() {
12181218
PreparedStatement prepStmt = prepRet.getPreparedStatement();
12191219

12201220
prepStmt.setVariable("$name", JsonNullValue.getInstance());
1221-
try (QueryRequest queryReq = new QueryRequest()
1222-
.setPreparedStatement(prepStmt)) {
1221+
try (QueryRequest queryReq = new QueryRequest()) {
1222+
queryReq.setPreparedStatement(prepStmt);
12231223
QueryResult queryRet = handle.query(queryReq);
12241224
assertEquals(1, queryRet.getResults().size());
12251225
assertEquals(rowJsonNull, queryRet.getResults().get(0));
@@ -1264,7 +1264,8 @@ public void testExactMatch() {
12641264
/* test via query insert */
12651265
String insertQ =
12661266
"insert into tMatch(id, name, age) values(5, 'fred', 6)";
1267-
try (QueryRequest qReq = new QueryRequest().setStatement(insertQ)) {
1267+
try (QueryRequest qReq = new QueryRequest()) {
1268+
qReq.setStatement(insertQ);
12681269
QueryResult qRes = handle.query(qReq);
12691270
for (MapValue res : qRes.getResults()) {
12701271
assertEquals(1, res.get("NumRowsInserted").getInt());
@@ -1277,8 +1278,8 @@ public void testExactMatch() {
12771278
PrepareRequest prepReq = new PrepareRequest().setStatement(insertQ);
12781279
PrepareResult prepRet = handle.prepare(prepReq);
12791280
PreparedStatement prepStmt = prepRet.getPreparedStatement();
1280-
try (QueryRequest qReq = new QueryRequest()
1281-
.setPreparedStatement(prepStmt)) {
1281+
try (QueryRequest qReq = new QueryRequest()) {
1282+
qReq.setPreparedStatement(prepStmt);
12821283
QueryResult qRes = handle.query(qReq);
12831284
for (MapValue res : qRes.getResults()) {
12841285
assertEquals(1, res.get("NumRowsInserted").getInt());
@@ -1354,7 +1355,8 @@ public void testIdentityColumn() {
13541355

13551356
/* try an insert query */
13561357
String insertQ = "insert into tIdentity(id, name) values(5, 'fred')";
1357-
try (QueryRequest qReq = new QueryRequest().setStatement(insertQ)) {
1358+
try (QueryRequest qReq = new QueryRequest()) {
1359+
qReq.setStatement(insertQ);
13581360
QueryResult qRes = handle.query(qReq);
13591361
for (MapValue res : qRes.getResults()) {
13601362
assertEquals(1, res.get("NumRowsInserted").getInt());
@@ -1366,8 +1368,8 @@ public void testIdentityColumn() {
13661368
PrepareRequest prepReq = new PrepareRequest().setStatement(insertQ);
13671369
PrepareResult prepRet = handle.prepare(prepReq);
13681370
PreparedStatement prepStmt = prepRet.getPreparedStatement();
1369-
try (QueryRequest qReq = new QueryRequest()
1370-
.setPreparedStatement(prepStmt)) {
1371+
try (QueryRequest qReq = new QueryRequest()) {
1372+
qReq.setPreparedStatement(prepStmt);
13711373
QueryResult qRes = handle.query(qReq);
13721374
for (MapValue res : qRes.getResults()) {
13731375
assertEquals(1, res.get("NumRowsInserted").getInt());

‎driver/src/test/java/oracle/nosql/driver/I18NTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ public void jsontableTest(){
271271
//" r.restaurantJSON.name < \"" + idxname + "\"";
272272

273273
//Create the Query Request
274-
try (QueryRequest queryRequest = new QueryRequest().
275-
setStatement(predQuery)) {
274+
try (QueryRequest queryRequest = new QueryRequest()) {
275+
queryRequest.setStatement(predQuery);
276276

277277
//Execute the query and get the response
278278
QueryResult queryRes = handle.query(queryRequest);

‎driver/src/test/java/oracle/nosql/driver/OnPremiseTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ public void testChildTables()
323323
* query statement.
324324
*/
325325
try (
326-
QueryRequest queryRequest = new QueryRequest().
327-
setStatement("SELECT * from " + tableName +
328-
" WHERE childName= \"cName2\"")) {
326+
QueryRequest queryRequest = new QueryRequest()) {
327+
queryRequest.setStatement("SELECT * from " + tableName +
328+
" WHERE childName= \"cName2\"");
329329
QueryResult qres = handle.query(queryRequest);
330330
List<MapValue> results = qres.getResults();
331331
assertEquals(results.size(), 1);
@@ -365,9 +365,9 @@ public void testChildTables()
365365
tres.waitForCompletion(handle, 60000, 1000);
366366
assertEquals(tres.getTableState(), TableResult.State.ACTIVE);
367367

368-
try (QueryRequest queryRequest = new QueryRequest().
369-
setStatement("SELECT * from " + tableName +
370-
" WHERE childName= \"cName2\"")) {
368+
try (QueryRequest queryRequest = new QueryRequest()) {
369+
queryRequest.setStatement("SELECT * from " + tableName +
370+
" WHERE childName= \"cName2\"");
371371
QueryResult qres = handle.query(queryRequest);
372372
List<MapValue> results = qres.getResults();
373373
assertEquals(results.size(), 2);
@@ -400,8 +400,8 @@ public void testChildTables()
400400
/*
401401
* There should be no record in the table now
402402
*/
403-
try (QueryRequest queryRequest = new QueryRequest().
404-
setStatement("SELECT * from " + tableName)) {
403+
try (QueryRequest queryRequest = new QueryRequest()) {
404+
queryRequest.setStatement("SELECT * from " + tableName);
405405
QueryResult qres = handle.query(queryRequest);
406406
List<MapValue> results = qres.getResults();
407407
assertEquals(results.size(), 0);

‎driver/src/test/java/oracle/nosql/driver/ProxyTestBase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@ static private ArrayValue createLargeStringArray(int size) {
581581
}
582582

583583
protected static List<MapValue> doQuery(NoSQLHandle qHandle, String query) {
584-
try( QueryRequest queryRequest =
585-
new QueryRequest().setStatement(query)) {
584+
try( QueryRequest queryRequest = new QueryRequest()) {
585+
queryRequest.setStatement(query);
586586
List<MapValue> results = new ArrayList<MapValue>();
587587

588588
do {
@@ -604,8 +604,8 @@ protected static List<MapValue> doPreparedQuery(
604604
PrepareResult prepRet = qHandle.prepare(prepReq);
605605
assertNotNull(prepRet.getPreparedStatement());
606606

607-
try( QueryRequest queryRequest =
608-
new QueryRequest().setPreparedStatement(prepRet)) {
607+
try( QueryRequest queryRequest = new QueryRequest()) {
608+
queryRequest.setPreparedStatement(prepRet);
609609
do {
610610
QueryResult qres = qHandle.query(queryRequest);
611611
results.addAll(qres.getResults());

0 commit comments

Comments
 (0)