db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1742858 [3/3] - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/jdbc/ demo/ demo/nserverdemo/ drda/org/apache/derby/drda/ drda/org/apache/derby/impl/drda/ engine/org/apache/derby/diag/ engine/org/apache/d...
Date Mon, 09 May 2016 00:58:24 GMT
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java Mon
May  9 00:58:22 2016
@@ -444,8 +444,8 @@ public class Heap
 
                 throw(StandardException.newException(
                         SQLState.HEAP_TEMPLATE_MISMATCH,
-                        new Long(column_id), 
-                        new Long(this.format_ids.length)));
+                        column_id, 
+                        this.format_ids.length));
             }
 
             // create a new array, and copy old values to it.
@@ -718,7 +718,7 @@ public class Heap
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(id.getContainerId()).toString());
+                    Long.toString(id.getContainerId()));
         }
 
 		HeapController heapcontroller = new HeapController();
@@ -794,7 +794,7 @@ public class Heap
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(container_key.getContainerId()).toString());
+                    Long.toString(container_key.getContainerId()));
         }
 
 		HeapController heapcontroller = new HeapController();
@@ -865,7 +865,7 @@ public class Heap
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(id.getContainerId()));
+                    id.getContainerId());
         }
 
 		HeapScan heapscan = new HeapScan();
@@ -914,7 +914,7 @@ public class Heap
             {
                 throw StandardException.newException(
                         SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                        new Long(id.getContainerId()));
+                        id.getContainerId());
             }
 
             // perform all the "real" work in a non-readonly nested user 
@@ -949,7 +949,7 @@ public class Heap
             {
                 throw StandardException.newException(
                         SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                        new Long(id.getContainerId()).toString());
+                        Long.toString(id.getContainerId()));
             }
 
             heapcontroller = new HeapController();
@@ -1042,7 +1042,7 @@ public class Heap
             {
                 throw StandardException.newException(
                         SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                        new Long(id.getContainerId()));
+                        id.getContainerId());
             }
 
             heapcontroller = new HeapController();
@@ -1097,7 +1097,7 @@ public class Heap
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(id.getContainerId()));
+                    id.getContainerId());
         }
 
 		HeapCompressScan heap_compress_scan = new HeapCompressScan();
@@ -1154,7 +1154,7 @@ public class Heap
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(id.getContainerId()));
+                    id.getContainerId());
         }
 
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
Mon May  9 00:58:22 2016
@@ -260,7 +260,7 @@ public class HeapConglomerateFactory imp
             {
                 throw StandardException.newException(
                     SQLState.STORE_CONGLOMERATE_DOES_NOT_EXIST,
-                    new Long(container_key.getContainerId()));
+                    container_key.getContainerId());
             }
 
             // row in slot 0 of heap page 1 which is just a single column with

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
Mon May  9 00:58:22 2016
@@ -236,8 +236,8 @@ public class HeapController
             {
                 throw(StandardException.newException(
                         SQLState.HEAP_TEMPLATE_MISMATCH,
-                        new Long(invalidColumn), 
-                        new Long(heap.format_ids.length)));
+                        invalidColumn, 
+                        heap.format_ids.length));
             }
         }
 
@@ -365,7 +365,7 @@ public class HeapController
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(heap.getId().getContainerId()));
+                    heap.getId().getContainerId());
         }
 
         this.init(open_conglom);
@@ -413,8 +413,8 @@ public class HeapController
                     {
                         throw(StandardException.newException(
                                 SQLState.HEAP_TEMPLATE_MISMATCH,
-                                new Long(invalidColumn), 
-                                new Long(heap.format_ids.length)));
+                                invalidColumn, 
+                                heap.format_ids.length));
                     }
                 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
Mon May  9 00:58:22 2016
@@ -189,14 +189,14 @@ final class MergeInserter implements Sor
 			long conglomid = sort.createMergeRun(tran, sortBuffer);
 			if (mergeRuns == null)
 				mergeRuns = new Vector<Long>();
-			mergeRuns.addElement(new Long(conglomid));
+			mergeRuns.addElement(conglomid);
 
             stat_numMergeRuns++;
             // calculate size of this merge run
             // buffer was too full for last row
             runSize = stat_numRowsInput - totalRunSize - 1;
             totalRunSize += runSize;
-            stat_mergeRunsSize.addElement(new Integer(runSize));
+            stat_mergeRunsSize.addElement(runSize);
 
 			// Re-insert the row into the sort buffer.
 			// This is guaranteed to work since the sort
