Skip to content

Address EditorConfig violations #36994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BaumiCoder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Address EditorConfig violations #36994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...ation-tests/src/test/resources/org/springframework/beans/factory/xml/component-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?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:foo="http://www.foo.example/schema/component"
xsi:schemaLocation="
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:foo="http://www.foo.example/schema/component"
xsi:schemaLocation="
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.foo.example/schema/component http://www.foo.example/schema/component/component.xsd">

<foo:component id="bionic-family" name="Bionic-1">
<foo:component name="Mother-1">
<foo:component name="Karate-1"/>
<foo:component name="Sport-1"/>
</foo:component>
<foo:component name="Rock-1"/>
</foo:component>
<foo:component id="bionic-family" name="Bionic-1">
<foo:component name="Mother-1">
<foo:component name="Karate-1"/>
<foo:component name="Sport-1"/>
</foo:component>
<foo:component name="Rock-1"/>
</foo:component>

</beans>
26 changes: 13 additions & 13 deletions integration-tests/src/test/resources/org/springframework/beans/factory/xml/component.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<xsd:schema xmlns="http://www.foo.example/schema/component"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.foo.example/schema/component"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.foo.example/schema/component"
elementFormDefault="qualified"
attributeFormDefault="unqualified">

<xsd:element name="component">
<xsd:complexType>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element ref="component"/>
</xsd:choice>
<xsd:attribute name="id" type="xsd:ID"/>
<xsd:attribute name="name" use="required" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="component">
<xsd:complexType>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element ref="component"/>
</xsd:choice>
<xsd:attribute name="id" type="xsd:ID"/>
<xsd:attribute name="name" use="required" type="xsd:string"/>
</xsd:complexType>
</xsd:element>

</xsd:schema>
2 changes: 1 addition & 1 deletion ...st/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<context:component-scan base-package="org.springframework.context.annotation">
<context:exclude-filter type="annotation"
expression="org.springframework.context.annotation.Configuration"/>
expression="org.springframework.context.annotation.Configuration"/>
</context:component-scan>

<context:load-time-weaver aspectj-weaving="off"/>
Expand Down
2 changes: 1 addition & 1 deletion ...t/resources/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">

<beans>

Expand Down
4 changes: 2 additions & 2 deletions ...spects/src/test/resources/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:cache="http://www.springframework.org/schema/cache"
xmlns:cache="http://www.springframework.org/schema/cache"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd
http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache-3.1.xsd
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-2.5.xsd">

<aop:aspectj-autoproxy/>

Expand Down
12 changes: 6 additions & 6 deletions ...mh/resources/org/springframework/beans/factory/ConcurrentBeanFactoryBenchmark-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">

<bean id="bean1" class="org.springframework.beans.factory.ConcurrentBeanFactoryBenchmark$ConcurrentBean"
<bean id="bean1" class="org.springframework.beans.factory.ConcurrentBeanFactoryBenchmark$ConcurrentBean"
scope="prototype">
<property name="date" value="2004/08/08"/>
</bean>
<property name="date" value="2004/08/08"/>
</bean>

<bean id="bean2" class="org.springframework.beans.factory.ConcurrentBeanFactoryBenchmark$ConcurrentBean"
<bean id="bean2" class="org.springframework.beans.factory.ConcurrentBeanFactoryBenchmark$ConcurrentBean"
scope="prototype">
<property name="date" value="2000/02/02"/>
</bean>
<property name="date" value="2000/02/02"/>
</bean>

</beans>
6 changes: 3 additions & 3 deletions ...test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<bean id="thread" class="java.lang.Thread"/>

<bean id="field" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
<property name="targetObject" ref="thread"/>
<property name="targetField" value="MAX_PRIORITY"/>
</bean>
<property name="targetObject" ref="thread"/>
<property name="targetField" value="MAX_PRIORITY"/>
</bean>

<bean id="secondBuffer" class="java.lang.StringBuffer">
<constructor-arg ref="field"/>
Expand Down
34 changes: 17 additions & 17 deletions ...-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-circular.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<bean id="bean1" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
<constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1"/>
<property name="instanceName" value="beanImpl1"/>
</bean>
<bean id="bean1" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
<constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1"/>
<property name="instanceName" value="beanImpl1"/>
</bean>

<bean id="beanImpl1" class="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1">
<property name="impl2" ref="bean2"/>
</bean>
<bean id="beanImpl1" class="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1">
<property name="impl2" ref="bean2"/>
</bean>

<bean id="bean2" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
<constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl2"/>
<property name="instanceName" value="beanImpl2"/>
</bean>
<bean id="bean2" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
<constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl2"/>
<property name="instanceName" value="beanImpl2"/>
</bean>

<bean id="beanImpl2" class="org.springframework.beans.factory.FactoryBeanTests$BeanImpl2">
<property name="impl1" ref="bean1"/>
</bean>
<bean id="beanImpl2" class="org.springframework.beans.factory.FactoryBeanTests$BeanImpl2">
<property name="impl1" ref="bean1"/>
</bean>

</beans>
2 changes: 1 addition & 1 deletion .../src/test/resources/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<bean id="gamma" class="org.springframework.beans.factory.FactoryBeanTests$Gamma"/>

