From 13873dafb7355508f7760f2801e5c93e47216600 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 22 Jul 2018 17:55:31 +0200 Subject: [PATCH] Polishing --- .../InjectAnnotationBeanPostProcessorTests.java | 14 ++++++-------- .../remoting/rmi/RmiServiceExporter.java | 1 + .../springframework/oxm/jibx/JibxMarshaller.java | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index 9bcac1203c..cc56cccb54 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -47,7 +47,7 @@ import static org.junit.Assert.*; /** * Unit tests for {@link org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor} - * processing the JSR-303 {@link javax.inject.Inject} annotation. + * processing the JSR-330 {@link javax.inject.Inject} annotation. * * @author Juergen Hoeller * @since 3.0 @@ -550,11 +550,9 @@ public class InjectAnnotationBeanPostProcessorTests { } /** - * Verifies that a dependency on a {@link org.springframework.beans.factory.FactoryBean} can be autowired via - * {@link org.springframework.beans.factory.annotation.Autowired @Inject}, specifically addressing the JIRA issue - * raised in SPR-4040. + * Verifies that a dependency on a {@link org.springframework.beans.factory.FactoryBean} + * can be autowired via {@link org.springframework.beans.factory.annotation.Autowired @Inject}, + * specifically addressing SPR-4040. */ @Test public void testBeanAutowiredWithFactoryBean() { @@ -1315,7 +1313,7 @@ public class InjectAnnotationBeanPostProcessorTests { public static class StringFactoryBean implements FactoryBean { @Override - public String getObject() throws Exception { + public String getObject() { return ""; } diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java index ff20d24430..e245fffbad 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java @@ -458,4 +458,5 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing } } } + } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java index f3ecf27eb2..f74860908c 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java @@ -294,7 +294,8 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe private void marshalDocument(IMarshallingContext marshallingContext, Object graph) throws IOException, JiBXException { if (StringUtils.hasLength(this.docTypeRootElementName)) { IXMLWriter xmlWriter = marshallingContext.getXmlWriter(); - xmlWriter.writeDocType(this.docTypeRootElementName, this.docTypeSystemId, this.docTypePublicId, this.docTypeInternalSubset); + xmlWriter.writeDocType(this.docTypeRootElementName, this.docTypeSystemId, + this.docTypePublicId, this.docTypeInternalSubset); } marshallingContext.marshalDocument(graph); }