Skip to content

Commit 4bca6e3

Browse files
phipagphipag
committed
Remove mockito from powertools-logging-logback.
1 parent e544677 commit 4bca6e3

File tree

10 files changed

+158
-213
lines changed

10 files changed

+158
-213
lines changed

‎powertools-logging/powertools-logging-log4j/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,5 +206,4 @@
206206
</plugin>
207207
</plugins>
208208
</build>
209-
210209
</project>

‎powertools-logging/powertools-logging-logback/pom.xml‎

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<artifactId>powertools-parent</artifactId>
@@ -49,8 +49,10 @@
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>
52-
<groupId>org.mockito</groupId>
53-
<artifactId>mockito-core</artifactId>
52+
<groupId>software.amazon.lambda</groupId>
53+
<artifactId>powertools-common</artifactId>
54+
<version>${project.version}</version>
55+
<type>test-jar</type>
5456
<scope>test</scope>
5557
</dependency>
5658
<dependency>
@@ -88,35 +90,25 @@
8890
<profiles>
8991
<profile>
9092
<id>generate-graalvm-files</id>
91-
<dependencies>
92-
<dependency>
93-
<groupId>org.mockito</groupId>
94-
<artifactId>mockito-subclass</artifactId>
95-
<scope>test</scope>
96-
</dependency>
97-
</dependencies>
9893
<build>
9994
<plugins>
10095
<plugin>
10196
<groupId>org.apache.maven.plugins</groupId>
10297
<artifactId>maven-surefire-plugin</artifactId>
10398
<version>3.5.3</version>
10499
<configuration>
105-
<argLine>-Dmockito.mock.maker=subclass -Dorg.graalvm.nativeimage.imagecode=agent -agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback,experimental-class-define-support</argLine>
100+
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
101+
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback,experimental-class-define-support
102+
--add-opens java.base/java.util=ALL-UNNAMED
103+
--add-opens java.base/java.lang=ALL-UNNAMED
104+
</argLine>
106105
</configuration>
107106
</plugin>
108107
</plugins>
109108
</build>
110109
</profile>
111110
<profile>
112111
<id>graalvm-native</id>
113-
<dependencies>
114-
<dependency>
115-
<groupId>org.mockito</groupId>
116-
<artifactId>mockito-subclass</artifactId>
117-
<scope>test</scope>
118-
</dependency>
119-
</dependencies>
120112
<build>
121113
<plugins>
122114
<plugin>
@@ -134,37 +126,20 @@
134126
</execution>
135127
</executions>
136128
<configuration>
137-
<agent>
138-
<enabled>true</enabled>
139-
<defaultMode>Standard</defaultMode>
140-
</agent>
141129
<imageName>powertools-logging-logback</imageName>
142130
<buildArgs>
131+
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
132+
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
143133
<buildArg>--no-fallback</buildArg>
144134
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
145-
<buildArg>-H:ClassInitialization=net.bytebuddy.ClassFileVersion:rerun</buildArg>
146-
<buildArg>-H:ClassInitialization=net.bytebuddy.utility.dispatcher.JavaDispatcher:rerun</buildArg>
147-
<buildArg>-H:ClassInitialization=net.bytebuddy.utility.Invoker$Dispatcher:rerun</buildArg>
148-
<buildArg>-H:ClassInitialization=net.bytebuddy.utility.GraalImageCode:rerun</buildArg>
149135
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
150136
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
151137
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
152138
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
153139
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
154-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$AbstractBase</buildArg>
155-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic</buildArg>
156-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic$1</buildArg>
157-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Argument$BindingMechanic$2</buildArg>
158-
<buildArg>--initialize-at-build-time=net.bytebuddy.utility.dispatcher.JavaDispatcher$DynamicClassLoader</buildArg>
159-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$ForLoadedExecutable</buildArg>
160-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$AbstractBase</buildArg>
161-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.type.TypeDescription$ForLoadedType</buildArg>
162-
<buildArg>--initialize-at-build-time=net.bytebuddy.description.method.MethodDescription$ForLoadedMethod</buildArg>
163-
<buildArg>--initialize-at-build-time=net.bytebuddy.implementation.bind.annotation.Super$Instantiation$2</buildArg>
164140
<buildArg>
165-
--trace-class-initialization=net.bytebuddy.description.type.TypeDescription$ForLoadedType,net.bytebuddy.description.method.MethodDescription$ForLoadedMethod,net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$ForLoadedExecutable
141+
--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier$1
166142
</buildArg>
167-
<buildArg>--verbose</buildArg>
168143
</buildArgs>
169144
</configuration>
170145
</plugin>
@@ -225,6 +200,4 @@
225200
</plugin>
226201
</plugins>
227202
</build>
228-
229-
230203
</project>

‎powertools-logging/powertools-logging-logback/src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback/jni-config.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
"name":"org.apache.maven.surefire.booter.ForkedBooter",
1616
"methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
1717
},
18-
{
19-
"name":"sun.instrument.InstrumentationImpl",
20-
"methods":[{"name":"<init>","parameterTypes":["long","boolean","boolean","boolean"] }, {"name":"loadClassAndCallAgentmain","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"loadClassAndCallPremain","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"transform","parameterTypes":["java.lang.Module","java.lang.ClassLoader","java.lang.String","java.lang.Class","java.security.ProtectionDomain","byte[]","boolean"] }]
21-
},
2218
{
2319
"name":"sun.management.VMManagementImpl",
2420
"fields":[{"name":"compTimeMonitoringSupport"}, {"name":"currentThreadCpuTimeSupport"}, {"name":"objectMonitorUsageSupport"}, {"name":"otherThreadCpuTimeSupport"}, {"name":"remoteDiagnosticCommandsSupport"}, {"name":"synchronizerUsageSupport"}, {"name":"threadAllocatedMemorySupport"}, {"name":"threadContentionMonitoringSupport"}]

‎powertools-logging/powertools-logging-logback/src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback/predefined-classes-config.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"type":"agent-extracted",
4+
"classes":[
5+
]
6+
}
7+
]
8+

‎powertools-logging/powertools-logging-logback/src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback/proxy-config.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[
2+
]

‎powertools-logging/powertools-logging-logback/src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback/reflect-config.json‎

Lines changed: 57 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
[
2+
{
3+
"name":"[Ljava.lang.Object;"
4+
},
5+
{
6+
"name":"[Ljava.lang.String;"
7+
},
28
{
39
"name":"ch.qos.logback.classic.joran.SerializedModelConfigurator",
410
"methods":[{"name":"<init>","parameterTypes":[] }]
@@ -21,11 +27,7 @@
2127
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
2228
},
2329
{
24-
"name":"com.amazonaws.services.lambda.runtime.Context",
25-
"queryAllDeclaredMethods":true,
26-
"queryAllPublicMethods":true,
27-
"queryAllDeclaredConstructors":true,
28-
"methods":[{"name":"getAwsRequestId","parameterTypes":[] }, {"name":"getClientContext","parameterTypes":[] }, {"name":"getFunctionName","parameterTypes":[] }, {"name":"getFunctionVersion","parameterTypes":[] }, {"name":"getIdentity","parameterTypes":[] }, {"name":"getInvokedFunctionArn","parameterTypes":[] }, {"name":"getLogGroupName","parameterTypes":[] }, {"name":"getLogStreamName","parameterTypes":[] }, {"name":"getLogger","parameterTypes":[] }, {"name":"getMemoryLimitInMB","parameterTypes":[] }, {"name":"getRemainingTimeInMillis","parameterTypes":[] }]
30+
"name":"com.amazonaws.services.lambda.runtime.Context"
2931
},
3032
{
3133
"name":"com.amazonaws.services.lambda.runtime.events.SQSEvent$MessageAttribute",
@@ -49,12 +51,6 @@
4951
"name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
5052
"methods":[{"name":"<init>","parameterTypes":[] }]
5153
},
52-
{
53-
"name":"com.sun.tools.attach.VirtualMachine"
54-
},
55-
{
56-
"name":"java.io.FilePermission"
57-
},
5854
{
5955
"name":"java.io.IOException"
6056
},
@@ -66,153 +62,110 @@
6662
},
6763
{
6864
"name":"java.io.Serializable",
69-
"queryAllDeclaredMethods":true,
70-
"queryAllDeclaredConstructors":true
71-
},
72-
{
73-
"name":"java.lang.Class",
74-
"methods":[{"name":"forName","parameterTypes":["java.lang.String"] }, {"name":"getAnnotatedInterfaces","parameterTypes":[] }, {"name":"getAnnotatedSuperclass","parameterTypes":[] }, {"name":"getDeclaredMethod","parameterTypes":["java.lang.String","java.lang.Class[]"] }, {"name":"getMethod","parameterTypes":["java.lang.String","java.lang.Class[]"] }, {"name":"getModule","parameterTypes":[] }, {"name":"getNestHost","parameterTypes":[] }, {"name":"getNestMembers","parameterTypes":[] }, {"name":"getPermittedSubclasses","parameterTypes":[] }, {"name":"getRecordComponents","parameterTypes":[] }, {"name":"isNestmateOf","parameterTypes":["java.lang.Class"] }, {"name":"isRecord","parameterTypes":[] }, {"name":"isSealed","parameterTypes":[] }]
75-
},
76-
{
77-
"name":"java.lang.ClassLoader",
78-
"methods":[{"name":"getDefinedPackage","parameterTypes":["java.lang.String"] }, {"name":"getUnnamedModule","parameterTypes":[] }, {"name":"registerAsParallelCapable","parameterTypes":[] }]
65+
"queryAllDeclaredMethods":true
7966
},
8067
{
8168
"name":"java.lang.Cloneable",
8269
"queryAllDeclaredMethods":true
8370
},
8471
{
85-
"name":"java.lang.Module",
86-
"methods":[{"name":"addExports","parameterTypes":["java.lang.String","java.lang.Module"] }, {"name":"addReads","parameterTypes":["java.lang.Module"] }, {"name":"canRead","parameterTypes":["java.lang.Module"] }, {"name":"getClassLoader","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPackages","parameterTypes":[] }, {"name":"getResourceAsStream","parameterTypes":["java.lang.String"] }, {"name":"isExported","parameterTypes":["java.lang.String"] }, {"name":"isExported","parameterTypes":["java.lang.String","java.lang.Module"] }, {"name":"isNamed","parameterTypes":[] }, {"name":"isOpen","parameterTypes":["java.lang.String","java.lang.Module"] }]
87-
},
88-
{
89-
"name":"java.lang.Object",
90-
"queryAllDeclaredMethods":true,
91-
"queryAllDeclaredConstructors":true,
92-
"methods":[{"name":"<init>","parameterTypes":[] }, {"name":"clone","parameterTypes":[] }, {"name":"getClass","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
93-
},
94-
{
95-
"name":"java.lang.ProcessHandle",
96-
"methods":[{"name":"current","parameterTypes":[] }, {"name":"pid","parameterTypes":[] }]
97-
},
98-
{
99-
"name":"java.lang.Runtime",
100-
"methods":[{"name":"version","parameterTypes":[] }]
101-
},
102-
{
103-
"name":"java.lang.Runtime$Version",
104-
"methods":[{"name":"feature","parameterTypes":[] }]
72+
"name":"java.lang.Iterable",
73+
"queryAllDeclaredMethods":true
10574
},
10675
{
107-
"name":"java.lang.RuntimePermission"
76+
"name":"java.lang.Object"
10877
},
10978
{
110-
"name":"java.lang.StackWalker"
79+
"name":"java.lang.String"
11180
},
11281
{
113-
"name":"java.lang.String"
82+
"name":"java.util.AbstractCollection",
83+
"allDeclaredFields":true,
84+
"queryAllDeclaredMethods":true
11485
},
11586
{
116-
"name":"java.lang.System",
117-
"methods":[{"name":"getSecurityManager","parameterTypes":[] }]
87+
"name":"java.util.AbstractList",
88+
"allDeclaredFields":true,
89+
"queryAllDeclaredMethods":true
11890
},
11991
{
120-
"name":"java.lang.annotation.Retention",
121-
"queryAllDeclaredMethods":true,
122-
"queryAllDeclaredConstructors":true
92+
"name":"java.util.AbstractMap",
93+
"allDeclaredFields":true,
94+
"queryAllDeclaredMethods":true
12395
},
12496
{
125-
"name":"java.lang.annotation.Target",
97+
"name":"java.util.Arrays$ArrayList",
98+
"allDeclaredFields":true,
12699
"queryAllDeclaredMethods":true,
127100
"queryAllDeclaredConstructors":true
128101
},
129102
{
130-
"name":"java.lang.invoke.MethodHandle",
131-
"methods":[{"name":"bindTo","parameterTypes":["java.lang.Object"] }, {"name":"invokeWithArguments","parameterTypes":["java.lang.Object[]"] }]
132-
},
133-
{
134-
"name":"java.lang.invoke.MethodHandles",
135-
"methods":[{"name":"lookup","parameterTypes":[] }]
136-
},
137-
{
138-
"name":"java.lang.invoke.MethodHandles$Lookup",
139-
"methods":[{"name":"findVirtual","parameterTypes":["java.lang.Class","java.lang.String","java.lang.invoke.MethodType"] }]
140-
},
141-
{
142-
"name":"java.lang.invoke.MethodType",
143-
"methods":[{"name":"methodType","parameterTypes":["java.lang.Class","java.lang.Class[]"] }]
144-
},
145-
{
146-
"name":"java.lang.reflect.AccessibleObject",
147-
"methods":[{"name":"setAccessible","parameterTypes":["boolean"] }]
148-
},
149-
{
150-
"name":"java.lang.reflect.AnnotatedArrayType",
151-
"methods":[{"name":"getAnnotatedGenericComponentType","parameterTypes":[] }]
152-
},
153-
{
154-
"name":"java.lang.reflect.AnnotatedType",
155-
"methods":[{"name":"getType","parameterTypes":[] }]
156-
},
157-
{
158-
"name":"java.lang.reflect.Executable",
159-
"methods":[{"name":"getAnnotatedExceptionTypes","parameterTypes":[] }, {"name":"getAnnotatedParameterTypes","parameterTypes":[] }, {"name":"getAnnotatedReceiverType","parameterTypes":[] }, {"name":"getParameterCount","parameterTypes":[] }, {"name":"getParameters","parameterTypes":[] }]
103+
"name":"java.util.Collection",
104+
"queryAllDeclaredMethods":true
160105
},
161106
{
162-
"name":"java.lang.reflect.Method",
163-
"methods":[{"name":"getAnnotatedReturnType","parameterTypes":[] }]
107+
"name":"java.util.Collections$SingletonMap",
108+
"allDeclaredFields":true,
109+
"queryAllDeclaredMethods":true,
110+
"queryAllDeclaredConstructors":true
164111
},
165112
{
166-
"name":"java.lang.reflect.Parameter",
167-
"methods":[{"name":"getModifiers","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"isNamePresent","parameterTypes":[] }]
113+
"name":"java.util.List",
114+
"queryAllDeclaredMethods":true
168115
},
169116
{
170-
"name":"java.net.NetPermission"
117+
"name":"java.util.Map",
118+
"queryAllDeclaredMethods":true
171119
},
172120
{
173-
"name":"java.net.SocketPermission"
121+
"name":"java.util.RandomAccess",
122+
"queryAllDeclaredMethods":true
174123
},
175124
{
176-
"name":"java.net.URLPermission",
177-
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
125+
"name":"java.util.concurrent.atomic.AtomicBoolean",
126+
"fields":[{"name":"value"}]
178127
},
179128
{
180-
"name":"java.security.AccessController",
181-
"methods":[{"name":"doPrivileged","parameterTypes":["java.security.PrivilegedAction"] }, {"name":"doPrivileged","parameterTypes":["java.security.PrivilegedExceptionAction"] }]
129+
"name":"java.util.concurrent.atomic.AtomicReference",
130+
"fields":[{"name":"value"}]
182131
},
183132
{
184-
"name":"java.security.AllPermission"
133+
"name":"kotlin.Metadata"
185134
},
186135
{
187-
"name":"java.security.SecurityPermission"
136+
"name":"org.apache.maven.surefire.junitplatform.JUnitPlatformProvider",
137+
"methods":[{"name":"<init>","parameterTypes":["org.apache.maven.surefire.api.provider.ProviderParameters"] }]
188138
},
189139
{
190-
"name":"java.util.PropertyPermission"
140+
"name":"org.apiguardian.api.API",
141+
"queryAllPublicMethods":true
191142
},
192143
{
193-
"name":"java.util.concurrent.ForkJoinTask",
194-
"fields":[{"name":"aux"}, {"name":"status"}]
144+
"name":"org.junit.internal.AssumptionViolatedException"
195145
},
196146
{
197-
"name":"java.util.concurrent.atomic.AtomicBoolean",
198-
"fields":[{"name":"value"}]
147+
"name":"org.junit.jupiter.api.ClassOrderer$OrderAnnotation",
148+
"methods":[{"name":"<init>","parameterTypes":[] }]
199149
},
200150
{
201-
"name":"java.util.concurrent.atomic.AtomicReference",
202-
"fields":[{"name":"value"}]
151+
"name":"org.junit.jupiter.api.Order",
152+
"queryAllPublicMethods":true
203153
},
204154
{
205-
"name":"javax.smartcardio.CardPermission"
155+
"name":"org.junit.jupiter.api.Test",
156+
"queryAllPublicMethods":true
206157
},
207158
{
208-
"name":"jdk.internal.misc.Unsafe"
159+
"name":"org.junit.platform.commons.annotation.Testable",
160+
"queryAllPublicMethods":true
209161
},
210162
{
211-
"name":"kotlin.jvm.JvmInline"
163+
"name":"org.junit.platform.launcher.LauncherSession",
164+
"methods":[{"name":"getLauncher","parameterTypes":[] }]
212165
},
213166
{
214-
"name":"org.apiguardian.api.API",
215-
"queryAllPublicMethods":true
167+
"name":"org.junit.platform.launcher.core.LauncherFactory",
168+
"methods":[{"name":"openSession","parameterTypes":[] }]
216169
},
217170
{
218171
"name":"software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor",
@@ -282,9 +235,5 @@
282235
"name":"software.amazon.lambda.powertools.logging.logback.LambdaJsonEncoder",
283236
"queryAllPublicMethods":true,
284237
"methods":[{"name":"<init>","parameterTypes":[] }]
285-
},
286-
{
287-
"name":"sun.reflect.ReflectionFactory",
288-
"methods":[{"name":"getReflectionFactory","parameterTypes":[] }, {"name":"newConstructorForSerialization","parameterTypes":["java.lang.Class","java.lang.reflect.Constructor"] }]
289238
}
290239
]

0 commit comments

Comments
 (0)