Skip to content

Commit 05674bb

Browse files
rjernstjfreden
authored andcommitted
Remove SecureMockMaker (elastic#127773)
The SecureMockMaker is a way for mockito to be allowed SM permissions for proxying. Since the Security Manager is no longer used, secure mocks are no longer needed. This commit removes them.
1 parent 363a53b commit 05674bb

File tree

9 files changed

+0
-238
lines changed

9 files changed

+0
-238
lines changed

test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.core.Booleans;
1717
import org.elasticsearch.core.PathUtils;
1818
import org.elasticsearch.jdk.JarHell;
19-
import org.elasticsearch.test.mockito.SecureMockMaker;
2019

2120
import java.io.IOException;
2221
import java.nio.file.Files;
@@ -70,9 +69,6 @@ public class BootstrapForTesting {
7069
throw new RuntimeException("found jar hell in test classpath", e);
7170
}
7271

73-
// init mockito
74-
SecureMockMaker.init();
75-
7672
// Log ifconfig output before SecurityManager is installed
7773
IfConfig.logIfNecessary();
7874
}

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureAnnotationEngine.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureMockMaker.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureMockUtil.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureObjectInstantiator.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/framework/src/main/java/org/elasticsearch/test/mockito/SecureObjectInstantiatorProvider.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

test/framework/src/main/resources/mockito-extensions/org.mockito.plugins.AnnotationEngine

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/framework/src/main/resources/mockito-extensions/org.mockito.plugins.InstantiatorProvider2

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/framework/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)