Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade XStream to version 1.4.19

Browse Source 
This commit also improves the XStreamUnmarshallingTests
This commit is contained in:
Mahmoud Ben Hassine
2022-03-16 18:03:01 +01:00
parent 9cbde4eea6
commit 25375ccc40
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -75,7 +75,7 @@
<jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
<neo4j-ogm-core.version>3.2.28</neo4j-ogm-core.version>
<mongodb-driver-sync.version>4.5.0</mongodb-driver-sync.version>
<xstream.version>1.4.18</xstream.version>
<xstream.version>1.4.19</xstream.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<!-- test dependencies -->

13
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2010-2021 the original author or authors.
* Copyright 2010-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@ import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
import com.thoughtworks.xstream.security.ArrayTypePermission;
import com.thoughtworks.xstream.security.ExplicitTypePermission;
import com.thoughtworks.xstream.security.WildcardTypePermission;
import org.springframework.batch.item.xml.domain.Trade;
import org.springframework.oxm.Unmarshaller;
@@ -30,19 +28,16 @@ import org.springframework.oxm.xstream.XStreamMarshaller;
public class XStreamUnmarshallingTests extends AbstractStaxEventReaderItemReaderTests {
@Override
protected Unmarshaller getUnmarshaller() throws Exception {
protected Unmarshaller getUnmarshaller() {
XStreamMarshaller unmarshaller = new XStreamMarshaller();
Map<String,Class<?>> aliasesMap = new HashMap<>();
aliasesMap.put("trade", Trade.class);
aliasesMap.put("isin", String.class);
aliasesMap.put("customer", String.class);
aliasesMap.put("price", BigDecimal.class);
/*unmarshaller.addAlias("trade", Trade.class);
unmarshaller.addAlias("isin", String.class);
unmarshaller.addAlias("customer", String.class);
unmarshaller.addAlias("price", BigDecimal.class);*/
unmarshaller.setAliases(aliasesMap);
unmarshaller.setTypePermissions(new ExplicitTypePermission(new String[]{"org.springframework.batch.item.xml.domain.Trade"}));
ExplicitTypePermission typePermission = new ExplicitTypePermission(new Class[]{Trade.class});
unmarshaller.setTypePermissions(typePermission);
return unmarshaller;
}