@@ -226,7 +226,7 @@ final class MergeInserter implements Sor
         if (stat_sortType == "external")
         {
             stat_numMergeRuns++;
-            stat_mergeRunsSize.addElement(new Integer(stat_numRowsInput - totalRunSize));
+            stat_mergeRunsSize.addElement(stat_numRowsInput - totalRunSize);
         }
 
         // close the SortController in the transaction.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
Mon May  9 00:58:22 2016
@@ -237,7 +237,7 @@ class MergeSort implements Sort
 		{
 			// Dump the rows in the sort buffer to a merge run.
 			long containerId = createMergeRun(tran, sortBuffer);
-			mergeRuns.addElement(new Long(containerId));
+			mergeRuns.addElement(containerId);
 
 			// If there are more merge runs than we can sort
 			// at once with our sort buffer, we have to reduce
@@ -296,7 +296,7 @@ class MergeSort implements Sort
 		{
 			// Dump the rows in the sort buffer to a merge run.
 			long containerId = createMergeRun(tran, sortBuffer);
-			mergeRuns.addElement(new Long(containerId));
+			mergeRuns.addElement(containerId);
 
 			// If there are more merge runs than we can sort
 			// at once with our sort buffer, we have to reduce
@@ -732,7 +732,7 @@ class MergeSort implements Sort
 			long id = rawTran.addAndLoadStreamContainer(segmentId,
 				properties, msRowSource);
 
-			mergeRuns.addElement(new Long(id));
+			mergeRuns.addElement(id);
 
 			// Drop the conglomerates in the merge subset
 			e = subset.elements();

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml Mon May  9 00:58:22
2016
@@ -49,6 +49,7 @@
       destdir="${out.dir}">
       <include name="${derby.dir}/impl/store/**"/>
       <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint:deprecation"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java Mon
May  9 00:58:22 2016
@@ -574,8 +574,8 @@ public class AllocPage extends StoredPag
             {
 				throw StandardException.newException(
                         SQLState.DATA_CHANGING_CONTAINER_INFO, 
-                        new Long(oldN), 
-                        new Long(N));
+                        oldN, 
+                        N);
             }
 		}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
Mon May  9 00:58:22 2016
@@ -209,8 +209,8 @@ abstract class BaseContainer implements
         {
 			throw StandardException.newException(
                     SQLState.DATA_ALLOC_NTT_CANT_OPEN, 
-                    new Long(getSegmentId()), 
-                    new Long(getContainerId()));
+                    getSegmentId(), 
+                    getContainerId());
         }
 
 		CompatibilitySpace cs = ntt.getCompatibilitySpace();
@@ -299,8 +299,8 @@ abstract class BaseContainer implements
         {
 			throw StandardException.newException(
                     SQLState.DATA_ALLOC_NTT_CANT_OPEN, 
-                    new Long(getSegmentId()), 
-                    new Long(getContainerId()));
+                    getSegmentId(), 
+                    getContainerId());
         }
 
 		// Latch this container, the commit will release the latch

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java Mon
May  9 00:58:22 2016
@@ -331,7 +331,7 @@ abstract class BasePage implements Page,
         {
 			throw StandardException.newException(
                 SQLState.DATA_CANNOT_MAKE_RECORD_HANDLE, 
-                new Long(recordHandleConstant));
+                recordHandleConstant);
         }
 
 		return new RecordId(pkey, recordHandleConstant);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Mon
May  9 00:58:22 2016
@@ -697,7 +697,7 @@ public abstract class CachedPage extends
 					StandardException se = 
 						StandardException.newException(
 								   SQLState.FILE_READ_PAGE_EXCEPTION, 
-								   ioe, newIdentity, new Integer(pagesize));
+								   ioe, newIdentity, pagesize);
 
 						
 				    if (dataFactory.getLogFactory().inRFR())

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
Mon May  9 00:58:22 2016
@@ -683,7 +683,7 @@ abstract class FileContainer
 		// derby.storage.reusableRecordId
 		if (prop.getProperty(RawStoreFactory.PAGE_REUSABLE_RECORD_ID) != null)
 		{
-			Boolean bool = new Boolean(isReusableRecordId());
+			Boolean bool = isReusableRecordId();
 			prop.put(RawStoreFactory.PAGE_REUSABLE_RECORD_ID,
 					 bool.toString());
 		}
