diff --git a/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java index 254ead4a7..792644bfa 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2012-2014 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. @@ -34,7 +34,7 @@ public class OrderAdapter extends XmlAdapter { * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override - public OrderDto marshal(Order order) throws Exception { + public OrderDto marshal(Order order) { if (order == null) { return null; @@ -51,7 +51,7 @@ public class OrderAdapter extends XmlAdapter { * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override - public Order unmarshal(OrderDto source) throws Exception { + public Order unmarshal(OrderDto source) { return source == null ? null : new Order(source.direction, source.property); } } diff --git a/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java index 82847a202..6b770befd 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java @@ -36,7 +36,7 @@ public class PageAdapter extends XmlAdapter> { * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override - public PageDto marshal(Page source) throws Exception { + public PageDto marshal(Page source) { if (source == null) { return null; @@ -54,7 +54,7 @@ public class PageAdapter extends XmlAdapter> { * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override - public Page unmarshal(PageDto v) throws Exception { + public Page unmarshal(PageDto v) { return null; } diff --git a/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java index 1a205bf11..9b3491b68 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2012-2014 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. @@ -38,7 +38,7 @@ class PageableAdapter extends XmlAdapter { * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override - public PageRequestDto marshal(Pageable request) throws Exception { + public PageRequestDto marshal(Pageable request) { SortDto sortDto = SortAdapter.INSTANCE.marshal(request.getSort()); @@ -55,7 +55,7 @@ class PageableAdapter extends XmlAdapter { * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override - public Pageable unmarshal(PageRequestDto v) throws Exception { + public Pageable unmarshal(PageRequestDto v) { if (v.orders.isEmpty()) { return new PageRequest(v.page, v.size); diff --git a/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java index 3113bc6f7..9d00eb296 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2012-2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.domain.jaxb; import javax.xml.bind.annotation.adapters.XmlAdapter; @@ -19,7 +34,7 @@ public class SortAdapter extends XmlAdapter { * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override - public SortDto marshal(Sort source) throws Exception { + public SortDto marshal(Sort source) { if (source == null) { return null; @@ -36,7 +51,7 @@ public class SortAdapter extends XmlAdapter { * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override - public Sort unmarshal(SortDto source) throws Exception { + public Sort unmarshal(SortDto source) { return source == null ? null : new Sort(SpringDataJaxb.unmarshal(source.orders, OrderAdapter.INSTANCE)); } } diff --git a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java index c529aeb9d..7b86ababd 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java +++ b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java @@ -57,10 +57,8 @@ public class SpringDataJaxb { @XmlAccessorType(XmlAccessType.FIELD) public static class PageRequestDto { - @XmlAttribute - int page, size; - @XmlElement(name = "order", namespace = NAMESPACE) - List orders = new ArrayList(); + @XmlAttribute int page, size; + @XmlElement(name = "order", namespace = NAMESPACE) List orders = new ArrayList(); } /** @@ -72,8 +70,7 @@ public class SpringDataJaxb { @XmlAccessorType(XmlAccessType.FIELD) public static class SortDto { - @XmlElement(name = "order", namespace = SpringDataJaxb.NAMESPACE) - List orders = new ArrayList(); + @XmlElement(name = "order", namespace = SpringDataJaxb.NAMESPACE) List orders = new ArrayList(); } /** @@ -85,10 +82,8 @@ public class SpringDataJaxb { @XmlAccessorType(XmlAccessType.FIELD) public static class OrderDto { - @XmlAttribute - String property; - @XmlAttribute - Direction direction; + @XmlAttribute String property; + @XmlAttribute Direction direction; } /** @@ -100,9 +95,7 @@ public class SpringDataJaxb { @XmlAccessorType(XmlAccessType.FIELD) public static class PageDto extends ResourceSupport { - @XmlAnyElement - @XmlElementWrapper(name = "content") - List content; + @XmlAnyElement @XmlElementWrapper(name = "content") List content; } /** @@ -113,7 +106,7 @@ public class SpringDataJaxb { * @return * @throws Exception */ - public static List unmarshal(Collection source, XmlAdapter adapter) throws Exception { + public static List unmarshal(Collection source, XmlAdapter adapter) { Assert.notNull(adapter); @@ -122,8 +115,13 @@ public class SpringDataJaxb { } List result = new ArrayList(source.size()); + for (S element : source) { - result.add(adapter.unmarshal(element)); + try { + result.add(adapter.unmarshal(element)); + } catch (Exception o_O) { + throw new RuntimeException(o_O); + } } return result; } @@ -136,7 +134,7 @@ public class SpringDataJaxb { * @return * @throws Exception */ - public static List marshal(Iterable source, XmlAdapter adapter) throws Exception { + public static List marshal(Iterable source, XmlAdapter adapter) { Assert.notNull(adapter); @@ -145,9 +143,15 @@ public class SpringDataJaxb { } List result = new ArrayList(); + for (T element : source) { - result.add(adapter.marshal(element)); + try { + result.add(adapter.marshal(element)); + } catch (Exception o_O) { + throw new RuntimeException(o_O); + } } + return result; } } diff --git a/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java b/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java index 488967574..988a5b494 100644 --- a/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java +++ b/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java @@ -64,7 +64,7 @@ public class MappingInstantiationException extends RuntimeException { private MappingInstantiationException(PersistentEntity entity, List arguments, String message, Exception cause) { - super(buildExceptionMessage(entity, arguments, null), cause); + super(buildExceptionMessage(entity, arguments, message), cause); this.entityType = entity == null ? null : entity.getType(); this.constructor = entity == null || entity.getPersistenceConstructor() == null ? null : entity diff --git a/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java b/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java index b79f4b481..9a83a1c0f 100644 --- a/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java +++ b/src/main/java/org/springframework/data/repository/init/AbstractRepositoryPopulatorFactoryBean.java @@ -71,7 +71,7 @@ public abstract class AbstractRepositoryPopulatorFactoryBean extends * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance() */ @Override - protected ResourceReaderRepositoryPopulator createInstance() throws Exception { + protected ResourceReaderRepositoryPopulator createInstance() { ResourceReaderRepositoryPopulator initializer = new ResourceReaderRepositoryPopulator(getResourceReader()); initializer.setResources(resources); diff --git a/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java b/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java index b47756af6..90a743a29 100644 --- a/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java +++ b/src/main/java/org/springframework/data/repository/init/Jackson2ResourceReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2014 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. diff --git a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java index 890ddcecf..5084ddff9 100644 --- a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java @@ -225,7 +225,7 @@ public class PageableHandlerMethodArgumentResolver implements HandlerMethodArgum */ @Override public Pageable resolveArgument(MethodParameter methodParameter, ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { assertPageableUniqueness(methodParameter); diff --git a/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java b/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java index a0fcd9ebe..a81a6fce9 100644 --- a/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/PagedResourcesAssemblerArgumentResolver.java @@ -80,7 +80,7 @@ public class PagedResourcesAssemblerArgumentResolver implements HandlerMethodArg */ @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { UriComponents fromUriString = resolveBaseUri(parameter); MethodParameter pageableParameter = findMatchingPageableParameter(parameter); diff --git a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java index 7b9d5e9b8..8fd8ff6d7 100644 --- a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java @@ -118,7 +118,7 @@ public class SortHandlerMethodArgumentResolver implements HandlerMethodArgumentR */ @Override public Sort resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { String[] directionParameter = webRequest.getParameterValues(getSortParameter(parameter));