jdk-sandbox: comparison jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java

equal deleted inserted replaced

-:ffb869e392cf
+:f9ad1aadf3fa
 throw new RuntimeException(ioe);
 }
 // set the Reader, this maybe overridden latter
 provider =
-(SyncProvider)SyncFactory.getInstance(DEFAULT_SYNC_PROVIDER);
+SyncFactory.getInstance(DEFAULT_SYNC_PROVIDER);
 if (!(provider instanceof RIOptimisticProvider)) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.invalidp").toString());
 }
 * and <code>SyncProvider</code> specificiations later in this document.
 * <p>
 * @param env a <code>Hashtable</code> object with a list of desired
 *        synchronization providers
 * @throws SQLException if the requested provider cannot be found by the
-* synchonization factory
+* synchronization factory
 * @see SyncProvider
 */
+public CachedRowSetImpl(@SuppressWarnings("rawtypes") Hashtable env) throws SQLException {
-public CachedRowSetImpl(Hashtable env) throws SQLException {
 try {
 resBundle = JdbcRowSetResourceBundle.getJdbcRowSetResourceBundle();
 } catch(IOException ioe) {
 String providerName = (String)env.get(
 javax.sql.rowset.spi.SyncFactory.ROWSET_SYNC_PROVIDER);
 // set the Reader, this maybe overridden latter
 provider =
-(SyncProvider)SyncFactory.getInstance(providerName);
+SyncFactory.getInstance(providerName);
 rowSetReader = provider.getRowSetReader();
 rowSetWriter = provider.getRowSetWriter();
 initParams(); // allocate the parameters collection
 //Instantiating the vector for MatchColumns
 iMatchColumns = new Vector<Integer>(10);
 for(int i = 0; i < 10 ; i++) {
-iMatchColumns.add(i,Integer.valueOf(-1));
+iMatchColumns.add(i, -1);
 }
 strMatchColumns = new Vector<String>(10);
 for(int j = 0; j < 10; j++) {
 strMatchColumns.add(j,null);
 * Determine whether the SyncProvider's writer implements the
 * <code>TransactionalWriter<code> interface
 */
 private void checkTransactionalWriter() {
 if (rowSetWriter != null) {
-Class c = rowSetWriter.getClass();
+Class<?> c = rowSetWriter.getClass();
 if (c != null) {
 Class[] theInterfaces = c.getInterfaces();
 for (int i = 0; i < theInterfaces.length; i++) {
 if ((theInterfaces[i].getName()).indexOf("TransactionalWriter") > 0) {
 tXWriter = true;
 obj = new SerialArray((java.sql.Array)obj, map);
 else
 obj = new SerialArray((java.sql.Array)obj);
 }
-((Row)currentRow).initColumnObject(i, obj);
+currentRow.initColumnObject(i, obj);
 }
 rowsFetched++;
 rvh.add(currentRow);
 }
 saveCursorPos = cursorPos;
 conflict = rowSetWriter.writeData((RowSetInternal)this);
 cursorPos = saveCursorPos;
 }
-if ((tXWriter) && this.COMMIT_ON_ACCEPT_CHANGES) {
+if (tXWriter) {
 // do commit/rollback's here
 if (!conflict) {
 tWriter = (TransactionalWriter)rowSetWriter;
 tWriter.rollback();
 success = false;
 }
 }
 if (success == true) {
 setOriginal();
-} else if (!(success) && !(this.COMMIT_ON_ACCEPT_CHANGES)) {
+} else if (!(success) ) {
 throw new SyncProviderException(resBundle.handleGetObject("cachedrowsetimpl.accfailed").toString());
 }
 } catch (SyncProviderException spe) {
 throw spe;
 * @see javax.sql.RowSetWriter
 * @see javax.sql.rowset.spi.SyncFactory
 * @see javax.sql.rowset.spi.SyncProvider
 */
 public void acceptChanges(Connection con) throws SyncProviderException{
 setConnection(con);
 acceptChanges();
 }
 /**
 * Restores this <code>CachedRowSetImpl</code> object to its original state,
 * that is, its state before the last set of changes.
 *           state to the definied original value.
 * @see javax.sql.RowSetListener#rowSetChanged
 */
 public void restoreOriginal() throws SQLException {
 Row currentRow;
-for (Iterator i = rvh.iterator(); i.hasNext();) {
+for (Iterator<?> i = rvh.iterator(); i.hasNext();) {
 currentRow = (Row)i.next();
 if (currentRow.getInserted() == true) {
 i.remove();
 --numRows;
 } else {
 public Collection<?> toCollection() throws SQLException {
 TreeMap<Integer, Object> tMap = new TreeMap<>();
 for (int i = 0; i<numRows; i++) {
-tMap.put(Integer.valueOf(i), rvh.get(i));
+tMap.put(i, rvh.get(i));
 }
 return (tMap.values());
 }
 * @throws SQLException if an error occurs while resetting the
 *          <code>SyncProvider</code>.
 */
 public void setSyncProvider(String providerStr) throws SQLException {
 provider =
-(SyncProvider)SyncFactory.getInstance(providerStr);
+SyncFactory.getInstance(providerStr);
 rowSetReader = provider.getRowSetReader();
 rowSetWriter = provider.getRowSetWriter();
 }
 value = getCurrentRow().getColumnObject(columnIndex);
 // check for SQL NULL
 if (value == null) {
 setLastValueNull(true);
-return (int)0;
+return 0;
 }
 try {
 return ((Integer.valueOf(value.toString().trim())).intValue());
 } catch (NumberFormatException ex) {
 }
 } catch (java.io.UnsupportedEncodingException ex) {
 throw new SQLException(ex.getMessage());
 }
-return (java.io.InputStream)asciiStream;
+return asciiStream;
 }
 /**
 * A column value can be retrieved as a stream of Unicode characters
 * and then read in chunks from the stream.  This method is particularly
 return null;
 }
 unicodeStream = new StringBufferInputStream(value.toString());
-return (java.io.InputStream)unicodeStream;
+return unicodeStream;
 }
 /**
 * Retrieves the value of the designated column in the current row of this
 * <code>CachedRowSetImpl</code> object as a <code>java.io.InputStream</code>
 return null;
 }
 binaryStream = new ByteArrayInputStream((byte[])value);
-return (java.io.InputStream)binaryStream;
+return binaryStream;
 }
 // Methods for accessing results by column name
 }
 if (value instanceof Struct) {
 Struct s = (Struct)value;
 map = getTypeMap();
 // look up the class in the map
-Class c = (Class)map.get(s.getSQLTypeName());
+Class<?> c = map.get(s.getSQLTypeName());
 if (c != null) {
 // create new instance of the class
 SQLData obj = null;
 try {
 obj = (SQLData)c.newInstance();
 charStream = new StringReader(value.toString());
 } else {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.dtypemismt").toString());
 }
-return (java.io.Reader)charStream;
+return charStream;
 }
 /**
 * Retrieves the value stored in the designated column
 * of the current row as a <code>java.io.Reader</code> object.
 try {
 switch (trgType) {
 case java.sql.Types.BIT:
 Integer i = Integer.valueOf(srcObj.toString().trim());
-return i.equals(Integer.valueOf((int)0)) ?
+return i.equals(0) ?
 Boolean.valueOf(false) :
 Boolean.valueOf(true);
 case java.sql.Types.TINYINT:
 return Byte.valueOf(srcObj.toString().trim());
 case java.sql.Types.SMALLINT:
 try {
 switch (trgType) {
 case java.sql.Types.BIT:
 Integer i = Integer.valueOf(srcObj.toString().trim());
-return i.equals(Integer.valueOf((int)0)) ?
+return i.equals(0) ?
 Boolean.valueOf(false) :
 Boolean.valueOf(true);
 case java.sql.Types.BOOLEAN:
 return Boolean.valueOf(srcObj.toString().trim());
 default:
 public void updateInt(int columnIndex, int x) throws SQLException {
 // sanity check.
 checkIndex(columnIndex);
 // make sure the cursor is on a valid row
 checkCursor();
-Object obj = convertNumeric(Integer.valueOf(x),
+Object obj = convertNumeric(x,
 java.sql.Types.INTEGER,
 RowSetMD.getColumnType(columnIndex));
 getCurrentRow().setColumnObject(columnIndex, obj);
 }
 }
 if (value instanceof Struct) {
 Struct s = (Struct)value;
 // look up the class in the map
-Class c = (Class)map.get(s.getSQLTypeName());
+Class<?> c = map.get(s.getSQLTypeName());
 if (c != null) {
 // create new instance of the class
 SQLData obj = null;
 try {
 obj = (SQLData)c.newInstance();
 //crs.setReader(null);
 //crs.setWriter(null);
 int colCount = RowSetMD.getColumnCount();
 Row orig;
-for (Iterator i = rvh.iterator(); i.hasNext();) {
+for (Iterator<?> i = rvh.iterator(); i.hasNext();) {
 orig = new Row(colCount, ((Row)i.next()).getOrigRow());
 crs.rvh.add(orig);
 }
 return (ResultSet)crs;
 }
 * Calls to the method <code>setOriginal</code> connot be reversed.
 *
 * @throws SQLException if an error occurs
 */
 public void setOriginal() throws SQLException {
-for (Iterator i = rvh.iterator(); i.hasNext();) {
+for (Iterator<?> i = rvh.iterator(); i.hasNext();) {
 Row row = (Row)i.next();
 makeRowOriginal(row);
 // remove deleted rows from the collection.
 if (row.getDeleted() == true) {
 i.remove();
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.matchcols").toString());
 }
 }
 for( int i = 0;i < columnIdxes.length ;i++) {
-iMatchColumns.set(i,Integer.valueOf(-1));
+iMatchColumns.set(i, -1);
 }
 }
 /**
 * Unsets the designated parameter to the given String array.
 Integer []int_temp = new Integer[iMatchColumns.size()];
 int [] i_temp = new int[iMatchColumns.size()];
 int i_val;
-i_val = ((Integer)iMatchColumns.get(0)).intValue();
+i_val = iMatchColumns.get(0);
 if( i_val == -1 ) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.setmatchcols").toString());
 }
 if( columnIdxes[j] < 0 ) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.matchcols1").toString());
 }
 }
 for(int i = 0 ;i < columnIdxes.length; i++) {
-iMatchColumns.add(i,Integer.valueOf(columnIdxes[i]));
+iMatchColumns.add(i,columnIdxes[i]);
 }
 }
 /**
 * Sets the designated parameter to the given String array.
 // validate, if col is ok to be set
 if(columnIdx < 0) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.matchcols1").toString());
 } else {
 // set iMatchColumn
-iMatchColumns.set(0, Integer.valueOf(columnIdx));
+iMatchColumns.set(0, columnIdx);
 //strMatchColumn = null;
 }
 }
 /**
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch").toString());
 } else if(strMatchColumns.get(0) != null) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch1").toString());
 } else {
 // that is, we are unsetting it.
-iMatchColumns.set(0, Integer.valueOf(-1));
+iMatchColumns.set(0, -1);
 }
 }
 /**
 * Unsets the designated parameter to the given <code>String</code>
 // check if we are unsetting the same column
 columnName = columnName.trim();
 if(!((strMatchColumns.get(0)).equals(columnName))) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch").toString());
-} else if( ((Integer)(iMatchColumns.get(0))).intValue() > 0) {
+} else if(iMatchColumns.get(0) > 0) {
 throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.unsetmatch2").toString());
 } else {
 strMatchColumns.set(0, null);   // that is, we are unsetting it.
 }
 }
 obj = new SerialClob((Clob)obj);
 } else if (obj instanceof java.sql.Array) {
 obj = new SerialArray((java.sql.Array)obj, map);
 }
-((Row)currentRow).initColumnObject(i, obj);
+currentRow.initColumnObject(i, obj);
 }
 rowsFetched++;
 maxRowsreached++;
 rvh.add(currentRow);
 }

changeset 11129	f9ad1aadf3fa
parent 9537	bfddc73b74b9
child 11683	5e02efd89af6