You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2016/02/05 23:47:36 UTC
svn commit: r1728767 - in /db/derby/code/trunk/java:
drda/org/apache/derby/drda/ engine/org/apache/derby/iapi/services/info/
engine/org/apache/derby/impl/jdbc/
testing/org/apache/derbyTesting/functionTests/tests/lang/
testing/org/apache/derbyTesting/fu...
Author: kahatlen
Date: Fri Feb 5 22:47:36 2016
New Revision: 1728767
URL: http://svn.apache.org/viewvc?rev=1728767&view=rev
Log:
DERBY-6857: Deprecate support for building Derby under JDKs 6 and 7
Remove the JVMInfo constants for Java 6 and 7, since they are no longer
supported.
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=1728767&r1=1728766&r2=1728767&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Fri Feb 5 22:47:36 2016
@@ -31,7 +31,6 @@ import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.Properties;
import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.impl.drda.NetworkServerControlImpl;
@@ -320,8 +319,7 @@ public class NetworkServerControl{
int command = server.parseArgs( args );
// Java 7 and above: file permission restriction
- if (command == NetworkServerControlImpl.COMMAND_START &&
- JVMInfo.JDK_ID >= JVMInfo.J2SE_17) {
+ if (command == NetworkServerControlImpl.COMMAND_START) {
try {
AccessController.doPrivileged((PrivilegedAction<Void>) () ->
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=1728767&r1=1728766&r2=1728767&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Fri Feb 5 22:47:36 2016
@@ -47,16 +47,14 @@ public abstract class JVMInfo
<LI> 4 - not used, was for JDK 1.4.0 or 1.4.1
<LI> 5 - not used, was for JDK 1.4.2
<LI> 6 - not used, was for JDK 1.5
- <LI> 7 - J2SE_16 - JDK 1.6
- <LI> 8 - J2SE_17 - JDK 1.7
+ <LI> 7 - not used, was for JDK 1.6
+ <LI> 8 - not used, was for JDK 1.7
<LI> 9 - J2SE_18 - JDK 1.8
</UL>
*/
public static final int JDK_ID;
- public static final int J2SE_16 = 7; // Java SE 6, not J2SE
- public static final int J2SE_17 = 8; // Java SE 7
- public static final int J2SE_18 = 9;
+ public static final int J2SE_18 = 9; // Java SE 8
public static int jdbcMajorVersion()
{
@@ -67,8 +65,6 @@ public abstract class JVMInfo
{
switch (JDK_ID)
{
- case J2SE_16: return 0;
- case J2SE_17: return 1;
case J2SE_18:
default: return 2;
}
@@ -87,36 +83,25 @@ public abstract class JVMInfo
//
// Otherwise, see if we recognize what is set in java.version.
// If we don't recognize that, or if the property is not set, assume
- // version 1.6, which is the lowest level we support.
+ // version 1.8, which is the lowest level we support.
//
- String javaVersion;
-
+ String javaVersion = "1.8";
try {
javaVersion =
- System.getProperty("java.specification.version", "1.6");
-
+ System.getProperty("java.specification.version", javaVersion);
} catch (SecurityException se) {
// some vms do not know about this property so they
// throw a security exception when access is restricted.
- javaVersion = "1.6";
}
- if (javaVersion.equals("1.6"))
- {
- id = J2SE_16;
- }
- else if (javaVersion.equals("1.7"))
- {
- id = J2SE_17;
- }
- else if (javaVersion.equals("1.8")) {
+ if (javaVersion.equals("1.8")) {
id = J2SE_18;
}
else
{
// Assume our lowest support unless the java spec
// is greater than our highest level.
- id = J2SE_16;
+ id = J2SE_18;
try {
@@ -149,8 +134,6 @@ public abstract class JVMInfo
String jdbcVersion = jdbcMajorVersion() + "." + jdbcMinorVersion();
switch (JDK_ID)
{
- case J2SE_16: return "Java SE 6 - JDBC " + jdbcVersion;
- case J2SE_17: return "Java SE 7 - JDBC " + jdbcVersion;
case J2SE_18: return "Java SE 8 - JDBC " + jdbcVersion;
default: return "?-?";
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java?rev=1728767&r1=1728766&r2=1728767&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java Fri Feb 5 22:47:36 2016
@@ -33,11 +33,11 @@ import org.apache.derby.iapi.sql.conn.La
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.jdbc.EngineStatement;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+import java.sql.BatchUpdateException;
import java.sql.SQLException;
import java.sql.SQLWarning;
import java.sql.Statement;
+import java.util.Arrays;
import java.util.Vector;
import org.apache.derby.iapi.util.InterruptStatus;
@@ -1102,14 +1102,15 @@ public class EmbedStatement extends Conn
restoreContextStack();
}
- long[] successfulUpdateCount = new long[ i ];
- System.arraycopy(returnUpdateCountForBatch, 0, successfulUpdateCount, 0, i);
+ long[] successfulUpdateCount =
+ Arrays.copyOf(returnUpdateCountForBatch, i);
- SQLException batch = Util.newBatchUpdateException
- ( sqle.getMessage(), sqle.getSQLState(),sqle.getErrorCode(), successfulUpdateCount, sqle );
-
- throw batch;
- }
+ throw new BatchUpdateException(sqle.getMessage(),
+ sqle.getSQLState(),
+ sqle.getErrorCode(),
+ successfulUpdateCount,
+ sqle );
+ }
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java?rev=1728767&r1=1728766&r2=1728767&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java Fri Feb 5 22:47:36 2016
@@ -22,8 +22,6 @@
package org.apache.derby.impl.jdbc;
import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.sql.BatchUpdateException;
import java.sql.SQLException;
import java.sql.Types;
import org.apache.derby.iapi.error.ErrorStringBuilder;
@@ -35,7 +33,6 @@ import org.apache.derby.iapi.reference.M
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
-import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.property.PropertyUtil;
@@ -311,39 +308,6 @@ public abstract class Util {
SQLState.TYPE_MISMATCH, typeName(targetSQLType));
}
- /** Create the correct BatchUpdateException depending on whether this is Java 8 or lower */
- static SQLException newBatchUpdateException
- ( String message, String sqlState, int errorCode, long[] updateCounts, Throwable cause )
- {
- if ( JVMInfo.JDK_ID >= JVMInfo.J2SE_18 )
- {
- try {
- Constructor constructor = BatchUpdateException.class.getConstructor
- (
- new Class[] { String.class, String.class, Integer.TYPE, updateCounts.getClass(), Throwable.class }
- );
-
- return (BatchUpdateException) constructor.newInstance
- ( new Object[] { message, sqlState, new Integer( errorCode ), updateCounts, cause } );
- }
- catch (Exception e)
- {
- // unanticipated problem. log it and return the Java 7 version of the exception
- logError( "\nERROR " + e.getMessage() + "\n", e );
- }
- }
-
- // use this constructor if we're not on Java 8 or if an error occurred
- // while using the Java 8 constructor
- BatchUpdateException batch = new BatchUpdateException
- ( message, sqlState, errorCode, squashLongs( updateCounts ) );
-
- if ( cause instanceof SQLException ) { batch.setNextException( (SQLException) cause ); }
- batch.initCause( cause );
-
- return batch;
- }
-
/** Squash an array of longs into an array of ints */
public static int[] squashLongs( long[] longs )
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java?rev=1728767&r1=1728766&r2=1728767&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java Fri Feb 5 22:47:36 2016
@@ -330,14 +330,10 @@ public class XMLOptimizerTraceTest exte
conn,
"call syscs_util.syscs_register_tool( 'optimizerTracing', true, 'xml' )"
);
- // IBM 1.6 is wrapping the exception in a 38000. See DERBY-6760.
- String expectedError = FILE_EXISTS;
- if (JVMInfo.isIBMJVM() && JVMInfo.JDK_ID==JVMInfo.J2SE_16)
- expectedError = "38000";
expectExecutionError
(
conn,
- expectedError,
+ FILE_EXISTS,
"call syscs_util.syscs_register_tool( 'optimizerTracing', false, '" + traceFile.getPath() + "' )"
);
goodStatement
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java?rev=1728767&r1=1728766&r2=1728767&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java Fri Feb 5 22:47:36 2016
@@ -228,30 +228,21 @@ public class SysinfoCPCheckTest extends
}
public void testjavaVersion(){
- assertTrue( JVMInfo.JDK_ID == JVMInfo.J2SE_16 ||
- JVMInfo.JDK_ID == JVMInfo.J2SE_17 ||
- JVMInfo.JDK_ID == JVMInfo.J2SE_18 );
- }
+ assertEquals(JVMInfo.J2SE_18, JVMInfo.JDK_ID);
+ }
- // Still testing this here although we don't actually put
- // out this line with sysinfo anymore.
- public void testderbyVMLevel(){
- switch (JVMInfo.JDK_ID) {
- case JVMInfo.J2SE_16:
- assertEquals("Java SE 6 - JDBC 4.0",JVMInfo.derbyVMLevel());
- break;
- case JVMInfo.J2SE_17:
- assertEquals("Java SE 7 - JDBC 4.1",JVMInfo.derbyVMLevel());
- break;
- case JVMInfo.J2SE_18:
- assertEquals("Java SE 8 - JDBC 4.2",JVMInfo.derbyVMLevel());
- break;
- default:
- assertEquals("?-?",JVMInfo.derbyVMLevel());
- break;
- }
-
- }
+ // Still testing this here although we don't actually put
+ // out this line with sysinfo anymore.
+ public void testderbyVMLevel() {
+ switch (JVMInfo.JDK_ID) {
+ case JVMInfo.J2SE_18:
+ assertEquals("Java SE 8 - JDBC 4.2", JVMInfo.derbyVMLevel());
+ break;
+ default:
+ assertEquals("?-?", JVMInfo.derbyVMLevel());
+ break;
+ }
+ }
public void testisSunJVM(){
if(JVMInfo.isSunJVM()==true){