Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java Mon Aug 27 09:48:33 2018 @@ -58,18 +58,18 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); // we want to avoid fk errors in MultiRef testData.getMultiRefList().clear(); testData.save(); NullableOIntegerFk toDelete - = testData.getNullableOIntegerFkList().get(0); + = testData.getNullableOIntegerFkList().get(0); int preDeleteId = toDelete.getId(); // check that four entries are in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertTrue(nullableOIntegerFkList.contains(toDelete)); @@ -86,7 +86,7 @@ public class DeleteTest extends BaseData // check that no associated object has been deleted List<OIntegerPk> oIntegerPkList - = OIntegerPkPeer.doSelect(new Criteria()); + = OIntegerPkPeer.doSelect(new Criteria()); assertEquals(3, oIntegerPkList.size()); } @@ -100,17 +100,17 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); NullableOIntegerFk toDelete - = testData.getNullableOIntegerFkList().get(0); + = testData.getNullableOIntegerFkList().get(0); toDelete.setId(toDelete.getId() - 1); int preDeleteId = toDelete.getId(); // check that four entries are in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertFalse(nullableOIntegerFkList.contains(toDelete)); @@ -134,13 +134,13 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); // we want to avoid fk errors in MultiRef testData.getMultiRefList().clear(); testData.save(); NullableOIntegerFk toDelete - = testData.getNullableOIntegerFkList().get(0); + = testData.getNullableOIntegerFkList().get(0); toDelete.setName("nullableOIntegerFk2Changed"); int preDeleteId = toDelete.getId(); @@ -149,7 +149,7 @@ public class DeleteTest extends BaseData // check that four entries are in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertTrue(nullableOIntegerFkList.contains(toDelete)); @@ -249,16 +249,16 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); // we want to avoid fk errors in MultiRef testData.getMultiRefList().clear(); testData.save(); List<NullableOIntegerFk> toDelete - = new ArrayList<NullableOIntegerFk>(); + = new ArrayList<>(); toDelete.add(testData.getNullableOIntegerFkList().get(0)); toDelete.add(testData.getNullableOIntegerFkList().get(2)); - List<Integer> preDeleteIds = new ArrayList<Integer>(); + List<Integer> preDeleteIds = new ArrayList<>(); preDeleteIds.add(toDelete.get(0).getId()); preDeleteIds.add(toDelete.get(1).getId()); @@ -267,7 +267,7 @@ public class DeleteTest extends BaseData assertFalse(toDelete.get(1).isDeleted()); // check that four entries are in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertTrue(nullableOIntegerFkList.contains(toDelete.get(0))); assertTrue(nullableOIntegerFkList.contains(toDelete.get(1))); @@ -290,7 +290,7 @@ public class DeleteTest extends BaseData // check that no associated object has been deleted List<OIntegerPk> oIntegerPkList - = OIntegerPkPeer.doSelect(new Criteria()); + = OIntegerPkPeer.doSelect(new Criteria()); assertEquals(3, oIntegerPkList.size()); } @@ -304,11 +304,11 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); List<NullableOIntegerFk> toDelete - = new ArrayList<NullableOIntegerFk>(); + = new ArrayList<>(); toDelete.add(testData.getNullableOIntegerFkList().get(0)); toDelete.add(testData.getNullableOIntegerFkList().get(2)); toDelete.get(0).setId(toDelete.get(0).getId() - 1); @@ -320,7 +320,7 @@ public class DeleteTest extends BaseData // check that four entries are in the NullableOIntegerFk table // prior to deletion List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertFalse(nullableOIntegerFkList.contains(toDelete.get(0))); assertTrue(nullableOIntegerFkList.contains(toDelete.get(1))); @@ -348,18 +348,18 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); // we want to avoid fk errors in MultiRef testData.getMultiRefList().clear(); testData.save(); NullableOIntegerFk toDelete - = testData.getNullableOIntegerFkList().get(0); + = testData.getNullableOIntegerFkList().get(0); int preDeleteId = toDelete.getId(); // check that four entries are in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertTrue(nullableOIntegerFkList.contains(toDelete)); @@ -381,7 +381,7 @@ public class DeleteTest extends BaseData // check that no associated object has been deleted List<OIntegerPk> oIntegerPkList - = OIntegerPkPeer.doSelect(new Criteria()); + = OIntegerPkPeer.doSelect(new Criteria()); assertEquals(3, oIntegerPkList.size()); } @@ -396,17 +396,17 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); NullableOIntegerFk toDelete - = testData.getNullableOIntegerFkList().get(0); + = testData.getNullableOIntegerFkList().get(0); toDelete.setId(toDelete.getId() - 1); int preDeleteId = toDelete.getId(); // check that four entries are in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); assertFalse(nullableOIntegerFkList.contains(toDelete)); @@ -434,7 +434,7 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); // we want to avoid fk errors in MultiRef testData.getMultiRefList().clear(); testData.save(); @@ -451,7 +451,7 @@ public class DeleteTest extends BaseData // check that only the last two entries remains // in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(2, nullableOIntegerFkList.size()); assertEquals( testData.getNullableOIntegerFkList().get(2).getId(), @@ -459,7 +459,7 @@ public class DeleteTest extends BaseData // check that no associated object has been deleted List<OIntegerPk> oIntegerPkList - = OIntegerPkPeer.doSelect(new Criteria()); + = OIntegerPkPeer.doSelect(new Criteria()); assertEquals(3, oIntegerPkList.size()); } @@ -472,7 +472,7 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); // call delete method @@ -483,7 +483,7 @@ public class DeleteTest extends BaseData // check that three entries remain in the NullableOIntegerFk table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(4, nullableOIntegerFkList.size()); } @@ -497,7 +497,7 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); // call delete method @@ -528,7 +528,7 @@ public class DeleteTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); // call delete method @@ -554,7 +554,7 @@ public class DeleteTest extends BaseData // check that the last two entries remains in the NullableOIntegerFk // table List<NullableOIntegerFk> nullableOIntegerFkList - = getNullableOIntegerFkList(); + = getNullableOIntegerFkList(); assertEquals(2, nullableOIntegerFkList.size()); assertTrue(nullableOIntegerFkList.contains( testData.getNullableOIntegerFkList().get(1))); @@ -563,7 +563,7 @@ public class DeleteTest extends BaseData // check that no associated object has been deleted List<OIntegerPk> oIntegerPkList - = OIntegerPkPeer.doSelect(new Criteria()); + = OIntegerPkPeer.doSelect(new Criteria()); assertEquals(3, oIntegerPkList.size()); } @@ -603,7 +603,7 @@ public class DeleteTest extends BaseData Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn(NullableOIntegerFkPeer.ID); List<NullableOIntegerFk> result - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); return result; }
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java Mon Aug 27 09:48:33 2018 @@ -153,17 +153,17 @@ public class DoInsertTest extends BaseDa if (defaultAdapter instanceof MssqlAdapter) { log.warn("testDoInsertWithSelectSingleRecordIdSet(): " - + "Setting explicit Ids is not (easily) supported by MSSQL"); + + "Setting explicit Ids is not (easily) supported by MSSQL"); return; } Criteria selectCriteria = new Criteria() - .where(AuthorPeer.AUTHOR_ID, authorList.get(0).getAuthorId()) - .addSelectColumn(new ColumnImpl( - AuthorPeer.AUTHOR_ID.getSchemaName(), - AuthorPeer.AUTHOR_ID.getTableName(), - AuthorPeer.AUTHOR_ID.getColumnName(), - AuthorPeer.AUTHOR_ID.getSqlExpression() + " + 100")) - .addSelectColumn(AuthorPeer.NAME); + .where(AuthorPeer.AUTHOR_ID, authorList.get(0).getAuthorId()) + .addSelectColumn(new ColumnImpl( + AuthorPeer.AUTHOR_ID.getSchemaName(), + AuthorPeer.AUTHOR_ID.getTableName(), + AuthorPeer.AUTHOR_ID.getColumnName(), + AuthorPeer.AUTHOR_ID.getSqlExpression() + " + 100")) + .addSelectColumn(AuthorPeer.NAME); // execute int numberOfInsertedRows = AuthorPeer.doInsert( @@ -191,12 +191,12 @@ public class DoInsertTest extends BaseDa if ( IDMethod.ID_BROKER == AuthorPeer.getTableMap().getPrimaryKeyMethod()) { log.warn("Cannot test insert.. select statement with autoincrement" - + " id method"); + + " id method"); return; } Criteria selectCriteria = new Criteria() - .where(AuthorPeer.AUTHOR_ID, authorList.get(0).getAuthorId()) - .addSelectColumn(AuthorPeer.NAME); + .where(AuthorPeer.AUTHOR_ID, authorList.get(0).getAuthorId()) + .addSelectColumn(AuthorPeer.NAME); // execute int numberOfInsertedRows = AuthorPeer.doInsert( @@ -224,12 +224,12 @@ public class DoInsertTest extends BaseDa if ( IDMethod.ID_BROKER == AuthorPeer.getTableMap().getPrimaryKeyMethod()) { log.warn("Cannot test insert.. select statement with autoincrement" - + " id method"); + + " id method"); return; } Criteria selectCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.TITLE); + .where(BookPeer.AUTHOR_ID, authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.TITLE); // execute int numberOfInsertedRows = AuthorPeer.doInsert( Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ExecuteStatementsTest.java Mon Aug 27 09:48:33 2018 @@ -53,7 +53,7 @@ public class ExecuteStatementsTest exten */ public void testExecuteStatementWithStringReplacements() throws Exception { - Map<String, JdbcTypedValue> replacements = new HashMap<String, JdbcTypedValue>(); + Map<String, JdbcTypedValue> replacements = new HashMap<>(); replacements.put("name", new JdbcTypedValue("Author 1", Types.VARCHAR)); replacements.put("newname", new JdbcTypedValue("Author 1 changed", Types.VARCHAR)); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java Mon Aug 27 09:48:33 2018 @@ -67,14 +67,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( RequiredPIntegerFkPeer.ID); List<RequiredPIntegerFk> fkList - = RequiredPIntegerFkPeer.doSelect(criteria); + = RequiredPIntegerFkPeer.doSelect(criteria); assertEquals(3, fkList.size()); assertEquals( testData.getRequiredPIntegerFkList().get(0).getId(), @@ -83,8 +83,8 @@ public class FillerTest extends BaseData // loaded their referenced intPk object List<PIntegerPk> referencedPkList - = RequiredPIntegerFkPeer.fillPIntegerPks( - fkList); + = RequiredPIntegerFkPeer.fillPIntegerPks( + fkList); // TODO check that NullableIntFkList entries have now // loaded their referenced intPk object @@ -153,14 +153,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( NullableOIntegerFkPeer.ID); List<NullableOIntegerFk> fkList - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); assertEquals(4, fkList.size()); assertEquals( testData.getNullableOIntegerFkList().get(0).getId(), @@ -169,8 +169,8 @@ public class FillerTest extends BaseData // loaded its referenced intPk object List<OIntegerPk> referencedPkList - = NullableOIntegerFkPeer.fillOIntegerPks( - fkList); + = NullableOIntegerFkPeer.fillOIntegerPks( + fkList); // returned list must contain intPk2, intPk3, intPk3 // and the last 2 objects must not be the same objects @@ -227,14 +227,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( NonPkOIntegerFkPeer.ID); List<NonPkOIntegerFk> fkList - = NonPkOIntegerFkPeer.doSelect(criteria); + = NonPkOIntegerFkPeer.doSelect(criteria); assertEquals(4, fkList.size()); assertEquals( testData.getNonPkOIntegerFkList().get(0).getId(), @@ -243,8 +243,8 @@ public class FillerTest extends BaseData // loaded its referenced intPk object List<OIntegerPk> referencedPkList - = NonPkOIntegerFkPeer.fillOIntegerPks( - fkList); + = NonPkOIntegerFkPeer.fillOIntegerPks( + fkList); // returned list must contain intPk1, intPk1, intPk2 // and the first 2 objects must not be the same objects @@ -300,14 +300,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria().where( NullableOIntegerFkPeer.NAME, "nullableOIntegerFk3a"); List<NullableOIntegerFk> fkList - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); assertEquals(1, fkList.size()); assertEquals( testData.getNullableOIntegerFkList().get(1).getId(), @@ -317,8 +317,8 @@ public class FillerTest extends BaseData fkList.add(fkEntryCopy); List<OIntegerPk> referencedPkList - = NullableOIntegerFkPeer.fillOIntegerPks( - fkList); + = NullableOIntegerFkPeer.fillOIntegerPks( + fkList); // returned list must contain intPk3, intPk3 // and the objects must not be the same objects @@ -365,14 +365,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( NullableOIntegerFkPeer.ID); List<NullableOIntegerFk> fkList - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); OIntegerPk originalOIntegerPk = fkList.get(0).getOIntegerPk(); assertNotNull(originalOIntegerPk); @@ -396,14 +396,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( CompIntegerVarcharFkPeer.ID); List<CompIntegerVarcharFk> fkList - = CompIntegerVarcharFkPeer.doSelect(criteria); + = CompIntegerVarcharFkPeer.doSelect(criteria); assertEquals(4, fkList.size()); assertEquals( testData.getCompositeIntegerVarcharFkList().get(0).getId(), @@ -412,8 +412,8 @@ public class FillerTest extends BaseData // loaded its referenced intPk object List<CompIntegerVarcharPk> referencedPkList - = CompIntegerVarcharFkPeer.fillCompIntegerVarcharPks( - fkList); + = CompIntegerVarcharFkPeer.fillCompIntegerVarcharPks( + fkList); // returned list must contain compositeIntegerVarcharPk2, // compositeIntegerVarcharPk3, compositeIntegerVarcharPk3 @@ -473,14 +473,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( CompNonpkFkPeer.ID); List<CompNonpkFk> fkList - = CompNonpkFkPeer.doSelect(criteria); + = CompNonpkFkPeer.doSelect(criteria); assertEquals(3, fkList.size()); assertEquals( testData.getCompositeNonpkFkList().get(0).getId(), @@ -489,8 +489,8 @@ public class FillerTest extends BaseData // loaded its referenced intPk object List<CompIntegerVarcharPk> referencedPkList - = CompNonpkFkPeer.fillCompIntegerVarcharPks( - fkList); + = CompNonpkFkPeer.fillCompIntegerVarcharPks( + fkList); // returned list must contain compositeIntegerVarcharPk1, // compositeIntegerVarcharPk2, compositeIntegerVarcharPk2 @@ -546,13 +546,13 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.and(NullableOIntegerFkPeer.NAME, "nullableOIntegerFk2"); List<NullableOIntegerFk> fkList - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); assertEquals(1, fkList.size()); NullableOIntegerFk fkObject = fkList.get(0); assertEquals( @@ -563,8 +563,8 @@ public class FillerTest extends BaseData changedPkObject.setName("oIntegerPk2modified"); List<OIntegerPk> referencedPkList - = NullableOIntegerFkPeer.fillOIntegerPks( - fkList); + = NullableOIntegerFkPeer.fillOIntegerPks( + fkList); // returned list must contain unchanged new oIntegerPk2 assertEquals(1, referencedPkList.size()); @@ -585,14 +585,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( RequiredPIntegerFkPeer.ID); List<RequiredPIntegerFk> fkList - = RequiredPIntegerFkPeer.doSelect(criteria); + = RequiredPIntegerFkPeer.doSelect(criteria); assertEquals(3, fkList.size()); assertEquals( testData.getRequiredPIntegerFkList().get(0).getId(), @@ -601,8 +601,8 @@ public class FillerTest extends BaseData // loaded their referenced intPk object List<PIntegerPk> referencedPkList - = RequiredPIntegerFkPeer.fillPIntegerPks( - fkList); + = RequiredPIntegerFkPeer.fillPIntegerPks( + fkList); // TODO check that NullableIntFkList entries have now // loaded their referenced intPk object @@ -681,7 +681,7 @@ public class FillerTest extends BaseData Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn(NullableOIntegerFkPeer.ID); List<NullableOIntegerFk> fkObjectList - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); assertEquals(MANY, fkObjectList.size()); int count = 0; @@ -690,14 +690,14 @@ public class FillerTest extends BaseData if (fkObject.getFk() != null && fkObject.getFk() == 0) { fail("fk Object with id " + fkObject.getId() - + " on position " + count + " has foreign key 0"); + + " on position " + count + " has foreign key 0"); } ++count; } // TODO assert that fkObjectList have not already loaded their pk object List<OIntegerPk> oIntegerPkList - = NullableOIntegerFkPeer.fillOIntegerPks(fkObjectList); + = NullableOIntegerFkPeer.fillOIntegerPks(fkObjectList); assertEquals(MANY - (MANY / 10), oIntegerPkList.size()); @@ -729,7 +729,7 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); @@ -746,8 +746,8 @@ public class FillerTest extends BaseData } List<RequiredPIntegerFk> referencingFkList - = PIntegerPkPeer.fillRequiredPIntegerFks( - pkList); + = PIntegerPkPeer.fillRequiredPIntegerFks( + pkList); // check all referencing lists are initialized for (PIntegerPk pIntegerPk : pkList) @@ -818,7 +818,7 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); @@ -835,8 +835,8 @@ public class FillerTest extends BaseData } List<NullableOIntegerFk> referencingFkList - = OIntegerPkPeer.fillNullableOIntegerFks( - pkList); + = OIntegerPkPeer.fillNullableOIntegerFks( + pkList); // returned list must contain nullableOIntegerFk2, // nullableOIntegerFk3a, nullableOIntegerFk3b @@ -891,14 +891,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria().where( OIntegerPkPeer.NAME, "oIntegerPk2"); List<OIntegerPk> pkList - = OIntegerPkPeer.doSelect(criteria); + = OIntegerPkPeer.doSelect(criteria); assertEquals(1, pkList.size()); assertEquals( testData.getOIntegerPkList().get(1).getId(), @@ -908,8 +908,8 @@ public class FillerTest extends BaseData pkList.add(pkEntryCopy); List<NullableOIntegerFk> referencedFkList - = OIntegerPkPeer.fillNullableOIntegerFks( - pkList); + = OIntegerPkPeer.fillNullableOIntegerFks( + pkList); // returned list must contain nullableOIntegerFk2, nullableOIntegerFk2 // and the objects must not be the same objects @@ -957,14 +957,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn( OIntegerPkPeer.ID); List<OIntegerPk> pkList - = OIntegerPkPeer.doSelect(criteria); + = OIntegerPkPeer.doSelect(criteria); assertEquals(3, pkList.size()); assertEquals( testData.getOIntegerPkList().get(0).getId(), @@ -976,7 +976,7 @@ public class FillerTest extends BaseData } List<NonPkOIntegerFk> referencingFkList - = OIntegerPkPeer.fillNonPkOIntegerFks(pkList); + = OIntegerPkPeer.fillNonPkOIntegerFks(pkList); // returned list must contain nonPkOIntegerFk1a, nonPkOIntegerFk1b, // nonPkOIntegerFk2 @@ -998,13 +998,13 @@ public class FillerTest extends BaseData assertEquals(0, pkList.get(2).getNonPkOIntegerFks().size()); assertTrue( pkList.get(0).getNonPkOIntegerFks().contains( - testData.getNonPkOIntegerFkList().get(0))); + testData.getNonPkOIntegerFkList().get(0))); assertTrue( pkList.get(0).getNonPkOIntegerFks().contains( - testData.getNonPkOIntegerFkList().get(1))); + testData.getNonPkOIntegerFkList().get(1))); assertTrue( pkList.get(1).getNonPkOIntegerFks().contains( - testData.getNonPkOIntegerFkList().get(2))); + testData.getNonPkOIntegerFkList().get(2))); // The objects in the result list must be the same objects // as the referenced objects in the pk list @@ -1031,14 +1031,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn(CompIntegerVarcharPkPeer.ID1); criteria.addAscendingOrderByColumn(CompIntegerVarcharPkPeer.ID2); List<CompIntegerVarcharPk> pkList - = CompIntegerVarcharPkPeer.doSelect(criteria); + = CompIntegerVarcharPkPeer.doSelect(criteria); assertEquals(3, pkList.size()); assertEquals( testData.getCompositeIntegerVarcharPkList().get(0).getPrimaryKey(), @@ -1050,8 +1050,8 @@ public class FillerTest extends BaseData } List<CompIntegerVarcharFk> referencingFkList - = CompIntegerVarcharPkPeer.fillCompIntegerVarcharFks( - pkList); + = CompIntegerVarcharPkPeer.fillCompIntegerVarcharFks( + pkList); // returned list must contain compositeIntegerVarcharFk2, // compositeIntegerVarcharFk3a, compositeIntegerVarcharFk3b @@ -1108,14 +1108,14 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn(CompIntegerVarcharPkPeer.ID1); criteria.addAscendingOrderByColumn(CompIntegerVarcharPkPeer.ID2); List<CompIntegerVarcharPk> pkList - = CompIntegerVarcharPkPeer.doSelect(criteria); + = CompIntegerVarcharPkPeer.doSelect(criteria); assertEquals(3, pkList.size()); assertEquals( testData.getCompositeIntegerVarcharPkList().get(0).getPrimaryKey(), @@ -1127,7 +1127,7 @@ public class FillerTest extends BaseData } List<CompNonpkFk> referencingFkList - = CompIntegerVarcharPkPeer.fillCompNonpkFks(pkList); + = CompIntegerVarcharPkPeer.fillCompNonpkFks(pkList); // returned list must contain compositeNonpkFk1a, // compositeNonpkFk1b, compositeNonpkFk2 @@ -1180,7 +1180,7 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); @@ -1193,11 +1193,11 @@ public class FillerTest extends BaseData pkList.get(0).getId()); NullableOIntegerFk changedFkObject - = pkObject.getNullableOIntegerFks().get(0); + = pkObject.getNullableOIntegerFks().get(0); changedFkObject.setName("nullableOIntegerFk2Modified"); List<NullableOIntegerFk> referencingFkList - = OIntegerPkPeer.fillNullableOIntegerFks(pkList); + = OIntegerPkPeer.fillNullableOIntegerFks(pkList); // returned list must contain unchanged new nullableOIntegerFk2 assertEquals(1, referencingFkList.size()); @@ -1220,7 +1220,7 @@ public class FillerTest extends BaseData { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); Criteria criteria = new Criteria(); @@ -1237,7 +1237,7 @@ public class FillerTest extends BaseData } List<RequiredPIntegerFk> referencingFkList - = PIntegerPkPeer.fillRequiredPIntegerFks(pkList, -1); + = PIntegerPkPeer.fillRequiredPIntegerFks(pkList, -1); // check all referencing lists are initialized for (PIntegerPk pIntegerPk : pkList) @@ -1325,7 +1325,7 @@ public class FillerTest extends BaseData } List<NullableOIntegerFk> nullableOIntegerFkList - = OIntegerPkPeer.fillNullableOIntegerFks(pkObjectList); + = OIntegerPkPeer.fillNullableOIntegerFks(pkObjectList); assertEquals(2 * (MANY - (MANY / 10)), nullableOIntegerFkList.size()); @@ -1338,10 +1338,10 @@ public class FillerTest extends BaseData pkObject.getNullableOIntegerFks().size()); assertTrue( pkObject.getNullableOIntegerFks().get(0).getName() - .startsWith("nullableOIntegerFk" + i)); + .startsWith("nullableOIntegerFk" + i)); assertTrue( pkObject.getNullableOIntegerFks().get(1).getName() - .startsWith("nullableOIntegerFk" + i)); + .startsWith("nullableOIntegerFk" + i)); } else { Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GroupByTest.java Mon Aug 27 09:48:33 2018 @@ -63,7 +63,7 @@ public class GroupByTest extends BaseDat .setDistinct(); List<Integer> idList - = BookPeer.doSelect(criteria, new IntegerMapper()); + = BookPeer.doSelect(criteria, new IntegerMapper()); assertEquals(10, idList.size()); assertEquals(getAuthorIds(), idList); @@ -71,7 +71,7 @@ public class GroupByTest extends BaseDat private List<Integer> getAuthorIds() { - List<Integer> result = new ArrayList<Integer>(); + List<Integer> result = new ArrayList<>(); for (Author author : authorList) { result.add(author.getAuthorId()); @@ -91,17 +91,17 @@ public class GroupByTest extends BaseDat .addGroupByColumn(BookPeer.AUTHOR_ID); List<Integer> maxList - = BookPeer.doSelect(criteria, new IntegerMapper()); + = BookPeer.doSelect(criteria, new IntegerMapper()); assertEquals(10, maxList.size()); assertEquals( - new HashSet<Integer>(getMaxBookIdPerAuthor()), - new HashSet<Integer>(maxList)); + new HashSet<>(getMaxBookIdPerAuthor()), + new HashSet<>(maxList)); } private List<Integer> getMaxBookIdPerAuthor() throws TorqueException { - List<Integer> result = new ArrayList<Integer>(); + List<Integer> result = new ArrayList<>(); for (Author author : authorList) { int maxBookId = -1; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java Mon Aug 27 09:48:33 2018 @@ -73,9 +73,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 5) { fail("author left join book : " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 5"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 5"); } } @@ -102,9 +102,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 4) { fail("author left join book : " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 4"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 4"); } } @@ -130,9 +130,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 4) { fail("author left join book : " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 4"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 4"); } } @@ -164,9 +164,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 5) { fail("book right join author " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 5"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 5"); } } @@ -183,10 +183,10 @@ public class JoinTest extends BaseDataba criteria.addJoin( BookPeer.TABLE_NAME, AuthorPeer.TABLE_NAME, - new Criterion( - BookPeer.AUTHOR_ID, - AuthorPeer.AUTHOR_ID, - Criteria.NOT_EQUAL), + new Criterion( + BookPeer.AUTHOR_ID, + AuthorPeer.AUTHOR_ID, + Criteria.NOT_EQUAL), null); List<Author> authorList = AuthorPeer.doSelect(criteria); @@ -198,9 +198,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 8) { fail("book join author on not equals" - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 8"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 8"); } } @@ -234,9 +234,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 11) { fail("book right join author left join book b: " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 11"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 11"); } } @@ -273,9 +273,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 11) { fail("book right join author left join book b (reversed): " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 11"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 11"); } } @@ -314,9 +314,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 1) { fail("join with subselect: " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 1"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 1"); } assertEquals("Author with one book", authorList.get(0).getName()); } @@ -348,9 +348,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 1) { fail("author join book : " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 1"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 1"); } } @@ -381,9 +381,9 @@ public class JoinTest extends BaseDataba if (authorList.size() != 1) { fail("author join book : " - + "incorrect numbers of authors found : " - + authorList.size() - + ", should be 1"); + + "incorrect numbers of authors found : " + + authorList.size() + + ", should be 1"); } } @@ -441,8 +441,8 @@ public class JoinTest extends BaseDataba OIntegerPkPeer.ID, oIntegerPk.getId()); List<MultiRef> list - = MyMultiRefPeer.doSelectJoinAllExceptNullableOIntegerFk( - criteria); + = MyMultiRefPeer.doSelectJoinAllExceptNullableOIntegerFk( + criteria); assertTrue("list should contain 1 entry but contains " + list.size(), list.size() == 1); @@ -450,10 +450,10 @@ public class JoinTest extends BaseDataba // check loaded entities. loading already loaded entities // with a null connection does not result in an error OIntegerPk relatedBy1 - = MultiRefLoaded.getOIntegerPk(null); // already loaded + = MultiRefLoaded.getOIntegerPk(null); // already loaded assertEquals(oIntegerPk.getName(), relatedBy1.getName()); PIntegerPk relatedBy2 - = MultiRefLoaded.getPIntegerPk(null); // already loaded + = MultiRefLoaded.getPIntegerPk(null); // already loaded assertEquals(pIntegerPk.getName(), relatedBy2.getName()); try { @@ -473,8 +473,8 @@ public class JoinTest extends BaseDataba static class MyMultiRefPeer extends MultiRefPeer { public static List<MultiRef> doSelectJoinAllExceptNullableOIntegerFk( - Criteria criteria) - throws TorqueException + Criteria criteria) + throws TorqueException { return MultiRefPeer.doSelectJoinAllExceptNullableOIntegerFk(criteria); } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSelectForUpdateTest.java Mon Aug 27 09:48:33 2018 @@ -31,13 +31,14 @@ import org.apache.torque.test.peer.Optim * @version $Id$ */ public class OptimisticLockingSelectForUpdateTest - extends BaseOptimisticLockingTest<OptimisticLocking> +extends BaseOptimisticLockingTest<OptimisticLocking> { public OptimisticLockingSelectForUpdateTest() { super(new OptimisticLockingPeerImpl()); } + @Override public OptimisticLocking newObject() { return new OptimisticLocking(); @@ -57,6 +58,6 @@ public class OptimisticLockingSelectForU assertEquals( "The row was updated concurrently. Version in database: 1" + ", version in memory: 0", - e.getMessage()); + e.getMessage()); } } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/OptimisticLockingSimpleSelectTest.java Mon Aug 27 09:48:33 2018 @@ -36,6 +36,7 @@ public class OptimisticLockingSimpleSele super(new OptimisticLockingSimplePeerImpl()); } + @Override public OptimisticLockingSimple newObject() { return new OptimisticLockingSimple(); @@ -47,7 +48,7 @@ public class OptimisticLockingSimpleSele assertEquals( "The row to update was either updated or deleted concurrently " + "or does not exist at all.", - e.getMessage()); + e.getMessage()); } @Override @@ -56,6 +57,6 @@ public class OptimisticLockingSimpleSele assertEquals( "The row to update was either updated or deleted concurrently " + "or does not exist at all.", - e.getMessage()); + e.getMessage()); } } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/QualifiedTableNameTest.java Mon Aug 27 09:48:33 2018 @@ -69,7 +69,7 @@ public class QualifiedTableNameTest exte // execute List<QualifiedName> qualifiedNames - = QualifiedNamePeer.doSelect(criteria); + = QualifiedNamePeer.doSelect(criteria); // verify assertEquals(1, qualifiedNames.size()); @@ -89,7 +89,7 @@ public class QualifiedTableNameTest exte // execute List<QualifiedName> qualifiedNames - = QualifiedNamePeer.doSelect(criteria); + = QualifiedNamePeer.doSelect(criteria); // verify assertEquals(3, qualifiedNames.size()); @@ -115,7 +115,7 @@ public class QualifiedTableNameTest exte Criteria criteria = new Criteria(); criteria.where(QualifiedNamePeer.ID, qualifiedName2.getId()); List<QualifiedName> qualifiedNames - = QualifiedNamePeer.doSelect(criteria); + = QualifiedNamePeer.doSelect(criteria); assertEquals(1, qualifiedNames.size()); assertEquals(qualifiedName2.getId(), qualifiedNames.get(0).getId()); assertEquals( @@ -136,7 +136,7 @@ public class QualifiedTableNameTest exte // verify Criteria criteria = new Criteria(); List<QualifiedName> qualifiedNames - = QualifiedNamePeer.doSelect(criteria); + = QualifiedNamePeer.doSelect(criteria); assertEquals(2, qualifiedNames.size()); assertFalse(qualifiedNames.contains(qualifiedName2)); } @@ -162,7 +162,7 @@ public class QualifiedTableNameTest exte { // prepare String schemaName - = Torque.getConfiguration().getString("qualifiedNameTest.schema"); + = Torque.getConfiguration().getString("qualifiedNameTest.schema"); // verify assertEquals(schemaName, QualifiedNamePeer.TABLE.getSchemaName()); } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/RetrieveByPkTest.java Mon Aug 27 09:48:33 2018 @@ -146,7 +146,7 @@ public class RetrieveByPkTest extends Ba */ public void testRetrieveByObjectKeys() throws Exception { - List<ObjectKey> objectKeys = new ArrayList<ObjectKey>(); + List<ObjectKey> objectKeys = new ArrayList<>(); objectKeys.add(authorList.get(1).getPrimaryKey()); objectKeys.add(authorList.get(2).getPrimaryKey()); objectKeys.add(SimpleKey.keyFor(-5L)); @@ -164,7 +164,7 @@ public class RetrieveByPkTest extends Ba */ public void testRetrieveByTypedKeys() throws Exception { - List<Integer> typedKeys = new ArrayList<Integer>(); + List<Integer> typedKeys = new ArrayList<>(); typedKeys.add(authorList.get(1).getAuthorId()); typedKeys.add(authorList.get(2).getAuthorId()); typedKeys.add(-5); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java Mon Aug 27 09:48:33 2018 @@ -61,10 +61,10 @@ public class SaveMethodsInPeerTest exten assertEquals("payload 1", toSave.getPayload()); Criteria criteria = new Criteria() - .where(SaveMethodInPeerPeer.ID, toSave.getId()) - .and(SaveMethodInPeerPeer.PAYLOAD, "payload 1"); + .where(SaveMethodInPeerPeer.ID, toSave.getId()) + .and(SaveMethodInPeerPeer.PAYLOAD, "payload 1"); List<SaveMethodInPeer> loadedList - = SaveMethodInPeerPeer.doSelect(criteria); + = SaveMethodInPeerPeer.doSelect(criteria); assertEquals(1, loadedList.size()); assertEquals( @@ -107,32 +107,32 @@ public class SaveMethodsInPeerTest exten assertEquals("payload 2", child2.getPayload()); Criteria criteria = new Criteria() - .where(SaveMethodInPeerPeer.ID, toSave.getId()) - .and(SaveMethodInPeerPeer.PAYLOAD, "payload"); + .where(SaveMethodInPeerPeer.ID, toSave.getId()) + .and(SaveMethodInPeerPeer.PAYLOAD, "payload"); List<SaveMethodInPeer> loadedList - = SaveMethodInPeerPeer.doSelect(criteria); + = SaveMethodInPeerPeer.doSelect(criteria); assertEquals(1, loadedList.size()); assertEquals( 1, new CountHelper().count(SaveMethodInPeerPeer.getTableMap())); criteria = new Criteria() - .where(SaveMethodInPeerFkPeer.SAVE_METHOD_IN_PEER_ID, toSave.getId()) - .and(SaveMethodInPeerFkPeer.ID, child1.getId()) - .and(SaveMethodInPeerFkPeer.PAYLOAD, "payload 1"); + .where(SaveMethodInPeerFkPeer.SAVE_METHOD_IN_PEER_ID, toSave.getId()) + .and(SaveMethodInPeerFkPeer.ID, child1.getId()) + .and(SaveMethodInPeerFkPeer.PAYLOAD, "payload 1"); List<SaveMethodInPeerFk> child1List - = SaveMethodInPeerFkPeer.doSelect(criteria); + = SaveMethodInPeerFkPeer.doSelect(criteria); assertEquals(1, child1List.size()); assertEquals( 1, new CountHelper().count(SaveMethodInPeerFkPeer.getTableMap())); criteria = new Criteria() - .where(SaveMethodInObjectFkPeer.SAVE_METHOD_IN_PEER_ID, toSave.getId()) - .and(SaveMethodInObjectFkPeer.ID, child2.getId()) - .and(SaveMethodInObjectFkPeer.PAYLOAD, "payload 2"); + .where(SaveMethodInObjectFkPeer.SAVE_METHOD_IN_PEER_ID, toSave.getId()) + .and(SaveMethodInObjectFkPeer.ID, child2.getId()) + .and(SaveMethodInObjectFkPeer.PAYLOAD, "payload 2"); List<SaveMethodInObjectFk> child2List - = SaveMethodInObjectFkPeer.doSelect(criteria); + = SaveMethodInObjectFkPeer.doSelect(criteria); assertEquals(1, child2List.size()); assertEquals( 1, Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java Mon Aug 27 09:48:33 2018 @@ -39,7 +39,7 @@ import org.apache.torque.util.functions. public class SelectFunctionTest extends BaseDatabaseTestCase { private static final int[] INT_VALUES = { - 1, 1, 1, 5 + 1, 1, 1, 5 }; private BasePeerImpl<Integer> peer; @@ -60,7 +60,7 @@ public class SelectFunctionTest extends rec.save(); } - peer = new BasePeerImpl<Integer>( + peer = new BasePeerImpl<>( new IntegerMapper(), Summarize1Peer.getTableMap(), Summarize1Peer.DATABASE_NAME); @@ -155,33 +155,33 @@ public class SelectFunctionTest extends assertEquals(new Integer(5), max); } - /** - * Tests a select using the sum function. - * - * @throws Exception if the test fails - */ - public void testSelectSum() throws Exception - { - Criteria criteria = new Criteria().addSelectColumn( - new Sum(Summarize1Peer.INT_1)); - - Integer sum = peer.doSelectSingleRecord(criteria); - - assertEquals(new Integer(8), sum); - } - - /** - * Tests a select using the sum function with distinct. - * - * @throws Exception if the test fails - */ - public void testSelectSumDistinct() throws Exception - { - Criteria criteria = new Criteria().addSelectColumn( - new Sum(Summarize1Peer.INT_1, true)); + /** + * Tests a select using the sum function. + * + * @throws Exception if the test fails + */ + public void testSelectSum() throws Exception + { + Criteria criteria = new Criteria().addSelectColumn( + new Sum(Summarize1Peer.INT_1)); + + Integer sum = peer.doSelectSingleRecord(criteria); - Integer sum = peer.doSelectSingleRecord(criteria); + assertEquals(new Integer(8), sum); + } - assertEquals(new Integer(6), sum); - } + /** + * Tests a select using the sum function with distinct. + * + * @throws Exception if the test fails + */ + public void testSelectSumDistinct() throws Exception + { + Criteria criteria = new Criteria().addSelectColumn( + new Sum(Summarize1Peer.INT_1, true)); + + Integer sum = peer.doSelectSingleRecord(criteria); + + assertEquals(new Integer(6), sum); + } } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java Mon Aug 27 09:48:33 2018 @@ -54,7 +54,7 @@ public class SelectInTest extends BaseDa public void testInWithStringListNoIgnoreCase() throws Exception { Criteria criteria = new Criteria(); - List<String> nameList = new ArrayList<String>(); + List<String> nameList = new ArrayList<>(); nameList.add("Author 1"); nameList.add("Author 2"); criteria.where(AuthorPeer.NAME, nameList, Criteria.IN); @@ -88,7 +88,7 @@ public class SelectInTest extends BaseDa public void testInWithIntegerListNoIgnoreCase() throws Exception { Criteria criteria = new Criteria(); - List<Integer> idList = new ArrayList<Integer>(); + List<Integer> idList = new ArrayList<>(); idList.add(authorList.get(0).getAuthorId()); idList.add(authorList.get(1).getAuthorId()); criteria.where(AuthorPeer.AUTHOR_ID, idList, Criteria.IN); @@ -122,7 +122,7 @@ public class SelectInTest extends BaseDa public void testInWithStringListAndNullValue() throws Exception { Criteria criteria = new Criteria(); - List<String> isbnList = new ArrayList<String>(); + List<String> isbnList = new ArrayList<>(); isbnList.add("ISBN 1 - 1"); isbnList.add(null); @@ -188,7 +188,7 @@ public class SelectInTest extends BaseDa public void testInWithStringListIgnoreCaseTrue() throws Exception { Criteria criteria = new Criteria(); - List<String> nameList = new ArrayList<String>(); + List<String> nameList = new ArrayList<>(); nameList.add("AuTHor 1"); nameList.add("AuTHor 2"); criteria.where(AuthorPeer.NAME, nameList, Criteria.IN); @@ -223,7 +223,7 @@ public class SelectInTest extends BaseDa public void testInWithIntegerListIgnoreCaseTrue() throws Exception { Criteria criteria = new Criteria(); - List<Integer> idList = new ArrayList<Integer>(); + List<Integer> idList = new ArrayList<>(); idList.add(authorList.get(0).getAuthorId()); idList.add(authorList.get(1).getAuthorId()); criteria.where(AuthorPeer.AUTHOR_ID, idList, Criteria.IN); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java Mon Aug 27 09:48:33 2018 @@ -67,25 +67,25 @@ public class SelectSetOperationTest exte public void testUnion() throws Exception { Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); criteria.union(otherCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(20, result.size()); - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(0), expected); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); } /** @@ -96,33 +96,33 @@ public class SelectSetOperationTest exte public void testUnionAll() throws Exception { Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(30, result.size()); // check unique contents of list - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(0), expected); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); // check that books of first author occur multiple times (in fact twice) // in the list for (int i = 0; i < 10; ++i) { assertFalse(result.indexOf(authorList.get(0).getBooks().get(i).getBookId()) - == result.lastIndexOf(authorList.get(0).getBooks().get(i).getBookId())); + == result.lastIndexOf(authorList.get(0).getBooks().get(i).getBookId())); } } @@ -136,35 +136,35 @@ public class SelectSetOperationTest exte if (defaultAdapter instanceof MysqlAdapter) { log.error("testExcept(): " - + "MySQL does not support " - + "the EXCEPT ALL operator"); + + "MySQL does not support " + + "the EXCEPT ALL operator"); return; } Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.except(otherCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(10, result.size()); - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); } /** @@ -179,42 +179,42 @@ public class SelectSetOperationTest exte || defaultAdapter instanceof MssqlAdapter) { log.error("testExceptAll(): " - + "Oracle, MySQL and MSSQL do not support " - + "the EXCEPT ALL operator"); + + "Oracle, MySQL and MSSQL do not support " + + "the EXCEPT ALL operator"); return; } Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.exceptAll(otherCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(20, result.size()); // check unique result - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); // check that books of the author occur multiple times (in fact twice) // in the list for (int i = 0; i < 10; ++i) { assertFalse(result.indexOf(authorList.get(1).getBooks().get(i).getBookId()) - == result.lastIndexOf(authorList.get(1).getBooks().get(i).getBookId())); + == result.lastIndexOf(authorList.get(1).getBooks().get(i).getBookId())); } } @@ -232,44 +232,44 @@ public class SelectSetOperationTest exte || defaultAdapter instanceof MssqlAdapter) { log.error("testExceptAllMultipleOccurances(): " - + "Oracle, MySQL and MSSQL do not support " - + "the EXCEPT ALL operator"); + + "Oracle, MySQL and MSSQL do not support " + + "the EXCEPT ALL operator"); return; } Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.exceptAll(otherCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(30, result.size()); // check unique result - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(0), expected); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); // check that books of the second author occur multiple times (in fact twice) // in the list for (int i = 0; i < 10; ++i) { assertFalse(result.indexOf(authorList.get(1).getBooks().get(i).getBookId()) - == result.lastIndexOf(authorList.get(1).getBooks().get(i).getBookId())); + == result.lastIndexOf(authorList.get(1).getBooks().get(i).getBookId())); } } @@ -288,35 +288,35 @@ public class SelectSetOperationTest exte return; } Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); Criteria intersectCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); intersectCriteria.unionAll(otherCriteria); criteria.intersect(intersectCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(10, result.size()); - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); } /** @@ -332,47 +332,47 @@ public class SelectSetOperationTest exte || defaultAdapter instanceof MssqlAdapter) { log.error("testIntersectAllMultipleOccurances(): " - + "Oracle, MySQL and MSSQL do not support " - + "the EXCEPT ALL operator"); + + "Oracle, MySQL and MSSQL do not support " + + "the EXCEPT ALL operator"); return; } Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); Criteria intersectCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); intersectCriteria.unionAll(otherCriteria); criteria.intersectAll(intersectCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(20, result.size()); // check unique result - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); // check that books of the author occur multiple times (in fact twice) // in the list for (int i = 0; i < 10; ++i) { assertFalse(result.indexOf(authorList.get(1).getBooks().get(i).getBookId()) - == result.lastIndexOf(authorList.get(1).getBooks().get(i).getBookId())); + == result.lastIndexOf(authorList.get(1).getBooks().get(i).getBookId())); } } @@ -388,42 +388,42 @@ public class SelectSetOperationTest exte || defaultAdapter instanceof MssqlAdapter) { log.error("testIntersectAll(): " - + "Oracle, MySQL and MSSQL do not support " - + "the EXCEPT ALL operator"); + + "Oracle, MySQL and MSSQL do not support " + + "the EXCEPT ALL operator"); return; } Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId(), - Criteria.LESS_EQUAL) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId(), + Criteria.LESS_EQUAL) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria); otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(1).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(1).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.intersectAll(otherCriteria); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(10, result.size()); // check unique result - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); addBookIds(authorList.get(1), expected); - assertEquals(expected, new HashSet<Integer>(result)); + assertEquals(expected, new HashSet<>(result)); } private void addBookIds( - final Author author, - final Collection<Integer> expected) - throws TorqueException + final Author author, + final Collection<Integer> expected) + throws TorqueException { for (Book book : author.getBooks()) { @@ -439,25 +439,25 @@ public class SelectSetOperationTest exte public void testUnionAllOrderByLimitOffset() throws Exception { Criteria criteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); Criteria otherCriteria = new Criteria() - .where(BookPeer.AUTHOR_ID, - authorList.get(0).getAuthorId()) - .addSelectColumn(BookPeer.BOOK_ID); + .where(BookPeer.AUTHOR_ID, + authorList.get(0).getAuthorId()) + .addSelectColumn(BookPeer.BOOK_ID); criteria.unionAll(otherCriteria) - .addAscendingOrderByColumn(new ColumnImpl("1")) - .setOffset(2) - .setLimit(4); + .addAscendingOrderByColumn(new ColumnImpl("1")) + .setOffset(2) + .setLimit(4); List<Integer> result - = AuthorPeer.doSelect(criteria, new IntegerMapper()); + = AuthorPeer.doSelect(criteria, new IntegerMapper()); assertEquals(4, result.size()); // check unique contents of list - List<Integer> expected = new ArrayList<Integer>(); + List<Integer> expected = new ArrayList<>(); expected.add(authorList.get(0).getBooks().get(1).getBookId()); expected.add(authorList.get(0).getBooks().get(1).getBookId()); expected.add(authorList.get(0).getBooks().get(2).getBookId()); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java Mon Aug 27 09:48:33 2018 @@ -151,7 +151,7 @@ public class SelectTest extends BaseData */ public void testSelectSingleRecordWithObject() throws Exception { - Author author = AuthorPeer.doSelectSingleRecord(authorList.get(0)); + Author author = AuthorPeer.doSelectSingleRecord(authorList.get(0)); assertEquals("Expected author with Id " + authorList.get(0).getAuthorId() + " but got " @@ -264,9 +264,9 @@ public class SelectTest extends BaseData { Book bookToSelect = authorList.get(0).getBooks().get(0); Criteria criteria = new Criteria() - .where(BookPeer.BOOK_ID, bookToSelect.getBookId()) - .addSelectColumn(BookPeer.BOOK_ID) - .addSelectColumn(BookPeer.TITLE); + .where(BookPeer.BOOK_ID, bookToSelect.getBookId()) + .addSelectColumn(BookPeer.BOOK_ID) + .addSelectColumn(BookPeer.TITLE); List<Book> books = BookPeer.doSelect(criteria); assertEquals(1, books.size()); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
