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/04/16 15:56:51 UTC
svn commit: r1899913 [3/3] - in /db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting: functionTests/tests/compatibility/ functionTests/tests/demo/ functionTests/tests/derbynet/ functionTests/tests/engine/ functionTests/tests/jdbc4/ ...
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java Sat Apr 16 15:56:50 2022
@@ -30,12 +30,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.shared.common.error.StandardException;
-import java.security.AccessController;
import java.security.Key;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedAction;
import java.io.File;
import java.io.RandomAccessFile;
@@ -94,18 +89,10 @@ public class T_Cipher extends T_Generic
return "DES/CBC/NoPadding";
}
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
protected String getProvider()
{
// allow for alternate providers
- String testProvider =
-
- AccessController.doPrivileged(new PrivilegedAction<String>() {
- public String run() {
- return System.getProperty("testEncryptionProvider");
- }
- });
+ String testProvider = System.getProperty("testEncryptionProvider");
if (testProvider != null)
return testProvider;
@@ -609,45 +596,26 @@ public class T_Cipher extends T_Generic
}
*/
- /**
- * Delete a file in a Privileged block as these tests are
- * run under the embedded engine code.
- */
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
- private void deleteFile(final File f)
- {
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- public Void run() {
- if (f.exists())
- f.delete();
- return null;
- }
- });
- }
+ /**
+ * Delete a file in a Privileged block as these tests are
+ * run under the embedded engine code.
+ */
+ private void deleteFile(final File f)
+ {
+ if (f.exists())
+ f.delete();
+ }
/**
* Privileged startup. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object startSystemModule( final String factoryInterface )
throws StandardException
{
try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.startSystemModule( factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
+ return Monitor.startSystemModule( factoryInterface );
+ } catch (Exception pae)
{
throw StandardException.plainWrapException( pae );
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java Sat Apr 16 15:56:50 2022
@@ -29,10 +29,6 @@ import org.apache.derby.shared.common.er
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.shared.common.stream.HeaderPrintWriter;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
import java.util.Date;
import java.util.Enumeration;
import java.util.Properties;
@@ -295,49 +291,25 @@ public class BasicUnitTestManager implem
* Privileged lookup of the ContextService. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged Monitor lookup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ModuleFactory getMonitor()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ModuleFactory>()
- {
- public ModuleFactory run()
- {
- return Monitor.getMonitor();
- }
- }
- );
+ return Monitor.getMonitor();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object bootServiceModule
(
final boolean create, final Object serviceModule,
@@ -346,18 +318,8 @@ public class BasicUnitTestManager implem
throws StandardException
{
try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.bootServiceModule( create, serviceModule, factoryInterface, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
+ return Monitor.bootServiceModule( create, serviceModule, factoryInterface, properties );
+ } catch (Exception pae)
{
throw StandardException.plainWrapException( pae );
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java Sat Apr 16 15:56:50 2022
@@ -26,8 +26,6 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.context.Context;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
import java.util.Vector;
public class T_Bomb implements Runnable {
@@ -153,27 +151,9 @@ public class T_Bomb implements Runnable
* Privileged lookup of the ContextService. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- if ( System.getSecurityManager() == null )
- {
- return ContextService.getFactory();
- }
- else
- {
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
- }
+ return ContextService.getFactory();
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java Sat Apr 16 15:56:50 2022
@@ -22,8 +22,6 @@
package org.apache.derbyTesting.unitTests.harness;
import java.io.PrintWriter;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Properties;
import org.apache.derby.iapi.services.monitor.Monitor;
@@ -40,29 +38,14 @@ import org.apache.derby.iapi.services.mo
public class UnitTestMain {
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
- public static void main(String args[]) {
-
- AccessController.doPrivileged
- (
- new PrivilegedAction<Object>()
- {
- public Object run()
- {
- Properties bootProperties = new Properties();
-
- // request that a unit test manager service is started
- bootProperties.put("derby.service.unitTestManager", UnitTestManager.MODULE);
- Monitor.startMonitor(bootProperties, new PrintWriter(System.err, true));
-
- return null;
- }
- }
- );
+ public static void main(String args[]) {
+ Properties bootProperties = new Properties();
- }
+ // request that a unit test manager service is started
+ bootProperties.put("derby.service.unitTestManager", UnitTestManager.MODULE);
+ Monitor.startMonitor(bootProperties, new PrintWriter(System.err, true));
+ }
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java Sat Apr 16 15:56:50 2022
@@ -21,10 +21,6 @@
package org.apache.derbyTesting.unitTests.services;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
import org.apache.derbyTesting.unitTests.harness.T_Generic;
import org.apache.derbyTesting.unitTests.harness.T_Fail;
@@ -347,24 +343,12 @@ public class T_CacheService extends T_Ge
* Privileged startup. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object startSystemModule( final String factoryInterface )
throws StandardException
{
try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.startSystemModule( factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
+ return Monitor.startSystemModule( factoryInterface );
+ } catch (Exception pae)
{
throw StandardException.plainWrapException( pae );
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java Sat Apr 16 15:56:50 2022
@@ -28,9 +28,6 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.daemon.*;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Random;
import java.util.Vector;
/**
@@ -326,30 +323,13 @@ public class T_DaemonService extends T_M
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object startSystemModule( final String factoryInterface )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.startSystemModule( factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.startSystemModule( factoryInterface );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java Sat Apr 16 15:56:50 2022
@@ -21,10 +21,6 @@
package org.apache.derbyTesting.unitTests.services;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
import org.apache.derbyTesting.unitTests.harness.T_MultiIterations;
import org.apache.derbyTesting.unitTests.harness.T_Fail;
@@ -723,27 +719,10 @@ public class T_LockFactory extends T_Mul
* Privileged startup. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object startSystemModule( final String factoryInterface )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.startSystemModule( factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.startSystemModule( factoryInterface );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java Sat Apr 16 15:56:50 2022
@@ -21,9 +21,6 @@
package org.apache.derbyTesting.unitTests.services;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
import org.apache.derbyTesting.unitTests.harness.T_Generic;
import org.apache.derbyTesting.unitTests.harness.T_Fail;
@@ -158,23 +155,12 @@ public class T_UUIDFactory extends T_Gen
}
/**
- * Privileged Monitor lookup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ModuleFactory getMonitor()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ModuleFactory>()
- {
- public ModuleFactory run()
- {
- return Monitor.getMonitor();
- }
- }
- );
+ return Monitor.getMonitor();
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java Sat Apr 16 15:56:50 2022
@@ -46,10 +46,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.io.FormatableBitSet;
import org.apache.derby.shared.common.i18n.MessageService;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
import java.io.Serializable;
import java.util.Hashtable;
import java.util.Properties;
@@ -4373,77 +4369,32 @@ public class T_AccessFactory extends T_G
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object findServiceModule( final Object serviceModule, final String factoryInterface)
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.findServiceModule( serviceModule, factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.findServiceModule( serviceModule, factoryInterface );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java Sat Apr 16 15:56:50 2022
@@ -43,10 +43,6 @@ import org.apache.derby.iapi.store.raw.d
import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
import org.apache.derby.shared.common.reference.Property;
import java.io.*;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
import java.util.Properties;
/**
An Impl unittest for rawstore data that is based on the FileSystem
@@ -1110,57 +1106,22 @@ public class T_FileSystemData extends T_
}
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- if ( System.getSecurityManager() == null )
- {
- return ContextService.getFactory();
- }
- else
- {
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
- }
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java Sat Apr 16 15:56:50 2022
@@ -46,10 +46,6 @@ import org.apache.derby.iapi.store.acces
import org.apache.derby.shared.common.reference.Property;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
import java.util.Properties;
public class T_Heap extends T_Generic
@@ -151,50 +147,22 @@ public class T_Heap extends T_Generic
}
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java Sat Apr 16 15:56:50 2022
@@ -60,10 +60,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.iapi.services.io.FormatableBitSet;
import java.io.*;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
import java.util.Properties;
/**
@@ -7648,71 +7644,32 @@ public class T_RawStoreFactory extends T
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings({"BroadCatchBlock", "TooBroadCatch", "UseSpecificCatch", "removal"})
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged Monitor lookup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings({"BroadCatchBlock", "TooBroadCatch", "UseSpecificCatch", "removal"})
private static ModuleFactory getMonitor()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ModuleFactory>()
- {
- public ModuleFactory run()
- {
- return Monitor.getMonitor();
- }
- }
- );
+ return Monitor.getMonitor();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings({"BroadCatchBlock", "TooBroadCatch", "UseSpecificCatch", "removal"})
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java Sat Apr 16 15:56:50 2022
@@ -51,10 +51,6 @@ import org.apache.derby.iapi.store.acces
import java.io.IOException;
import java.io.RandomAccessFile;
import java.io.File;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Properties;
@@ -1833,104 +1829,42 @@ public class T_RecoverBadLog extends T_G
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object findServiceModule( final Object serviceModule, final String factoryInterface)
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.findServiceModule( serviceModule, factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.findServiceModule( serviceModule, factoryInterface );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static boolean startPersistentService( final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Boolean>()
- {
- public Boolean run()
- throws StandardException
- {
- return Monitor.startPersistentService( serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.startPersistentService( serviceName, properties );
}
/**
* Privileged startup. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java Sat Apr 16 15:56:50 2022
@@ -51,10 +51,6 @@ import org.apache.derby.iapi.store.acces
import java.io.IOException;
import java.io.RandomAccessFile;
import java.io.File;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
import java.util.Properties;
@@ -868,98 +864,42 @@ public class T_RecoverFullLog extends T_
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged service lookup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object findService( final String factoryInterface, final String serviceName )
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<Object>()
- {
- public Object run()
- {
- return Monitor.findService( factoryInterface, serviceName );
- }
- }
- );
+ return Monitor.findService( factoryInterface, serviceName );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static boolean startPersistentService( final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Boolean>()
- {
- public Boolean run()
- throws StandardException
- {
- return Monitor.startPersistentService( serviceName, properties );
- }
- }
- ).booleanValue();
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.startPersistentService( serviceName, properties );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java Sat Apr 16 15:56:50 2022
@@ -60,10 +60,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.iapi.services.io.FormatableBitSet;
import java.io.*;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
import java.util.Properties;
@@ -4092,118 +4088,51 @@ public class T_Recovery extends T_Generi
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged Monitor lookup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ModuleFactory getMonitor()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ModuleFactory>()
- {
- public ModuleFactory run()
- {
- return Monitor.getMonitor();
- }
- }
- );
+ return Monitor.getMonitor();
}
/**
- * Privileged service lookup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object findService( final String factoryInterface, final String serviceName )
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<Object>()
- {
- public Object run()
- {
- return Monitor.findService( factoryInterface, serviceName );
- }
- }
- );
+ return Monitor.findService( factoryInterface, serviceName );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static boolean startPersistentService( final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Boolean>()
- {
- public Boolean run()
- throws StandardException
- {
- return Monitor.startPersistentService( serviceName, properties );
- }
- }
- ).booleanValue();
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.startPersistentService( serviceName, properties );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java Sat Apr 16 15:56:50 2022
@@ -44,10 +44,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.iapi.types.SQLInteger;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Properties;
import java.util.Vector;
import java.util.StringTokenizer;
@@ -62,26 +58,19 @@ import org.apache.derby.shared.common.sa
public class T_SortController extends T_Generic
{
- private static final String testService = "sortTest";
+ private static final String testService = "sortTest";
- /** Set this to print out the rows that are inserted into
- ** and returned from each sort. **/
- protected boolean verbose = false;
+ /** Set this to print out the rows that are inserted into
+ ** and returned from each sort. **/
+ protected boolean verbose = false;
- public String getModuleToTestProtocolName() {
- return AccessFactory.MODULE;
- }
+ public String getModuleToTestProtocolName() {
+ return AccessFactory.MODULE;
+ }
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
- private void setSortBufferSize(final String buf_length) {
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- public Void run() {
- System.setProperty("derby.storage.sortBufferMax", buf_length);
- return null;
- }
- });
- }
+ private void setSortBufferSize(final String buf_length) {
+ System.setProperty("derby.storage.sortBufferMax", buf_length);
+ }
/*
** Methods of T_SortController
@@ -844,57 +833,22 @@ public class T_SortController extends T_
}
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- if ( System.getSecurityManager() == null )
- {
- return ContextService.getFactory();
- }
- else
- {
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
- }
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java Sat Apr 16 15:56:50 2022
@@ -50,10 +50,6 @@ import org.apache.derby.iapi.services.io
import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
import java.io.*;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.AccessController;
import java.util.Properties;
/**
@@ -395,50 +391,22 @@ public class T_StreamFile extends T_Mult
}
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java Sat Apr 16 15:56:50 2022
@@ -42,10 +42,6 @@ import org.apache.derby.iapi.services.io
import org.apache.derby.shared.common.error.StandardException;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
import java.util.Properties;
import javax.transaction.xa.XAResource;
@@ -1186,50 +1182,22 @@ public class T_XA extends T_Generic
/**
- * Privileged lookup of the ContextService. Package protected so that user code
+ * Package protected so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
static ContextService getContextService()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
+ return ContextService.getFactory();
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java Sat Apr 16 15:56:50 2022
@@ -69,10 +69,6 @@ import org.apache.derby.impl.store.acces
import org.apache.derby.iapi.types.SQLChar;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Properties;
@@ -5109,104 +5105,41 @@ public class T_b2i extends T_MultiIterat
/**
- * Privileged lookup of the ContextService. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ContextService getContextService()
{
- if ( System.getSecurityManager() == null )
- {
- return ContextService.getFactory();
- }
- else
- {
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ContextService>()
- {
- public ContextService run()
- {
- return ContextService.getFactory();
- }
- }
- );
- }
+ return ContextService.getFactory();
}
/**
- * Privileged lookup of a Context. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Context getContextOrNull( final String contextID )
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<Context>()
- {
- public Context run()
- {
- return ContextService.getContextOrNull( contextID );
- }
- }
- );
+ return ContextService.getContextOrNull( contextID );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object findServiceModule( final Object serviceModule, final String factoryInterface)
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.findServiceModule( serviceModule, factoryInterface );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.findServiceModule( serviceModule, factoryInterface );
}
/**
- * Privileged startup. Must be private so that user code
+ * Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties )
throws StandardException
{
- try {
- return AccessController.doPrivileged
- (
- new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- throws StandardException
- {
- return Monitor.createPersistentService( factoryInterface, serviceName, properties );
- }
- }
- );
- } catch (PrivilegedActionException pae)
- {
- throw StandardException.plainWrapException( pae );
- }
+ return Monitor.createPersistentService( factoryInterface, serviceName, properties );
}
Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java?rev=1899913&r1=1899912&r2=1899913&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java Sat Apr 16 15:56:50 2022
@@ -21,9 +21,6 @@
package org.apache.derbyTesting.unitTests.util;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
@@ -96,20 +93,9 @@ public class MsgTrace implements Runnabl
* Privileged Monitor lookup. Must be private so that user code
* can't call this entry point.
*/
- // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
- @SuppressWarnings("removal")
private static ModuleFactory getMonitor()
{
- return AccessController.doPrivileged
- (
- new PrivilegedAction<ModuleFactory>()
- {
- public ModuleFactory run()
- {
- return Monitor.getMonitor();
- }
- }
- );
+ return Monitor.getMonitor();
}
}