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 rh...@apache.org on 2022/06/22 14:23:21 UTC
svn commit: r1902171 - in /db/derby/code/trunk: ./ java/org.apache.derby.commons/org/apache/derby/shared/common/error/ java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/ java/org.apache.derby.commons/org/apache/derby/shared/common/sanit...
Author: rhillegas
Date: Wed Jun 22 14:23:20 2022
New Revision: 1902171
URL: http://svn.apache.org/viewvc?rev=1902171&view=rev
Log:
DERBY-7133: Fix deprecation warnings introduced by Open JDK build 19-ea+27-2074, compile Derby into Java 19 byte code; commit derby-7133-01-aa-fixDeprecationWarnings.diff.
Modified:
db/derby/code/trunk/BUILDING.html
db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java
db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java
db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/ThreadDump.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java
db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ThreadDump.java
db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties
Modified: db/derby/code/trunk/BUILDING.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/BUILDING.html?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.html (original)
+++ db/derby/code/trunk/BUILDING.html Wed Jun 22 14:23:20 2022
@@ -80,7 +80,7 @@ If you are reading these instructions, c
<TR>
<TD><b><i>Java Development Kit</i></b></TD>
- <TD>You need to install a Java 17 JDK. Probably, your machine
+ <TD>You need to install a Java 19 JDK or higher. Probably, your machine
already has this JDK. If not, Oracle and IBM supply free JDKs for many machines.</TD>
</TR>
Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java Wed Jun 22 14:23:20 2022
@@ -46,7 +46,7 @@ import org.apache.derby.shared.common.re
public class MessageUtils
{
- private static final Locale EN = new Locale("en", "US");
+ private static final Locale EN = Locale.of("en", "US");
public static final String SQLERRMC_MESSAGE_DELIMITER = new String(new char[] {(char)20,(char)20,(char)20});
/**
* Pointer to the application requester
@@ -323,13 +323,13 @@ public class MessageUtils
if (_pos2 == _pos1)
{
String country = localeStr.substring(_pos1 + 1);
- locale = new Locale(language, country);
+ locale = Locale.of(language, country);
}
else
{
String country = localeStr.substring(_pos1 + 1, _pos2);
String variant = localeStr.substring(_pos2 + 1);
- locale = new Locale(language, country, variant);
+ locale = Locale.of(language, country, variant);
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java Wed Jun 22 14:23:20 2022
@@ -45,7 +45,7 @@ import java.text.MessageFormat;
*/
public final class MessageService {
- private static final Locale EN = new Locale("en", "US");
+ private static final Locale EN = Locale.of("en", "US");
private static final String LOCALE_STUB = "locale_";
private static final String CLIENT_MESSAGES = "clientmessages";
private static final String TOOLS_MESSAGES = "toolsmessages";
Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java Wed Jun 22 14:23:20 2022
@@ -31,7 +31,7 @@ import java.text.MessageFormat;
*/
public class MessageUtil
{
- public static final Locale US = new Locale("en", "US");
+ public static final Locale US = Locale.of("en", "US");
public static final String CLIENT_MESSAGE_RESOURCE_NAME = "org.apache.derby.loc.client.clientmessages";
Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/ThreadDump.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/ThreadDump.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/ThreadDump.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/ThreadDump.java Wed Jun 22 14:23:20 2022
@@ -35,7 +35,7 @@ public class ThreadDump {
for (Map.Entry<Thread, StackTraceElement[]> e : st.entrySet()) {
StackTraceElement[] lines = e.getValue();
Thread t = e.getKey();
- sb.append("Thread name=" + t.getName() + " id=" + t.getId()
+ sb.append("Thread name=" + t.getName() + " id=" + t.threadId()
+ " priority=" + t.getPriority() + " state=" + t.getState()
+ " isdaemon=" + t.isDaemon() + "\n");
for (int i = 0; i < lines.length; i++) {
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java Wed Jun 22 14:23:20 2022
@@ -86,7 +86,7 @@ final class XATransactionState extends C
public synchronized boolean okToCancel() {
boolean res = false;
if (null == cancelThreadId && null == cleanupThreadId) {
- cancelThreadId = Thread.currentThread().getId();
+ cancelThreadId = Thread.currentThread().threadId();
res = true;
}
return res;
@@ -104,7 +104,7 @@ final class XATransactionState extends C
private synchronized boolean okToCleanup() {
boolean res = false;
if (null == cleanupThreadId && null == cancelThreadId) {
- cleanupThreadId = Thread.currentThread().getId();
+ cleanupThreadId = Thread.currentThread().threadId();
res = true;
}
return res;
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Wed Jun 22 14:23:20 2022
@@ -2019,12 +2019,12 @@ nextModule:
String country = len == 2 ? "" : localeDescription.substring(3, 5);
if (len < 6) {
- return new Locale(language, country);
+ return Locale.of(language, country);
}
String variant = (len > 6) ? localeDescription.substring(6, len) : null;
- return new Locale(language, country, variant);
+ return Locale.of(language, country, variant);
}
private static Locale setLocale(Properties properties)
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java Wed Jun 22 14:23:20 2022
@@ -49,8 +49,8 @@ public class RuntimeInfoTest extends Bas
"org.apache.derby.drda.NetworkServerControl", "runtimeinfo",
"-p", String.valueOf(TestConfiguration.getCurrent().getPort()) };
- private static final Locale englishLocale = new Locale("en", "US");
- private static final Locale germanLocale = new Locale("de", "DE");
+ private static final Locale englishLocale = Locale.of("en", "US");
+ private static final Locale germanLocale = Locale.of("de", "DE");
private static final String stdout_err_tags = "<[^<>]*STD.*>";
/**
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java Wed Jun 22 14:23:20 2022
@@ -71,7 +71,7 @@ public class DefaultLocale {
// class. The generated class on the stack has no permissions
// granted to it. Needs write permission on user.language
LocaleTestSetup.setDefaultLocale(
- new java.util.Locale(Locale.trim(), Code.trim()));
+ java.util.Locale.of(Locale.trim(), Code.trim()));
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java Wed Jun 22 14:23:20 2022
@@ -311,7 +311,7 @@ public class UrlLocaleTest extends BaseJ
suite.addTestSuite(UrlLocaleTest.class);
suite.addTest(new LocaleTestSetup(
new UrlLocaleTest("messageLocale_unknown"),
- new Locale("rr", "TT")));
+ Locale.of("rr", "TT")));
suite.addTest(new LocaleTestSetup(
new UrlLocaleTest("messageLocale_Germany"),
Locale.GERMANY));
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Wed Jun 22 14:23:20 2022
@@ -2141,7 +2141,7 @@ public void testMissingCollatorSupport()
* @return true if the bug is present, false otherwise
*/
private static boolean hasBuggySwedishLocale() {
- Collator c = Collator.getInstance(new Locale("sv"));
+ Collator c = Collator.getInstance(Locale.of("sv"));
if (c.compare("aa", "ab") < 0) {
// OK, aa should be less than ab with Swedish collation
return false;
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java Wed Jun 22 14:23:20 2022
@@ -74,7 +74,7 @@ public class LuceneSupportTest extends B
Test baseTest = TestConfiguration.embeddedSuite(LuceneSupportTest.class);
Test singleUseTest = TestConfiguration.singleUseDatabaseDecorator( baseTest );
- Test localizedTest = new LocaleTestSetup( singleUseTest, new Locale( "en", "US" ) );
+ Test localizedTest = new LocaleTestSetup( singleUseTest, Locale.of( "en", "US" ) );
suite.addTest(localizedTest);
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ThreadDump.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ThreadDump.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ThreadDump.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ThreadDump.java Wed Jun 22 14:23:20 2022
@@ -35,7 +35,7 @@ public class ThreadDump {
for (Map.Entry<Thread, StackTraceElement[]> e : st.entrySet()) {
StackTraceElement[] lines = e.getValue();
Thread t = e.getKey();
- sb.append("Thread name=" + t.getName() + " id=" + t.getId()
+ sb.append("Thread name=" + t.getName() + " id=" + t.threadId()
+ " priority=" + t.getPriority() + " state=" + t.getState()
+ " isdaemon=" + t.isDaemon() + "\n");
for (int i = 0; i < lines.length; i++) {
Modified: db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java Wed Jun 22 14:23:20 2022
@@ -271,7 +271,7 @@ public final class LocalizedResource
r=st.nextToken();
if(st.hasMoreTokens()==true)
v=st.nextToken();
- return new Locale(l,r,v);
+ return Locale.of(l,r,v);
} catch (Exception e) {
return null;
}
Modified: db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties?rev=1902171&r1=1902170&r2=1902171&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties Wed Jun 22 14:23:20 2022
@@ -17,4 +17,4 @@ build.compiler=modern
fail_on_error=false
# minimum Java version supported by Derby
-min.version=17
+min.version=19