You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/02/23 17:11:46 UTC
[isis] 06/06: ISIS-1867: caches JAXBContext (backported from
2.0.0-M1)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9bd76acb1d97a23b4776f39c6ab408dc79de214d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 17:07:37 2018 +0000
ISIS-1867: caches JAXBContext (backported from 2.0.0-M1)
---
.../org/apache/isis/applib/services/jaxb/JaxbService.java | 7 +++----
.../metamodel/services/grid/GridLoaderServiceDefault.java | 12 ++++++++++--
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index 2ff7c01..a0d50d5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -31,7 +31,6 @@ import javax.xml.bind.Unmarshaller;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
-import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
import org.apache.isis.applib.ApplicationException;
@@ -104,7 +103,7 @@ public interface JaxbService {
@Override
public Object fromXml(final JAXBContext jaxbContext, final String xml) {
- return fromXml(jaxbContext, xml, Maps.newHashMap());
+ return fromXml(jaxbContext, xml, Maps.<String,Object>newHashMap());
}
@Override
public Object fromXml(final JAXBContext jaxbContext, final String xml, final Map<String, Object> unmarshallerProperties) {
@@ -128,7 +127,7 @@ public interface JaxbService {
@Override
public <T> T fromXml(final Class<T> domainClass, final String xml) {
- return fromXml(domainClass, xml, Maps.newHashMap());
+ return fromXml(domainClass, xml, Maps.<String,Object>newHashMap());
}
@Override
public <T> T fromXml(final Class<T> domainClass, final String xml, final Map<String, Object> unmarshallerProperties) {
@@ -146,7 +145,7 @@ public interface JaxbService {
@Override
public String toXml(final Object domainObject) {
- return toXml(domainObject, Maps.newHashMap());
+ return toXml(domainObject, Maps.<String,Object>newHashMap());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index bb9d9c3..cf9d0cf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.annotation.PostConstruct;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -67,10 +68,17 @@ public class GridLoaderServiceDefault implements GridLoaderService {
final List<Class<? extends Grid>> pageImplementations =
FluentIterable.from(gridSystemServices)
.transform(
- (Function<GridSystemService, Class<? extends Grid>>) gss -> gss.gridImplementation())
+ //(Function<GridSystemService, Class<? extends Grid>>) gss -> gss.gridImplementation()
+ new Function<GridSystemService, Class<? extends Grid>>() {
+ @Override
+ public Class<? extends Grid> apply(final GridSystemService input) {
+ return input.gridImplementation();
+ }
+ }
+ )
.toList();
- final Class[] clazz = pageImplementations.toArray(_Constants.emptyClasses);
+ final Class[] clazz = pageImplementations.toArray(new Class[0]);
try {
jaxbContext = JAXBContext.newInstance(clazz);
} catch (JAXBException e) {
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.