From 01a71ef5ef9893b74578d25597894b84e9bdcd8c Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 24 Jul 2013 13:40:15 +0200
Subject: [PATCH] Polishing

---
 .../aop/framework/DefaultAopProxyFactory.java |  3 +--
 .../annotation/ConfigurationClass.java        |  6 +++---
 .../oxm/config/oxmNamespaceHandlerTest.xml    | 21 +++++++++----------
 .../org/springframework/http/MediaType.java   |  4 ++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
index 5d3640677a..b00eafce08 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -48,7 +48,6 @@ import org.springframework.aop.SpringProxy;
 @SuppressWarnings("serial")
 public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 
-
 	@Override
 	public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {
 		if (config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config)) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
index 9138e2357f..38f6aaac2b 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
@@ -152,7 +152,7 @@ final class ConfigurationClass {
 	 * @see #getImportedBy()
 	 */
 	public boolean isImported() {
-		return this.importedBy != null;
+		return (this.importedBy != null);
 	}
 
 	/**
@@ -162,7 +162,7 @@ final class ConfigurationClass {
 	 * @see #isImported()
 	 */
 	public ConfigurationClass getImportedBy() {
-		return importedBy;
+		return this.importedBy;
 	}
 
 	public void addBeanMethod(BeanMethod method) {
@@ -203,7 +203,7 @@ final class ConfigurationClass {
 		for (BeanMethod beanMethod : this.beanMethods) {
 			String fqMethodName = beanMethod.getFullyQualifiedMethodName();
 			Integer currentCount = methodNameCounts.get(fqMethodName);
-			int newCount = currentCount != null ? currentCount + 1 : 1;
+			int newCount = (currentCount != null ? currentCount + 1 : 1);
 			methodNameCounts.put(fqMethodName, newCount);
 		}
 		for (String fqMethodName : methodNameCounts.keySet()) {
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
index 9e7385f5ae..1575171042 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oxm="http://www.springframework.org/schema/oxm"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
        http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd">
 
 	<!-- XMLBeans -->
-	<oxm:xmlbeans-marshaller id="xmlBeansMarshaller"
-		options="xmlBeansOptions" />
+	<oxm:xmlbeans-marshaller id="xmlBeansMarshaller" options="xmlBeansOptions"/>
 
 	<bean id="xmlBeansOptions" class="org.springframework.oxm.xmlbeans.XmlOptionsFactoryBean">
 		<property name="options">
@@ -17,22 +16,22 @@
 	</bean>
 
 	<!-- JAXB2 -->
-	<oxm:jaxb2-marshaller id="jaxb2ContextPathMarshaller"
-		contextPath="org.springframework.oxm.jaxb.test" />
+	<oxm:jaxb2-marshaller id="jaxb2ContextPathMarshaller" contextPath="org.springframework.oxm.jaxb.test"/>
 
 	<oxm:jaxb2-marshaller id="jaxb2ClassesMarshaller">
-		<oxm:class-to-be-bound name="org.springframework.oxm.jaxb.test.Flights" />
-		<oxm:class-to-be-bound name="org.springframework.oxm.jaxb.test.FlightType" />
+		<oxm:class-to-be-bound name="org.springframework.oxm.jaxb.test.Flights"/>
+		<oxm:class-to-be-bound name="org.springframework.oxm.jaxb.test.FlightType"/>
 	</oxm:jaxb2-marshaller>
 
 	<!-- Castor -->
 	
-	<oxm:castor-marshaller id="castorEncodingMarshaller" encoding="ISO-8859-1" />
+	<oxm:castor-marshaller id="castorEncodingMarshaller" encoding="ISO-8859-1"/>
 
-	<oxm:castor-marshaller id="castorTargetClassMarshaller" target-class="org.springframework.oxm.castor.Flight" />
+	<oxm:castor-marshaller id="castorTargetClassMarshaller" target-class="org.springframework.oxm.castor.Flight"/>
 
-	<oxm:castor-marshaller id="castorTargetPackageMarshaller" target-package="org.springframework.oxm.castor" />
+	<oxm:castor-marshaller id="castorTargetPackageMarshaller" target-package="org.springframework.oxm.castor"/>
 
 	<oxm:castor-marshaller id="castorMappingLocationMarshaller"
-						   mapping-location="classpath:org/springframework/oxm/castor/mapping.xml" />
+						   mapping-location="classpath:org/springframework/oxm/castor/mapping.xml"/>
+
 </beans>
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index fd9036d587..fee2336466 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -403,7 +403,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * Indicates whether the {@linkplain #getType() type} is the wildcard character {@code &#42;} or not.
 	 */
 	public boolean isWildcardType() {
-		return WILDCARD_TYPE.equals(type);
+		return WILDCARD_TYPE.equals(this.type);
 	}
 
 	/**
@@ -419,7 +419,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * @return whether the subtype is {@code &#42;}
 	 */
 	public boolean isWildcardSubtype() {
-		return WILDCARD_TYPE.equals(subtype) || subtype.startsWith("*+");
+		return WILDCARD_TYPE.equals(this.subtype) || this.subtype.startsWith("*+");
 	}
 
 	/**
-- 
GitLab