@@ -795,7 +795,7 @@ abstract class FileContainer
         {
 			throw StandardException.newException(
                 SQLState.DATA_UNKNOWN_CONTAINER_FORMAT, getIdentity(), 
-                new Long(fid));
+                fid);
         }
 
 		int status = inStream.readInt();
@@ -838,8 +838,8 @@ abstract class FileContainer
 				(StandardException.newException(
                     SQLState.FILE_BAD_CHECKSUM, 
                     pk, 
-                    new Long(checksum.getValue()), 
-                    new Long(onDiskChecksum), 
+                    checksum.getValue(), 
+                    onDiskChecksum, 
                     org.apache.derby.iapi.util.StringUtil.hexDump(a)));
 		}
 
@@ -1105,7 +1105,7 @@ abstract class FileContainer
 				// RESOLVE: do something about this when we have > 1 container format
 				throw StandardException.newException(
                     SQLState.DATA_UNKNOWN_CONTAINER_FORMAT, 
-                    getIdentity(), new Long(fid));
+                    getIdentity(), fid);
 			}
 
 			status = inStream.readInt();
@@ -1230,7 +1230,7 @@ abstract class FileContainer
 				createArgs.getProperty(RawStoreFactory.PAGE_REUSABLE_RECORD_ID);
 			if (reusableRecordIdParameter != null)
 			{	
-				Boolean reusableRecordId = new Boolean(reusableRecordIdParameter);
+                Boolean reusableRecordId = Boolean.parseBoolean(reusableRecordIdParameter);
 				setReusableRecordIdState(reusableRecordId.booleanValue());
 			}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
Mon May  9 00:58:22 2016
@@ -164,8 +164,8 @@ abstract class PageBasicOperation implem
 		else
 			throw StandardException.newException(
                     SQLState.DATA_MISSING_LOG, pageId, 
-                    new Long(pversion), 
-                    new Long(pageVersion));
+                    pversion, 
+                    pageVersion);
 	}
 
 	/** Release latched page and any other resources acquired during a previous

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java Mon
May  9 00:58:22 2016
@@ -285,7 +285,7 @@ public final class RecordId implements R
 			return false;
 
 		attributes.put(VirtualLockTable.CONTAINERID, 
-					   new Long(pageId.getContainerId().getContainerId()));
+					   pageId.getContainerId().getContainerId());
 
 		attributes.put(VirtualLockTable.LOCKNAME,
 					   "(" + pageId.getPageNumber() + "," + recordId + ")");

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java Mon
May  9 00:58:22 2016
@@ -917,8 +917,8 @@ public class StoredPage extends CachedPa
                 throw StandardException.newException(
                     SQLState.FILE_BAD_CHECKSUM,
                     id, 
-                    new Long(checksum.getValue()), 
-                    new Long(onDiskChecksum), 
+                    checksum.getValue(), 
+                    onDiskChecksum, 
                     pagedataToHexDump(pageData));
             }
             else

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Mon
May  9 00:58:22 2016
@@ -1132,7 +1132,7 @@ public final class LogToFile implements
 							long eof = theLog.length();
 
 							Monitor.logTextMessage(MessageId.LOG_INCOMPLETE_LOG_RECORD,
-								logFile, new Long(endPosition), new Long(eof));
+								logFile, endPosition, eof);
 
 							/* Write zeros from incomplete log record to end of file */
 							long nWrites = (eof - endPosition)/logBufferSize;
@@ -2046,7 +2046,7 @@ public final class LogToFile implements
             {
 				throw StandardException.newException(
                         SQLState.LOG_EXCEED_MAX_LOG_FILE_NUMBER, 
-                        new Long(maxLogFileNumber)); 
+                        maxLogFileNumber); 
             }
 
 			StorageRandomAccessFile newLog = null;	// the new log file
@@ -3860,10 +3860,10 @@ public final class LogToFile implements
                     {
 						throw StandardException.newException(
                                 SQLState.LOG_EXCEED_MAX_LOG_FILE_SIZE, 
-                                new Long(logFileNumber), 
-                                new Long(endPosition), 
-                                new Long(length), 
-                                new Long(LogCounter.MAX_LOGFILE_SIZE));
+                                logFileNumber, 
+                                endPosition, 
+                                length, 
+                                LogCounter.MAX_LOGFILE_SIZE);
                     }
 				}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java Mon May
 9 00:58:22 2016
@@ -376,10 +376,10 @@ public class Scan implements StreamLogSc
 					throw logFactory.markCorrupt(
                         StandardException.newException(
                             SQLState.LOG_RECORD_CORRUPTED, 
-                            new Long(checkLength),
-                            new Long(recordLength),
-                            new Long(inst),
-                            new Long(currentLogFileNumber)));
+                            checkLength,
+                            recordLength,
+                            inst,
+                            currentLogFileNumber));
 				}
 			}
 			else
@@ -955,10 +955,10 @@ public class Scan implements StreamLogSc
 						throw logFactory.markCorrupt
 						(StandardException.newException(
 							SQLState.LOG_RECORD_CORRUPTED, 
-                            new Long(checkLength),
-                            new Long(recordLength),
-                            new Long(currentInstant),
-                            new Long(currentLogFileNumber)));
+                            checkLength,
+                            recordLength,
+                            currentInstant,
+                            currentLogFileNumber));
 
 					}
 					

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
Mon May  9 00:58:22 2016
@@ -258,15 +258,13 @@ public class ReplicationMessageTransmit
         // Check that master and slave have the same serialVersionUID
         ReplicationMessage initiatorMsg = 
             new ReplicationMessage(ReplicationMessage.TYPE_INITIATE_VERSION, 
-                                   new Long(ReplicationMessage.
-                                            serialVersionUID));
+                                   ReplicationMessage.serialVersionUID);
         verifyMessageType(sendMessageWaitForReply(initiatorMsg),
                           ReplicationMessage.TYPE_ACK);
 
         // Check that master and slave log files are in synch
         initiatorMsg =
-            new ReplicationMessage(ReplicationMessage.TYPE_INITIATE_INSTANT,
-                                   new Long(synchOnInstant));
+            new ReplicationMessage(ReplicationMessage.TYPE_INITIATE_INSTANT, synchOnInstant);
         verifyMessageType(sendMessageWaitForReply(initiatorMsg),
                           ReplicationMessage.TYPE_ACK);
     }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
Mon May  9 00:58:22 2016
@@ -138,7 +138,7 @@ public class SlaveController
             //value will be used.
             int slavePort = -1;
             if (port != null) {
-                slavePort = (new Integer(port)).intValue();
+                slavePort = Integer.parseInt(port);
             }
             slaveAddr = new SlaveAddress(
                     properties.getProperty(Attribute.REPLICATION_SLAVE_HOST), 
@@ -585,15 +585,10 @@ public class SlaveController
                         throw StandardException.newException
                             (SQLState.REPLICATION_LOG_OUT_OF_SYNCH,
                              dbname,
-                             new Long(LogCounter.
-                                      getLogFileNumber(logScan.getInstant())),
-                             new Long(LogCounter.
-                                      getLogFilePosition(logScan.
-                                                         getInstant())),
-                             new Long(LogCounter.
-                                      getLogFileNumber(localInstant)),
-                             new Long(LogCounter.
-                                      getLogFilePosition(localInstant)));
+                             LogCounter.getLogFileNumber(logScan.getInstant()),
+                             LogCounter.getLogFilePosition(logScan.getInstant()),
+                             LogCounter.getLogFileNumber(localInstant),
+                             LogCounter.getLogFilePosition(localInstant));
                     }
                     highestLogInstant = localInstant;
                 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSourceInterface.java
Mon May  9 00:58:22 2016
@@ -21,12 +21,24 @@
 
 package org.apache.derby.jdbc;
 
+import java.sql.ShardingKeyBuilder;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+
 import org.apache.derby.iapi.jdbc.ResourceAdapter;
 
 
 /**
  * Common interface of Derby embedded XA data sources.
  */
-public interface EmbeddedXADataSourceInterface extends EmbeddedDataSourceInterface, javax.sql.XADataSource
{
-    ResourceAdapter getResourceAdapter();
+public interface EmbeddedXADataSourceInterface extends EmbeddedDataSourceInterface, javax.sql.XADataSource
+{
+    public ResourceAdapter getResourceAdapter();
+
+    /** Added by Java 9 */
+    public default ShardingKeyBuilder createShardingKeyBuilder()
+        throws SQLException
+    {
+        throw new java.sql.SQLFeatureNotSupportedException();
+    }
 }

Modified: db/derby/code/trunk/java/optional/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/build.xml?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/build.xml (original)
+++ db/derby/code/trunk/java/optional/build.xml Mon May  9 00:58:22 2016
@@ -74,6 +74,7 @@
       </classpath>
       <include name="${derby.dir}/${cur.dir}/**"/>
       <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint:deprecation"/>
     </javac>
 
   </target>

Modified: db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
(original)
+++ db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
Mon May  9 00:58:22 2016
@@ -151,8 +151,8 @@ class LuceneListIndexesVTI extends Strin
             throw ToolUtilities.newSQLException
                 (
                  SQLState.LANG_INVALID_COLUMN_POSITION,
-                 new Integer( col ),
-                 new Integer( getColumnCount() )
+                 col,
+                 getColumnCount()
                  );
         }
 	}
@@ -165,8 +165,8 @@ class LuceneListIndexesVTI extends Strin
             throw ToolUtilities.newSQLException
                 (
                  SQLState.LANG_INVALID_COLUMN_POSITION,
-                 new Integer( col ),
-                 new Integer( getColumnCount() )
+                 col,
+                 getColumnCount()
                  );
         }
 

Modified: db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneQueryVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneQueryVTI.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneQueryVTI.java
(original)
+++ db/derby/code/trunk/java/optional/org/apache/derby/optional/lucene/LuceneQueryVTI.java
Mon May  9 00:58:22 2016
@@ -362,8 +362,8 @@ class LuceneQueryVTI extends StringColum
         return ToolUtilities.newSQLException
             (
              SQLState.LANG_INVALID_COLUMN_POSITION,
-             new Integer( columnid ),
-             new Integer( getColumnCount() )
+             columnid,
+             getColumnCount()
              );
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
Mon May  9 00:58:22 2016
@@ -310,7 +310,7 @@ public class UpgradeTrajectoryTest exten
      */
     private static boolean shouldBuildAllTrajectories()
     {
-        Boolean bool = new Boolean( getSystemProperty( ALL_TRAJECTORIES_PROPERTY ) );
+        Boolean bool = Boolean.valueOf(getSystemProperty( ALL_TRAJECTORIES_PROPERTY ));
 
         return bool.booleanValue();
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
Mon May  9 00:58:22 2016
@@ -83,6 +83,7 @@
       </classpath>
       <include name="${this.dir}/*.java"/>
       <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint:deprecation"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml Mon May  9 00:58:22
2016
@@ -106,6 +106,7 @@
       destdir="${out.dir}">
       <include name="${derby.dir}/impl/tools/**"/>
       <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint:deprecation"/>
     </javac>
    </target>
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java Mon
May  9 00:58:22 2016
@@ -46,13 +46,6 @@ class ijVectorResult extends ijResultImp
 		vec.add(value);
 	}
 
-	/**
-	 * Initialize a new vector containing only one integer value.
-	 */
-	ijVectorResult(int value, SQLWarning w) {
-		this(new Integer(value), w);
-	}
-
 
 	public boolean isVector() { return true; }
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj Mon May  9
00:58:22 2016
@@ -350,7 +350,7 @@ getError(Hashtable<String,Integer> error
 		if (errorList == null)
 		{
 		}
-		errorList.put(s, new Integer(0));
+		errorList.put(s, 0);
 	}
 }
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Mon May  9
00:58:22 2016
@@ -589,7 +589,7 @@ class xaHelper implements xaAbstractHelp
 			"set" + Character.toUpperCase(property.charAt(0)) + property.substring(1);
 		try {
 			java.lang.reflect.Method m = ds.getClass().getMethod(methodName, INT_P);
-			m.invoke(ds, new Object[] {new Integer(value)});
+			m.invoke(ds, new Object[] {value});
 		}
 		catch (Exception e)
 		{
@@ -621,7 +621,7 @@ private static void setDataSourcePropert
 
 		try {
 			java.lang.reflect.Method m = ds.getClass().getMethod(methodName, BOOLEAN_P);
-			m.invoke(ds, new Object[] {new Boolean(value)});
+			m.invoke(ds, new Object[] {value});
 			return;
 		} catch (Exception nsme) {
 			throw new SQLException(property + " ???");

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java?rev=1742858&r1=1742857&r2=1742858&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java Mon
May  9 00:58:22 2016
@@ -810,8 +810,8 @@ public  class   DBMDWrapper implements O
     private Object  getDummyValue( Class type )
     {
         if ( String.class == type ) { return ""; }
-        else if ( Integer.TYPE == type ) { return new Integer( 1 ); }
-        else if ( Short.TYPE == type ) { return new Short( (short) 1 ); }
+        else if ( Integer.TYPE == type ) { return 1; }
+        else if ( Short.TYPE == type ) { return (short) 1; }
         else if ( Boolean.TYPE == type ) { return Boolean.TRUE; }
         else { return null; }
     }




Mime
View raw message