forked from quarkusio/quarkus
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Avoid XStream causing illegal access issues for internal JDK collections
Relates to: quarkusio#24492
- Loading branch information
Showing
3 changed files
with
85 additions
and
1 deletion.
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomListConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package io.quarkus.test.junit.internal; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Set; | ||
|
||
import com.thoughtworks.xstream.converters.collections.CollectionConverter; | ||
import com.thoughtworks.xstream.mapper.Mapper; | ||
|
||
/** | ||
* A custom List converter that always uses ArrayList for unmarshalling. | ||
* This is probably not semantically correct 100% of the time, but it's likely fine | ||
* for all the cases where we are using marshalling / unmarshalling. | ||
* | ||
* The reason for doing this is to avoid XStream causing illegal access issues | ||
* for internal JDK lists | ||
*/ | ||
public class CustomListConverter extends CollectionConverter { | ||
|
||
// if we wanted to be 100% sure, we'd list all the List.of methods, but I think it's pretty safe to say | ||
// that the JDK won't add custom implementations for the other classes | ||
private final Set<String> SUPPORTED_CLASS_NAMES = Set.of( | ||
List.of().getClass().getName(), | ||
List.of(new Object()).getClass().getName(), | ||
Arrays.asList(new Object()).getClass().getName(), | ||
Collections.emptyList().getClass().getName()); | ||
|
||
public CustomListConverter(Mapper mapper) { | ||
super(mapper); | ||
} | ||
|
||
@Override | ||
public boolean canConvert(Class type) { | ||
return (type != null) && SUPPORTED_CLASS_NAMES.contains(type.getName()); | ||
} | ||
|
||
@Override | ||
protected Object createCollection(Class type) { | ||
return new ArrayList<>(); | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/CustomSetConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package io.quarkus.test.junit.internal; | ||
|
||
import java.util.Collections; | ||
import java.util.HashSet; | ||
import java.util.Set; | ||
|
||
import com.thoughtworks.xstream.converters.collections.CollectionConverter; | ||
import com.thoughtworks.xstream.mapper.Mapper; | ||
|
||
/** | ||
* A custom Set converter that always uses HashSet for unmarshalling. | ||
* This is probably not semantically correct 100% of the time, but it's likely fine | ||
* for all the cases where we are using marshalling / unmarshalling. | ||
* | ||
* The reason for doing this is to avoid XStream causing illegal access issues | ||
* for internal JDK sets | ||
*/ | ||
public class CustomSetConverter extends CollectionConverter { | ||
|
||
// if we wanted to be 100% sure, we'd list all the Set.of methods, but I think it's pretty safe to say | ||
// that the JDK won't add custom implementations for the other classes | ||
private final Set<String> SUPPORTED_CLASS_NAMES = Set.of( | ||
Set.of().getClass().getName(), | ||
Set.of(new Object()).getClass().getName(), | ||
Collections.emptySet().getClass().getName()); | ||
|
||
public CustomSetConverter(Mapper mapper) { | ||
super(mapper); | ||
} | ||
|
||
@Override | ||
public boolean canConvert(Class type) { | ||
return (type != null) && SUPPORTED_CLASS_NAMES.contains(type.getName()); | ||
} | ||
|
||
@Override | ||
protected Object createCollection(Class type) { | ||
return new HashSet<>(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters