Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
7a82660b
Commit
7a82660b
authored
May 09, 2017
by
Andy Wilkinson
Committed by
Stephane Nicoll
Aug 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ModifiedClassPathRunner compatible with JDK 9
Closes gh-10020
parent
a07833fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
7 deletions
+31
-7
ModifiedClassPathRunner.java
...testsupport/runner/classpath/ModifiedClassPathRunner.java
+31
-7
No files found.
spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java
View file @
7a82660b
...
@@ -18,6 +18,7 @@ package org.springframework.boot.testsupport.runner.classpath;
...
@@ -18,6 +18,7 @@ package org.springframework.boot.testsupport.runner.classpath;
import
java.io.File
;
import
java.io.File
;
import
java.lang.annotation.Annotation
;
import
java.lang.annotation.Annotation
;
import
java.lang.management.ManagementFactory
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Method
;
import
java.net.URL
;
import
java.net.URL
;
import
java.net.URLClassLoader
;
import
java.net.URLClassLoader
;
...
@@ -27,6 +28,7 @@ import java.util.Collections;
...
@@ -27,6 +28,7 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.List
;
import
java.util.jar.Attributes
;
import
java.util.jar.Attributes
;
import
java.util.jar.JarFile
;
import
java.util.jar.JarFile
;
import
java.util.stream.Stream
;
import
org.apache.maven.repository.internal.MavenRepositorySystemUtils
;
import
org.apache.maven.repository.internal.MavenRepositorySystemUtils
;
import
org.eclipse.aether.DefaultRepositorySystemSession
;
import
org.eclipse.aether.DefaultRepositorySystemSession
;
...
@@ -87,33 +89,55 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner {
...
@@ -87,33 +89,55 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner {
}
}
private
URLClassLoader
createTestClassLoader
(
Class
<?>
testClass
)
throws
Exception
{
private
URLClassLoader
createTestClassLoader
(
Class
<?>
testClass
)
throws
Exception
{
URLClassLoader
classLoader
=
(
URLClassLoader
)
this
.
getClass
().
getClassLoader
();
ClassLoader
classLoader
=
this
.
getClass
().
getClassLoader
();
return
new
ModifiedClassPathClassLoader
(
return
new
ModifiedClassPathClassLoader
(
processUrls
(
extractUrls
(
classLoader
),
testClass
),
classLoader
.
getParent
(),
processUrls
(
extractUrls
(
classLoader
),
testClass
),
classLoader
.
getParent
(),
classLoader
);
classLoader
);
}
}
private
URL
[]
extractUrls
(
URL
ClassLoader
classLoader
)
throws
Exception
{
private
URL
[]
extractUrls
(
ClassLoader
classLoader
)
throws
Exception
{
List
<
URL
>
extractedUrls
=
new
ArrayList
<>();
List
<
URL
>
extractedUrls
=
new
ArrayList
<>();
for
(
URL
url
:
classLoader
.
getURLs
())
{
doExtractUrls
(
classLoader
).
forEach
((
URL
url
)
->
{
if
(
isSurefireBooterJar
(
url
))
{
if
(
isSurefireBooterJar
(
url
))
{
extractedUrls
.
addAll
(
extractUrlsFromManifestClassPath
(
url
));
extractedUrls
.
addAll
(
extractUrlsFromManifestClassPath
(
url
));
}
}
else
{
else
{
extractedUrls
.
add
(
url
);
extractedUrls
.
add
(
url
);
}
}
}
}
);
return
extractedUrls
.
toArray
(
new
URL
[
extractedUrls
.
size
()]);
return
extractedUrls
.
toArray
(
new
URL
[
extractedUrls
.
size
()]);
}
}
private
Stream
<
URL
>
doExtractUrls
(
ClassLoader
classLoader
)
throws
Exception
{
if
(
classLoader
instanceof
URLClassLoader
)
{
return
Stream
.
of
(((
URLClassLoader
)
classLoader
).
getURLs
());
}
return
Stream
.
of
(
ManagementFactory
.
getRuntimeMXBean
().
getClassPath
()
.
split
(
File
.
pathSeparator
)).
map
(
this
::
toURL
);
}
private
URL
toURL
(
String
entry
)
{
try
{
return
new
File
(
entry
).
toURI
().
toURL
();
}
catch
(
Exception
ex
)
{
throw
new
IllegalArgumentException
(
ex
);
}
}
private
boolean
isSurefireBooterJar
(
URL
url
)
{
private
boolean
isSurefireBooterJar
(
URL
url
)
{
return
url
.
getPath
().
contains
(
"surefirebooter"
);
return
url
.
getPath
().
contains
(
"surefirebooter"
);
}
}
private
List
<
URL
>
extractUrlsFromManifestClassPath
(
URL
booterJar
)
throws
Exception
{
private
List
<
URL
>
extractUrlsFromManifestClassPath
(
URL
booterJar
)
{
List
<
URL
>
urls
=
new
ArrayList
<>();
List
<
URL
>
urls
=
new
ArrayList
<>();
for
(
String
entry
:
getClassPath
(
booterJar
))
{
try
{
urls
.
add
(
new
URL
(
entry
));
for
(
String
entry
:
getClassPath
(
booterJar
))
{
urls
.
add
(
new
URL
(
entry
));
}
}
catch
(
Exception
ex
)
{
throw
new
RuntimeException
(
ex
);
}
}
return
urls
;
return
urls
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment