Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SetAndSaveTest.java Mon Aug 27 09:48:33 2018 @@ -54,11 +54,11 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(2); - List<NullableOIntegerFk> fkList = new ArrayList<NullableOIntegerFk>(); + List<NullableOIntegerFk> fkList = new ArrayList<>(); // object already associated to this object fkList.add(testData.getNullableOIntegerFkList().get(1)); // object already associated to another object @@ -75,7 +75,7 @@ public class SetAndSaveTest extends Base fkList); List<NullableOIntegerFk> cachedFks - = oIntegerPk.getNullableOIntegerFks(); + = oIntegerPk.getNullableOIntegerFks(); assertEquals(4, cachedFks.size()); assertEquals( testData.getNullableOIntegerFkList().get(1).getId(), @@ -132,7 +132,7 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(0); @@ -146,7 +146,7 @@ public class SetAndSaveTest extends Base assertTrue(oIntegerPk.getNonPkOIntegerFks().contains( testData.getNonPkOIntegerFkList().get(1))); - List<NonPkOIntegerFk> fkList = new ArrayList<NonPkOIntegerFk>(); + List<NonPkOIntegerFk> fkList = new ArrayList<>(); // object already associated to this object fkList.add(testData.getNonPkOIntegerFkList().get(1)); // object already associated to another object @@ -175,7 +175,7 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(0); @@ -213,10 +213,10 @@ public class SetAndSaveTest extends Base final ForeignKeySchemaData testData, final OIntegerPk oIntegerPk, final NonPkOIntegerFk newNonPkOIntegerFk) - throws TorqueException + throws TorqueException { List<NonPkOIntegerFk> cachedFks - = oIntegerPk.getNonPkOIntegerFks(); + = oIntegerPk.getNonPkOIntegerFks(); assertEquals(4, cachedFks.size()); assertEquals( testData.getNonPkOIntegerFkList().get(1).getId(), @@ -272,13 +272,13 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); CompIntegerVarcharPk compIntegerVarcharPk - = testData.getCompositeIntegerVarcharPkList().get(2); + = testData.getCompositeIntegerVarcharPkList().get(2); List<CompIntegerVarcharFk> fkList - = new ArrayList<CompIntegerVarcharFk>(); + = new ArrayList<>(); // object already associated to this object fkList.add(testData.getCompositeIntegerVarcharFkList().get(1)); // object already associated to another object @@ -287,16 +287,16 @@ public class SetAndSaveTest extends Base fkList.add(testData.getCompositeIntegerVarcharFkList().get(3)); // new object CompIntegerVarcharFk newCompIntegerVarcharFk - = new CompIntegerVarcharFk(); + = new CompIntegerVarcharFk(); newCompIntegerVarcharFk.setName("newCompositeIntegerVarcharFk"); fkList.add(newCompIntegerVarcharFk); CompIntegerVarcharPkPeer.setAndSaveCompIntegerVarcharFks( - compIntegerVarcharPk, - fkList); + compIntegerVarcharPk, + fkList); List<CompIntegerVarcharFk> cachedFks - = compIntegerVarcharPk.getCompIntegerVarcharFks(); + = compIntegerVarcharPk.getCompIntegerVarcharFks(); assertEquals(4, cachedFks.size()); assertEquals( testData.getCompositeIntegerVarcharFkList().get(1).getId(), @@ -364,11 +364,11 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(0); - List<CompPkOtherFk> fkList = new ArrayList<CompPkOtherFk>(); + List<CompPkOtherFk> fkList = new ArrayList<>(); // object already associated to this object fkList.add(testData.getCompositePkOtherFkList().get(0)); // object already associated to another object @@ -381,8 +381,8 @@ public class SetAndSaveTest extends Base fkList.add(newCompPkOtherFk); OIntegerPkPeer.setAndSaveCompPkOtherFks( - oIntegerPk, - fkList); + oIntegerPk, + fkList); List<CompPkOtherFk> cachedFks = oIntegerPk.getCompPkOtherFks(); assertEquals(3, cachedFks.size()); @@ -443,11 +443,11 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(0); - List<CompPkContainsFk> fkList = new ArrayList<CompPkContainsFk>(); + List<CompPkContainsFk> fkList = new ArrayList<>(); // object already associated to this object fkList.add(testData.getCompositePkContainsFkList().get(0)); // new object @@ -457,8 +457,8 @@ public class SetAndSaveTest extends Base fkList.add(newCompPkContainsFk); OIntegerPkPeer.setAndSaveCompPkContainsFks( - oIntegerPk, - fkList); + oIntegerPk, + fkList); List<CompPkContainsFk> cachedFks = oIntegerPk.getCompPkContainsFks(); assertEquals(2, cachedFks.size()); @@ -483,7 +483,7 @@ public class SetAndSaveTest extends Base // check database List<CompPkContainsFk> expectedInDb - = new ArrayList<CompPkContainsFk>(cachedFks); + = new ArrayList<>(cachedFks); expectedInDb.add(testData.getCompositePkContainsFkList().get(2)); ForeignKeySchemaData.assertCompositePkContainsFksInDatabaseEquals( expectedInDb); @@ -500,14 +500,14 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(2); - List<NullableOIntegerFk> fkList = new ArrayList<NullableOIntegerFk>(); + List<NullableOIntegerFk> fkList = new ArrayList<>(); // copy object already associated to this object NullableOIntegerFk alreadyAssociated - = testData.getNullableOIntegerFkList().get(1).copy(); + = testData.getNullableOIntegerFkList().get(1).copy(); // id does not get copied, set manually alreadyAssociated.setId( testData.getNullableOIntegerFkList().get(1).getId()); @@ -521,7 +521,7 @@ public class SetAndSaveTest extends Base fkList); List<NullableOIntegerFk> cachedFks - = oIntegerPk.getNullableOIntegerFks(); + = oIntegerPk.getNullableOIntegerFks(); assertEquals(1, cachedFks.size()); assertEquals( testData.getNullableOIntegerFkList().get(1).getId(), @@ -535,7 +535,7 @@ public class SetAndSaveTest extends Base // check database List<NullableOIntegerFk>expectedInDb - = new ArrayList<NullableOIntegerFk>(); + = new ArrayList<>(); expectedInDb.addAll(cachedFks); expectedInDb.add(testData.getNullableOIntegerFkList().get(0)); expectedInDb.add(testData.getNullableOIntegerFkList().get(3)); @@ -552,12 +552,12 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(2); oIntegerPk.setName("modified"); - List<NullableOIntegerFk> fkList = new ArrayList<NullableOIntegerFk>(); + List<NullableOIntegerFk> fkList = new ArrayList<>(); fkList.add(testData.getNullableOIntegerFkList().get(1)); OIntegerPkPeer.setAndSaveNullableOIntegerFks( @@ -566,7 +566,7 @@ public class SetAndSaveTest extends Base assertTrue(oIntegerPk.isModified()); OIntegerPk oIntegerPkFromDb - = OIntegerPkPeer.retrieveByPK(oIntegerPk.getId()); + = OIntegerPkPeer.retrieveByPK(oIntegerPk.getId()); assertEquals("oIntegerPk3", oIntegerPkFromDb.getName()); } @@ -580,25 +580,25 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); // we want to avoid fk errors in MultiRef testData.getMultiRefList().clear(); testData.save(); OIntegerPk oIntegerPk = testData.getOIntegerPkList().get(2); - List<NullableOIntegerFk> fkList = new ArrayList<NullableOIntegerFk>(); + List<NullableOIntegerFk> fkList = new ArrayList<>(); OIntegerPkPeer.setAndSaveNullableOIntegerFks( oIntegerPk, fkList); List<NullableOIntegerFk> cachedFks - = oIntegerPk.getNullableOIntegerFks(); + = oIntegerPk.getNullableOIntegerFks(); assertEquals(0, cachedFks.size()); // check database List<NullableOIntegerFk> dbFks - = testData.getNullableOIntegerFkList(); + = testData.getNullableOIntegerFkList(); // remove entries where oIntegerPk is referenced dbFks.remove(2); dbFks.remove(1); @@ -616,25 +616,25 @@ public class SetAndSaveTest extends Base { ForeignKeySchemaData.clearTablesInDatabase(); ForeignKeySchemaData testData - = ForeignKeySchemaData.getDefaultTestData(); + = ForeignKeySchemaData.getDefaultTestData(); testData.save(); CompIntegerVarcharPk compIntegerVarcharPk - = testData.getCompositeIntegerVarcharPkList().get(2); + = testData.getCompositeIntegerVarcharPkList().get(2); List<CompIntegerVarcharFk> fkList - = new ArrayList<CompIntegerVarcharFk>(); + = new ArrayList<>(); CompIntegerVarcharPkPeer.setAndSaveCompIntegerVarcharFks( compIntegerVarcharPk, fkList); List<CompIntegerVarcharFk> cachedFks - = compIntegerVarcharPk.getCompIntegerVarcharFks(); + = compIntegerVarcharPk.getCompIntegerVarcharFks(); assertEquals(0, cachedFks.size()); // check database List<CompIntegerVarcharFk> dbFks - = testData.getCompositeIntegerVarcharFkList(); + = testData.getCompositeIntegerVarcharFkList(); // remove entries where oIntegerPk is referenced dbFks.remove(2); dbFks.remove(1);
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java Mon Aug 27 09:48:33 2018 @@ -93,7 +93,7 @@ public class WhereClauseSubselectTest ex Criteria subquery = new Criteria(); subquery.addSelectColumn(AuthorPeer.AUTHOR_ID); - List<String> authorIds = new ArrayList<String>(); + List<String> authorIds = new ArrayList<>(); authorIds.add(author1.getName()); authorIds.add(author2.getName()); subquery.where(AuthorPeer.NAME, authorIds, Criteria.IN); @@ -206,7 +206,7 @@ public class WhereClauseSubselectTest ex Criteria subquery = new Criteria(); subquery.addSelectColumn(AuthorPeer.AUTHOR_ID); - List<String> nameList = new ArrayList<String>(); + List<String> nameList = new ArrayList<>(); nameList.add(author1.getName()); nameList.add(author2.getName()); subquery.where(AuthorPeer.NAME, nameList, Criteria.IN); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java Mon Aug 27 09:48:33 2018 @@ -45,9 +45,9 @@ public class DatabaseMapTest extends Bas public static final String PROTECTED_TABLE = "PROTECTED_COLUMNS"; public static final String[] COLUMN_NAMES = - { - "id", "one", "two", "three" - }; + { + "id", "one", "two", "three" + }; // Hack to store exception thrown by test in static initializer private static Throwable testDatabaseMapInitializeResult = null; @@ -79,14 +79,14 @@ public class DatabaseMapTest extends Bas TableMap tMap = map.getTable(TABLE_NAME1); assertTrue( "Did not expect to find NotUsedBeforeMapInit table before " + - "initialize!", - tMap == null); + "initialize!", + tMap == null); map.initialize(); tMap = map.getTable(TABLE_NAME1); assertTrue( "Did not find table named NotUsedBeforeMapInit after " + - "initialization!", - tMap != null); + "initialization!", + tMap != null); } /** @@ -131,7 +131,7 @@ public class DatabaseMapTest extends Bas + " did not preserve XML column order! Expected " + expected + " but found " + cName, cName.equals(expected) || - cName.equals(upperCaseExpected)); + cName.equals(upperCaseExpected)); } } @@ -153,13 +153,13 @@ public class DatabaseMapTest extends Bas TableMap[] tables = map.getTables(); assertEquals("XML Table order not preserved!\nDid not find table '" + TABLE_NAME1 + "' in DatabaseMap.getTables() array!", - TABLE_NAME1, - tables[0].getName()); + TABLE_NAME1, + tables[0].getName()); assertEquals("XML Table order not preserved!\nDid not find table '" + TABLE_NAME2 + "' after '" + TABLE_NAME1 + " in DatabaseMap.getTables() array!", - TABLE_NAME2, - tables[1].getName()); + TABLE_NAME2, + tables[1].getName()); } /** @@ -174,7 +174,7 @@ public class DatabaseMapTest extends Bas TableMap table = map.getTable("ext"); assertTrue("Did not find external schema table, 'ext'!", - table != null); + table != null); table = map.getTable("extext"); assertTrue("Did not find external schema table, 'extext'!", @@ -227,17 +227,17 @@ public class DatabaseMapTest extends Bas .getDescription()); assertTrue( - "Column isPrimaryKey attribute returned false instead of true!", - column.isPrimaryKey()); + "Column isPrimaryKey attribute returned false instead of true!", + column.isPrimaryKey()); assertTrue( - "Column isAutoIncrement attribute returned false instead of true!", - column.isAutoIncrement()); + "Column isAutoIncrement attribute returned false instead of true!", + column.isAutoIncrement()); assertTrue( - "Column isNotNull attribute returned false instead of true!", - column.isNotNull()); + "Column isNotNull attribute returned false instead of true!", + column.isNotNull()); assertTrue( - "Column isUsePrimitive attribute returned false instead of true!", - column.isUsePrimitive()); + "Column isUsePrimitive attribute returned false instead of true!", + column.isUsePrimitive()); assertTrue("Column type attribute was not Integer!", column.getType() instanceof Integer); @@ -247,8 +247,8 @@ public class DatabaseMapTest extends Bas column = table.getColumn("ONE"); } assertFalse( - "Column isProtected attribute returned true instead of false!", - column.isProtected()); + "Column isProtected attribute returned true instead of false!", + column.isProtected()); assertTrue("Column size != 50", column.getSize() == 50); validateAttribute("Column default", "unknown", column .getDefault()); @@ -259,7 +259,7 @@ public class DatabaseMapTest extends Bas column = table.getColumn("THREE"); } assertTrue("Column position attribute != 4", - column.getPosition() == 4); + column.getPosition() == 4); TableMap tableWithProtectedColumn = map.getTable(PROTECTED_TABLE); column = tableWithProtectedColumn.getColumn("id"); @@ -380,8 +380,8 @@ public class DatabaseMapTest extends Bas * @param name */ protected void validateAttribute(final String name, - final String expected, - final String result) + final String expected, + final String result) { assertTrue(name + " attribute not set correctly!\n Expected '" + expected + "' and got '" + result + "'", expected Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java Mon Aug 27 09:48:33 2018 @@ -59,180 +59,180 @@ public class OMByNameMethodsTest extends public static final String PROTECTED_COLUMN_NAME = "PayLoadB"; public static final String PROTECTED_COLUMN_PEER_NAME = - "INHERITANCE_TEST.PAYLOAD_B"; + "INHERITANCE_TEST.PAYLOAD_B"; public static final String PROTECTED_COLUMN_TABLE = "INHERITANCE_TEST"; public static final int PROTECTED_COLUMN_POSITION = 3; public static final Object[] OBJECT_TEST_VALUES = - { - new Boolean(true), // "OBit", - new Byte((byte) 1), // "OTinyint", - new Short((short) 1), // "OSmallint", - new Long((long) 1.0), // "OBigint", - new Double(1.0), // "OFloat", - new Float(1.0), // "OReal", - new BigDecimal(1.0), // "ONumeric", - new BigDecimal(1.0), // "ODecimal", - "OChar_TEST_VALUE", // "OChar", - "OVarchar_TEST_VALUE", // "OVarchar", - "OLongvarchar_TEST_VALUE", // "OLongvarchar", - new Date(1000000000l), // "ODate", - new Date(1000000000l), // "OTime", - new Integer(1), // "OInteger", - new Date(1000000000l), // "OTimestamp", - new byte[] - { - 1, 1, 1 - }, // "OBinary", - new byte[] - { - 1, 1, 1 - }, // "OVarbinary", - new byte[] - { - 1, 1, 1 - }, // "OLongvarbinary", - new byte[] - { - 1, 1, 1 - }, // "OBlob", - "OClob_TEST_VALUE", // "OClob", - new Boolean(true), // "OBooleanint", - new Boolean(true), // "OBooleanchar", - new Double(1.0) - // "ODouble" - }; + { + new Boolean(true), // "OBit", + new Byte((byte) 1), // "OTinyint", + new Short((short) 1), // "OSmallint", + new Long((long) 1.0), // "OBigint", + new Double(1.0), // "OFloat", + new Float(1.0), // "OReal", + new BigDecimal(1.0), // "ONumeric", + new BigDecimal(1.0), // "ODecimal", + "OChar_TEST_VALUE", // "OChar", + "OVarchar_TEST_VALUE", // "OVarchar", + "OLongvarchar_TEST_VALUE", // "OLongvarchar", + new Date(1000000000l), // "ODate", + new Date(1000000000l), // "OTime", + new Integer(1), // "OInteger", + new Date(1000000000l), // "OTimestamp", + new byte[] + { + 1, 1, 1 + }, // "OBinary", + new byte[] + { + 1, 1, 1 + }, // "OVarbinary", + new byte[] + { + 1, 1, 1 + }, // "OLongvarbinary", + new byte[] + { + 1, 1, 1 + }, // "OBlob", + "OClob_TEST_VALUE", // "OClob", + new Boolean(true), // "OBooleanint", + new Boolean(true), // "OBooleanchar", + new Double(1.0) + // "ODouble" + }; public static final String[] OBJECT_COLUMN_NAMES = - { - "OBit", "OTinyint", "OSmallint", "OBigint", "OFloat", "OReal", - "ONumeric", "ODecimal", "OChar", "OVarchar", "OLongvarchar", - "ODate", "OTime", "OInteger", "OTimestamp", "OBinary", - "OVarbinary", "OLongvarbinary", "OBlob", "OClob", "OBooleanint", - "OBooleanchar", "ODouble" - }; + { + "OBit", "OTinyint", "OSmallint", "OBigint", "OFloat", "OReal", + "ONumeric", "ODecimal", "OChar", "OVarchar", "OLongvarchar", + "ODate", "OTime", "OInteger", "OTimestamp", "OBinary", + "OVarbinary", "OLongvarbinary", "OBlob", "OClob", "OBooleanint", + "OBooleanchar", "ODouble" + }; public static final String[] PRIMITIVE_COLUMN_NAMES = - { - "PBit", // boolean - "PTinyint", // byte - "PSmallint", // short - "PBigint", // long - "PFloat", // double - "PReal", // float - "PNumeric", //BigDecimal - Skipped because same as Object - "PDecimal", //BigDecimal - Skipped because same as Object - "PChar", //String - Skipped because same as Object - "PVarchar", //String - Skipped because same as Object - "PLongvarchar", //String - Skipped because same as Object - "PDate", //Date - Skipped because same as Object - "PTime", //Date - Skipped because same as Object - "PInteger", // int - "PTimestamp", //Date - Skipped because same as Object - "PBinary", //byte[] - Skipped because same as Object - "PVarbinary", //byte[] - Skipped because same as Object - "PLongvarbinary", //byte[] - Skipped because same as Object - "PBlob", //byte[] - Skipped because same as Object - "PClob", //String - Skipped because same as Object - "PBooleanint", // boolean - "PBooleanchar", // boolean - "PDouble" // double - }; + { + "PBit", // boolean + "PTinyint", // byte + "PSmallint", // short + "PBigint", // long + "PFloat", // double + "PReal", // float + "PNumeric", //BigDecimal - Skipped because same as Object + "PDecimal", //BigDecimal - Skipped because same as Object + "PChar", //String - Skipped because same as Object + "PVarchar", //String - Skipped because same as Object + "PLongvarchar", //String - Skipped because same as Object + "PDate", //Date - Skipped because same as Object + "PTime", //Date - Skipped because same as Object + "PInteger", // int + "PTimestamp", //Date - Skipped because same as Object + "PBinary", //byte[] - Skipped because same as Object + "PVarbinary", //byte[] - Skipped because same as Object + "PLongvarbinary", //byte[] - Skipped because same as Object + "PBlob", //byte[] - Skipped because same as Object + "PClob", //String - Skipped because same as Object + "PBooleanint", // boolean + "PBooleanchar", // boolean + "PDouble" // double + }; public static final Object[] PRIMITIVE_TEST_VALUES = - { - new Boolean(true), // "PBit", - new Byte((byte) 1), // "PTinyint", - new Short((short) 1), // "PSmallint", - new Long((long) 1.0), // "PBigint", - new Double(1.0), // "PFloat", - new Float(1.0), // "PReal", - new BigDecimal(1.0), // "PNumeric", - new BigDecimal(1.0), // "PDecimal", - "OChar_TEST_VALUE", // "PChar", - "OVarchar_TEST_VALUE", // "PVarchar", - "OLongvarchar_TEST_VALUE", // "PLongvarchar", - new Date(1000000000l), // "PDate", - new Date(1000000000l), // "PTime", - new Integer(1), // "PInteger", - new Date(1000000000l), // "PTimestamp", - new byte[] - { - 1, 1, 1 - }, // "PBinary", - new byte[] - { - 1, 1, 1 - }, // "PVarbinary", - new byte[] - { - 1, 1, 1 - }, // "PLongvarbinary", - new byte[] - { - 1, 1, 1 - }, // "PBlob", - "OClob_TEST_VALUE", // "PClob", - new Boolean(true), // "PBooleanint", - new Boolean(true), // "PBooleanchar", - new Double(1.0) //" PDouble" - }; + { + new Boolean(true), // "PBit", + new Byte((byte) 1), // "PTinyint", + new Short((short) 1), // "PSmallint", + new Long((long) 1.0), // "PBigint", + new Double(1.0), // "PFloat", + new Float(1.0), // "PReal", + new BigDecimal(1.0), // "PNumeric", + new BigDecimal(1.0), // "PDecimal", + "OChar_TEST_VALUE", // "PChar", + "OVarchar_TEST_VALUE", // "PVarchar", + "OLongvarchar_TEST_VALUE", // "PLongvarchar", + new Date(1000000000l), // "PDate", + new Date(1000000000l), // "PTime", + new Integer(1), // "PInteger", + new Date(1000000000l), // "PTimestamp", + new byte[] + { + 1, 1, 1 + }, // "PBinary", + new byte[] + { + 1, 1, 1 + }, // "PVarbinary", + new byte[] + { + 1, 1, 1 + }, // "PLongvarbinary", + new byte[] + { + 1, 1, 1 + }, // "PBlob", + "OClob_TEST_VALUE", // "PClob", + new Boolean(true), // "PBooleanint", + new Boolean(true), // "PBooleanchar", + new Double(1.0) //" PDouble" + }; public static final Column[] OBJECT_PEER_NAMES = - { - TypesObjectPeer.O_BIT, - TypesObjectPeer.O_TINYINT, - TypesObjectPeer.O_SMALLINT, - TypesObjectPeer.O_BIGINT, - TypesObjectPeer.O_FLOAT, - TypesObjectPeer.O_REAL, - TypesObjectPeer.O_NUMERIC, - TypesObjectPeer.O_DECIMAL, - TypesObjectPeer.O_CHAR, - TypesObjectPeer.O_VARCHAR, - TypesObjectPeer.O_LONGVARCHAR, - TypesObjectPeer.O_DATE, - TypesObjectPeer.O_TIME, - TypesObjectPeer.O_INTEGER, - TypesObjectPeer.O_TIMESTAMP, - TypesObjectPeer.O_BINARY, - TypesObjectPeer.O_VARBINARY, - TypesObjectPeer.O_LONGVARBINARY, - TypesObjectPeer.O_BLOB, - TypesObjectPeer.O_CLOB, - TypesObjectPeer.O_BOOLEANINT, - TypesObjectPeer.O_BOOLEANCHAR, - TypesObjectPeer.O_DOUBLE - }; + { + TypesObjectPeer.O_BIT, + TypesObjectPeer.O_TINYINT, + TypesObjectPeer.O_SMALLINT, + TypesObjectPeer.O_BIGINT, + TypesObjectPeer.O_FLOAT, + TypesObjectPeer.O_REAL, + TypesObjectPeer.O_NUMERIC, + TypesObjectPeer.O_DECIMAL, + TypesObjectPeer.O_CHAR, + TypesObjectPeer.O_VARCHAR, + TypesObjectPeer.O_LONGVARCHAR, + TypesObjectPeer.O_DATE, + TypesObjectPeer.O_TIME, + TypesObjectPeer.O_INTEGER, + TypesObjectPeer.O_TIMESTAMP, + TypesObjectPeer.O_BINARY, + TypesObjectPeer.O_VARBINARY, + TypesObjectPeer.O_LONGVARBINARY, + TypesObjectPeer.O_BLOB, + TypesObjectPeer.O_CLOB, + TypesObjectPeer.O_BOOLEANINT, + TypesObjectPeer.O_BOOLEANCHAR, + TypesObjectPeer.O_DOUBLE + }; public static final ColumnMap[] PRIMITIVE_PEER_NAMES = - { - TypesPrimitivePeer.P_BIT, - TypesPrimitivePeer.P_TINYINT, - TypesPrimitivePeer.P_SMALLINT, - TypesPrimitivePeer.P_BIGINT, - TypesPrimitivePeer.P_FLOAT, - TypesPrimitivePeer.P_REAL, - TypesPrimitivePeer.P_NUMERIC, - TypesPrimitivePeer.P_DECIMAL, - TypesPrimitivePeer.P_CHAR, - TypesPrimitivePeer.P_VARCHAR, - TypesPrimitivePeer.P_LONGVARCHAR, - TypesPrimitivePeer.P_DATE, - TypesPrimitivePeer.P_TIME, - TypesPrimitivePeer.P_INTEGER, - TypesPrimitivePeer.P_TIMESTAMP, - TypesPrimitivePeer.P_BINARY, - TypesPrimitivePeer.P_VARBINARY, - TypesPrimitivePeer.P_LONGVARBINARY, - TypesPrimitivePeer.P_BLOB, - TypesPrimitivePeer.P_CLOB, - TypesPrimitivePeer.P_BOOLEANINT, - TypesPrimitivePeer.P_BOOLEANCHAR, - TypesPrimitivePeer.P_DOUBLE - }; + { + TypesPrimitivePeer.P_BIT, + TypesPrimitivePeer.P_TINYINT, + TypesPrimitivePeer.P_SMALLINT, + TypesPrimitivePeer.P_BIGINT, + TypesPrimitivePeer.P_FLOAT, + TypesPrimitivePeer.P_REAL, + TypesPrimitivePeer.P_NUMERIC, + TypesPrimitivePeer.P_DECIMAL, + TypesPrimitivePeer.P_CHAR, + TypesPrimitivePeer.P_VARCHAR, + TypesPrimitivePeer.P_LONGVARCHAR, + TypesPrimitivePeer.P_DATE, + TypesPrimitivePeer.P_TIME, + TypesPrimitivePeer.P_INTEGER, + TypesPrimitivePeer.P_TIMESTAMP, + TypesPrimitivePeer.P_BINARY, + TypesPrimitivePeer.P_VARBINARY, + TypesPrimitivePeer.P_LONGVARBINARY, + TypesPrimitivePeer.P_BLOB, + TypesPrimitivePeer.P_CLOB, + TypesPrimitivePeer.P_BOOLEANINT, + TypesPrimitivePeer.P_BOOLEANCHAR, + TypesPrimitivePeer.P_DOUBLE + }; /* * Validate that the setByName methods work using a BaseObject class type. @@ -257,9 +257,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesObject) objectTypes); // Test Primitive Types @@ -277,9 +277,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesPrimitive) primitiveTypes); } @@ -306,9 +306,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } String eMsg = "Did not get expected value for object column: "; for (int i = 0; i < OBJECT_COLUMN_NAMES.length; i++) @@ -330,15 +330,15 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } for (int i = 0; i < PRIMITIVE_COLUMN_NAMES.length; i++) { assertTrue(eMsg + PRIMITIVE_COLUMN_NAMES[i], - PRIMITIVE_TEST_VALUES[i].equals( - primitiveTypes.getByName(PRIMITIVE_COLUMN_NAMES[i]))); + PRIMITIVE_TEST_VALUES[i].equals( + primitiveTypes.getByName(PRIMITIVE_COLUMN_NAMES[i]))); } } @@ -365,9 +365,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesObject) objectTypes); @@ -387,9 +387,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesPrimitive) primitiveTypes); } @@ -417,9 +417,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesObject) objectTypes); @@ -439,9 +439,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesPrimitive) primitiveTypes); } @@ -466,9 +466,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } String eMsg = "Did not get expected value for object column: "; for (int i = 0; i < OBJECT_PEER_NAMES.length; i++) @@ -492,16 +492,16 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } for (int i = 0; i < PRIMITIVE_PEER_NAMES.length; i++) { assertEquals(eMsg + PRIMITIVE_PEER_NAMES[i], - PRIMITIVE_TEST_VALUES[i], - primitiveTypes.getByPeerName( - PRIMITIVE_PEER_NAMES[i].getSqlExpression())); + PRIMITIVE_TEST_VALUES[i], + primitiveTypes.getByPeerName( + PRIMITIVE_PEER_NAMES[i].getSqlExpression())); } } @@ -525,9 +525,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } String eMsg = "Did not get expected value for object column: "; for (int i = 0; i < OBJECT_PEER_NAMES.length; i++) @@ -551,16 +551,16 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } for (int i = 0; i < PRIMITIVE_PEER_NAMES.length; i++) { assertEquals(eMsg + PRIMITIVE_PEER_NAMES[i], - PRIMITIVE_TEST_VALUES[i], - primitiveTypes.getByPeerName( - PRIMITIVE_PEER_NAMES[i].getColumnName())); + PRIMITIVE_TEST_VALUES[i], + primitiveTypes.getByPeerName( + PRIMITIVE_PEER_NAMES[i].getColumnName())); } } @@ -580,15 +580,15 @@ public class OMByNameMethodsTest extends boolean status = objectTypes.setByPosition(i + 1, OBJECT_TEST_VALUES[i]); assertTrue("objectTypes.setByPosition(int, Object ) returned " - + "false setting position " + (i + 1), status); + + "false setting position " + (i + 1), status); } } catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesObject) objectTypes); @@ -601,15 +601,15 @@ public class OMByNameMethodsTest extends boolean status = primitiveTypes.setByPosition(i + 1, OBJECT_TEST_VALUES[i]); assertTrue("primitiveTypes.setByPosition(int, Object) returned " - + "false setting position " + (i + 1), status); + + "false setting position " + (i + 1), status); } } catch (TorqueException e) { fail("Exception caught trying to call TypesPrimitive.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } assertValues((TypesPrimitive) primitiveTypes); } @@ -634,16 +634,16 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } String eMsg = "Did not get expected value for object column: "; for (int i = 0; i < OBJECT_PEER_NAMES.length; i++) { assertEquals(eMsg + (i + 1) + " (" + OBJECT_PEER_NAMES[i] + ")", OBJECT_TEST_VALUES[i], - objectTypes.getByPosition(i + 1)); + objectTypes.getByPosition(i + 1)); } // Test Primative Types @@ -659,9 +659,9 @@ public class OMByNameMethodsTest extends catch (TorqueException e) { fail("Exception caught trying to call TypesObject.setByName() " - + "method!\nWas OM generated with torque.addGetByNameMethod " - + "property = true?\nError message was: '" + e.getMessage() - + "'"); + + "method!\nWas OM generated with torque.addGetByNameMethod " + + "property = true?\nError message was: '" + e.getMessage() + + "'"); } for (int i = 0; i < PRIMITIVE_PEER_NAMES.length; i++) { @@ -716,15 +716,15 @@ public class OMByNameMethodsTest extends // Test that false status is returned for invalid column names. boolean status = objectTypes.setByName("xxxOBit", new Integer(1)); assertFalse("Did not get a false status from setByName with " - + "invalid column name!", status); + + "invalid column name!", status); status = objectTypes.setByPeerName("xxxOBit", new Integer(1)); assertFalse("Did not get a false status from setByPeerName with " - + "invalid column name!", status); + + "invalid column name!", status); status = objectTypes.setByPosition(1000, new Integer(1)); assertFalse("Did not get a false status from setByPosition with " - + "invalid position!", status); + + "invalid position!", status); } /** @@ -745,9 +745,9 @@ public class OMByNameMethodsTest extends error = true; } assertFalse("objectTypes.setByName(\"OBit\",null) did not allow " - + "a null value!", error); + + "a null value!", error); - // Primitive types should not allow null values + // Primitive types should not allow null values error = false; try { @@ -758,7 +758,7 @@ public class OMByNameMethodsTest extends error = true; } assertTrue("primitiveTypes.setByName(\"PBit\",null) allowed " - + "a null value!", error); + + "a null value!", error); } /** Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/DatabaseTools.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/DatabaseTools.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/DatabaseTools.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/sql/DatabaseTools.java Mon Aug 27 09:48:33 2018 @@ -43,7 +43,7 @@ public class DatabaseTools DatabaseMetaData metadata = connection.getMetaData(); ResultSet tableResultSet = metadata.getTables( null, null, "%", new String[] {"TABLE"}); - Set<String> result = new HashSet<String>(); + Set<String> result = new HashSet<>(); while (tableResultSet.next()) { String tableName = tableResultSet.getString(3); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java Mon Aug 27 09:48:33 2018 @@ -27,9 +27,9 @@ import org.apache.torque.test.dbobject.I * with classnames stored in the inheritance column. */ public class InheritanceClassnameTestChild1 - extends InheritanceClassnameTest - implements Persistent +extends InheritanceClassnameTest +implements Persistent { - /** Serial version */ - private static final long serialVersionUID = 1309723149218L; + /** Serial version */ + private static final long serialVersionUID = 1309723149218L; } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java Mon Aug 27 09:48:33 2018 @@ -28,8 +28,8 @@ import org.apache.torque.test.dbobject.I * with classnames stored in the inheritance column. */ public class InheritanceClassnameTestChild2 - extends InheritanceClassnameTest - implements Persistent +extends InheritanceClassnameTest +implements Persistent { /** Serial version */ private static final long serialVersionUID = 1309723149218L; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java Mon Aug 27 09:48:33 2018 @@ -46,7 +46,7 @@ public class BasePeerTest extends BaseDa criteria.where(BookPeer.TITLE, "Book 1 - Author 1"); // execute - BasePeerImpl<?> basePeerImpl = new BasePeerImpl<Object>(); + BasePeerImpl<?> basePeerImpl = new BasePeerImpl<>(); int deleted = basePeerImpl.doDelete(criteria); // verify @@ -65,17 +65,17 @@ public class BasePeerTest extends BaseDa String statement = "DELETE FROM " + BookPeer.TABLE_NAME + " WHERE " + BookPeer.BOOK_ID + "=?" + " AND "+ BookPeer.AUTHOR_ID + "=?"; - List<JdbcTypedValue> replacements = new ArrayList<JdbcTypedValue>(); + List<JdbcTypedValue> replacements = new ArrayList<>(); replacements.add(new JdbcTypedValue( authors.get(2).getBooks().get(4).getBookId(), Types.INTEGER)); replacements.add( - new JdbcTypedValue( - authors.get(2).getAuthorId(), - Types.INTEGER)); + new JdbcTypedValue( + authors.get(2).getAuthorId(), + Types.INTEGER)); // execute - BasePeerImpl<?> basePeerImpl = new BasePeerImpl<Object>(); + BasePeerImpl<?> basePeerImpl = new BasePeerImpl<>(); int deleted = basePeerImpl.executeStatement(statement, replacements); // verify Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java Mon Aug 27 09:48:33 2018 @@ -159,7 +159,7 @@ public class ExceptionMapperTest extends public void testTransactionDeadlock() throws Exception { Adapter adapter - = Torque.getDatabase(Torque.getDefaultDB()).getAdapter(); + = Torque.getDatabase(Torque.getDefaultDB()).getAdapter(); if (adapter instanceof HsqldbAdapter) { log.warn("hsqldb (2.2.6) fails to detect the deadlock in this test" @@ -197,10 +197,10 @@ public class ExceptionMapperTest extends // lock author 2 in transaction 1 (must wait for lock) author2.setName("newer Author2"); SaveAndRollbackThread saveThreadTransaction1 - = new SaveAndRollbackThread( - author2, - transaction1, - "saveThreadAuthor2Con1"); + = new SaveAndRollbackThread( + author2, + transaction1, + "saveThreadAuthor2Con1"); saveThreadTransaction1.start(); long startTime = System.currentTimeMillis(); @@ -217,10 +217,10 @@ public class ExceptionMapperTest extends // Try to lock author1 in transaction 2 (deadlock) author1.setName("newer Author1"); SaveAndRollbackThread saveThreadTransaction2 - = new SaveAndRollbackThread( - author1, - transaction2, - "saveThreadAuthor1Con2"); + = new SaveAndRollbackThread( + author1, + transaction2, + "saveThreadAuthor1Con2"); saveThreadTransaction2.start(); startTime = System.currentTimeMillis(); @@ -313,7 +313,7 @@ public class ExceptionMapperTest extends catch (TorqueException e) { log.debug(getName() + "caught exception " - + e.getClass().getName()); + + e.getClass().getName()); caughtException = e; } finally Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java Mon Aug 27 09:48:33 2018 @@ -46,13 +46,13 @@ public class SummaryHelperTest extends B static Log logger = LogFactory.getLog( SummaryHelperTest.class ); private static final String[] TEST_GROUPBY1 = { - "A1","B1","C1","D1" + "A1","B1","C1","D1" }; private static final int[] TEST_GROUPBY1_TYPE = { - 1, 2, 1, 2 + 1, 2, 1, 2 }; private static final String[] TEST_GROUPBY2 = { - "A2","B2","C2","D2" + "A2","B2","C2","D2" }; @Override @@ -82,7 +82,7 @@ public class SummaryHelperTest extends B * Test a simple single table with group bys */ public void testSummarize() - throws Exception + throws Exception { Criteria c = new Criteria(); @@ -91,7 +91,7 @@ public class SummaryHelperTest extends B SummaryHelper summary = new SummaryHelper(); summary.setExcludeExprColumns(true); - List<Class<?>> returnTypes = new ArrayList<Class<?>>(); + List<Class<?>> returnTypes = new ArrayList<>(); summary.addGroupBy ( Summarize1Peer.GROUP_BY1 ); returnTypes.add(String.class); @@ -132,7 +132,7 @@ public class SummaryHelperTest extends B assertTrue("No results returned", results.size() > 0 ); assertTrue("Invalid number of records returned. Expected 4 but got " + - results.size(), results.size() == 4 ); + results.size(), results.size() == 4 ); ListOrderedMapCI<Object> rec = results.get(0); @@ -174,7 +174,7 @@ public class SummaryHelperTest extends B SummaryHelper summary = new SummaryHelper(); summary.setExcludeExprColumns(true); - List<Class<?>> returnTypes = new ArrayList<Class<?>>(); + List<Class<?>> returnTypes = new ArrayList<>(); summary.addAggregate("COUNT_RECS", new Count(Summarize1Peer.ID)); returnTypes.add(Integer.class); @@ -212,12 +212,12 @@ public class SummaryHelperTest extends B assertTrue("No results returned", results.size() > 0 ); assertTrue("Invalid number of records returned. Expected 1 but got " + - results.size(), results.size() == 1 ); + results.size(), results.size() == 1 ); ListOrderedMapCI<Object> rec = results.get(0); assertTrue( "Number of columns incorrect! Did ExcludeExpColumns work? " + - "Expected 9 but got " + rec.size(), rec.size() == 9 ); + "Expected 9 but got " + rec.size(), rec.size() == 9 ); assertTrue("COUNT_RECS not correct value", ((Integer) rec.get("COUNT_RECS")).intValue() == 16 ); assertTrue("AVG_INT1 not correct value", @@ -249,7 +249,7 @@ public class SummaryHelperTest extends B SummaryHelper summary = new SummaryHelper(); summary.setExcludeExprColumns(true); - List<Class<?>> returnTypes = new ArrayList<Class<?>>(); + List<Class<?>> returnTypes = new ArrayList<>(); summary.addAggregate("COUNT_RECS", new Count(Summarize1Peer.ID)); returnTypes.add(Integer.class); @@ -287,7 +287,7 @@ public class SummaryHelperTest extends B assertTrue("No results returned", results.size() > 0 ); assertTrue("Invalid number of records returned. Expected 1 but got " + - results.size(), results.size() == 1 ); + results.size(), results.size() == 1 ); ListOrderedMapCI<Object> rec = results.get(0); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/TorqueConnectionImplTest.java Mon Aug 27 09:48:33 2018 @@ -43,17 +43,17 @@ public class TorqueConnectionImplTest ex try(TorqueConnection con = Transaction.begin()) { - BookPeer.doSelect(new Criteria(), con); - Transaction.commit(con); + BookPeer.doSelect(new Criteria(), con); + Transaction.commit(con); - @SuppressWarnings("resource") + @SuppressWarnings("resource") TorqueConnectionImpl conImpl = (TorqueConnectionImpl)con; assertTrue(conImpl.isCommitted()); - } + } catch (TorqueException e) { - // expected - } + // expected + } Author author = new Author(); author.setName("AuthorProxy"); @@ -65,8 +65,8 @@ public class TorqueConnectionImplTest ex } catch (TorqueException e) { - // expected - } + // expected + } Criteria criteria = new Criteria(); criteria.where(AuthorPeer.NAME, "AuthorProxy"); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org