<bean id="betaFactory" class="org.springframework.beans.factory.FactoryBeanTests$BetaFactoryBean" autowire="constructor">
<property name="beta" ref="beta"/>
<property name="beta" ref="beta"/>
</bean>

<bean id="gammaFactory" factory-bean="${gammaFactory}" factory-method="${gamma}"/>
Expand Down
46 changes: 23 additions & 23 deletions ...es/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">

<bean id="resolver" class="org.springframework.beans.factory.annotation.CustomAutowireConfigurerTests$CustomResolver"/>
<bean id="resolver" class="org.springframework.beans.factory.annotation.CustomAutowireConfigurerTests$CustomResolver"/>

<bean id="number-one" class="java.lang.String">
<meta key="priority" value="1"/>
<constructor-arg value="#1!"/>
</bean>
<bean id="number-one" class="java.lang.String">
<meta key="priority" value="1"/>
<constructor-arg value="#1!"/>
</bean>

<bean id="one" class="java.lang.String" autowire-candidate="false">
<meta key="priority" value="1"/>
<constructor-arg value="#1"/>
</bean>
<bean id="one" class="java.lang.String" autowire-candidate="false">
<meta key="priority" value="1"/>
<constructor-arg value="#1"/>
</bean>

<bean id="number1" class="java.lang.String">
<meta key="priority" value="1"/>
<constructor-arg value="#1"/>
</bean>
<bean id="number1" class="java.lang.String">
<meta key="priority" value="1"/>
<constructor-arg value="#1"/>
</bean>

<bean id="number-two" class="java.lang.String">
<meta key="priority" value="2"/>
<constructor-arg value="#2"/>
</bean>
<bean id="number-two" class="java.lang.String">
<meta key="priority" value="2"/>
<constructor-arg value="#2"/>
</bean>

<bean id="testBean"
class="org.springframework.beans.factory.annotation.CustomAutowireConfigurerTests$TestBean"
autowire="constructor"/>
<bean id="testBean"
class="org.springframework.beans.factory.annotation.CustomAutowireConfigurerTests$TestBean"
autowire="constructor"/>

</beans>
4 changes: 2 additions & 2 deletions ...sources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<property name="age"><value>11</value></property>
</bean>
</property>
</bean>
</bean>

<bean id="otb" class="org.springframework.beans.testfixture.beans.TestBean">
<property name="age"><value>98</value></property>
Expand All @@ -19,7 +19,7 @@
<property name="age"><value>99</value></property>
</bean>
</property>
</bean>
</bean>

<bean id="propertyPath1" class="org.springframework.beans.factory.config.PropertyPathFactoryBean">
<property name="targetObject">
Expand Down
6 changes: 3 additions & 3 deletions ...esources/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<property name="spouse">
<bean class="org.springframework.beans.testfixture.beans.TestBean">
<property name="someMap">
<map>
<entry/>
</map>
<map>
<entry/>
</map>
</property>
</bean>
</property>
Expand Down
8 changes: 4 additions & 4 deletions ...t/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype"/>

<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<property name="properties">
<value>name=props1</value>
</property>
</property>
</bean>

<bean id="props2" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="false">
<property name="properties">
<property name="properties">
<value>name=props2</value>
</property>
</property>
</bean>

</beans>
8 changes: 4 additions & 4 deletions ...eans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean"/>

<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<property name="properties">
<value>name=props1</value>
</property>
</property>
</bean>

<bean id="props2" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="false">
<property name="properties">
<property name="properties">
<value>name=props2</value>
</property>
</property>
</bean>

<bean class="org.springframework.beans.factory.xml.CountingFactory">
Expand Down
8 changes: 4 additions & 4 deletions ...eans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean" autowire-candidate="true"/>

<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="true">
<property name="properties">
<property name="properties">
<value>name=props1</value>
</property>
</property>
</bean>

<bean id="props2" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<property name="properties">
<value>name=props2</value>
</property>
</property>
</bean>

<bean class="org.springframework.beans.factory.xml.CountingFactory">
Expand Down
12 changes: 6 additions & 6 deletions ...est/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
<bean id="sally" class="org.springframework.beans.testfixture.beans.TestBean"/>

<bean id="props1" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<property name="properties">
<value>name=props1</value>
</property>
</property>
</bean>

<bean id="props2" class="org.springframework.beans.factory.config.PropertiesFactoryBean" autowire-candidate="false">
<property name="properties">
<property name="properties">
<value>name=props2</value>
</property>
</property>
</bean>

<bean id="someProps" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<property name="properties">
<value>name=someProps</value>
</property>
</property>
</bean>

<bean class="org.springframework.beans.factory.xml.CountingFactory">
Expand Down
8 changes: 4 additions & 4 deletions spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@
<value type="java.lang.Integer">10</value>
</entry>
<entry>
<key>
<key>
<ref bean="jennyKey"/>
</key>
<ref bean="jenny"/>
</entry>
<entry>
<key>
<bean class="java.lang.Integer">
<constructor-arg value="5"/>
<key>
<bean class="java.lang.Integer">
<constructor-arg value="5"/>
</bean>
</key>
<idref bean="david"/>
Expand Down
Loading