language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | spring-projects | spring-framework | a86baca9cbe6914ed9db305598555f1be5e4341e.json | Add atinject dependency for TCK test | org.springframework.context/pom.xml | @@ -1,231 +1,239 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <packaging>jar</packaging>
- <version>3.0.0.BUILD-SNAPSHOT</version>
- <parent>
- <groupId>org.springframework</groupId>
- <artifactId>spring-parent</artifactId>
- <relativePath>../org.springframework.spring-parent</relativePath>
- <version>3.0.0.BUILD-SNAPSHOT</version>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <packaging>jar</packaging>
+ <version>3.0.0.BUILD-SNAPSHOT</version>
+ <parent>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-parent</artifactId>
+ <relativePath>../org.springframework.spring-parent</relativePath>
+ <version>3.0.0.BUILD-SNAPSHOT</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>com.oracle.oc4j</groupId>
- <artifactId>com.springsource.oracle.classloader</artifactId>
- <version>10.1.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.enterprise</groupId>
- <artifactId>com.springsource.com.sun.enterprise.loader</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1-1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <!-- common logging dependency is in spring-core -->
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>1.7-beta-1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby</artifactId>
- <version>1.2.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-instrument</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.0.0.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <junitArtifactName>junit:junit</junitArtifactName>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle.oc4j</groupId>
+ <artifactId>com.springsource.oracle.classloader</artifactId>
+ <version>10.1.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.enterprise</groupId>
+ <artifactId>com.springsource.com.sun.enterprise.loader</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.atinject</groupId>
+ <artifactId>inject-tck</artifactId>
+ <version>1.0.0-PFD-3-jboss-1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1-1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- common logging dependency is in spring-core -->
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>1.7-beta-1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ <version>1.2.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-instrument</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.0.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <junitArtifactName>junit:junit</junitArtifactName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project> | false |
Other | spring-projects | spring-framework | 68363f17a796e174012d2de99070e39a205b3ca7.json | avoid potential NPE (SPR-5930) | org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -79,9 +79,14 @@ public FileEditor(ResourceEditor resourceEditor) {
@Override
public void setAsText(String text) throws IllegalArgumentException {
+ if (!StringUtils.hasText(text)) {
+ setValue(null);
+ return;
+ }
+
// Check whether we got an absolute file path without "file:" prefix.
// For backwards compatibility, we'll consider those as straight file path.
- if (StringUtils.hasText(text) && !ResourceUtils.isUrl(text)) {
+ if (!ResourceUtils.isUrl(text)) {
File file = new File(text);
if (file.isAbsolute()) {
setValue(file);
@@ -92,20 +97,20 @@ public void setAsText(String text) throws IllegalArgumentException {
// Proceed with standard resource location parsing.
this.resourceEditor.setAsText(text);
Resource resource = (Resource) this.resourceEditor.getValue();
- // Non URLs will be treated as relative paths if the resource was not found
- if(ResourceUtils.isUrl(text) || resource.exists()) {
+
+ // If it's a URL or a path pointing to an existing resource, use it as-is.
+ if (ResourceUtils.isUrl(text) || resource.exists()) {
try {
- setValue(resource != null ? resource.getFile() : null);
+ setValue(resource.getFile());
}
catch (IOException ex) {
throw new IllegalArgumentException(
"Could not retrieve File for " + resource + ": " + ex.getMessage());
}
}
else {
- // Create a relative File reference and hope for the best
- File file = new File(text);
- setValue(file);
+ // Create a relative File reference and hope for the best.
+ setValue(new File(text));
}
}
| false |
Other | spring-projects | spring-framework | 6206e5f11f4395b62c1fb296f2aab3d7299fc889.json | ignore failing test for now | org.springframework.expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java | @@ -16,6 +16,7 @@
package org.springframework.expression.spel;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -71,8 +72,10 @@ public void testWidening01() {
}
@Test
+ @Ignore
public void testArgumentConversion01() {
// Closest ctor will be new String(String) and converter supports Double>String
+ // TODO currently failing as with new ObjectToArray converter closest constructor matched becomes String(byte[]) which fails...
evaluate("new String(3.0d)", "3.0", String.class);
}
| false |
Other | spring-projects | spring-framework | 5904814ec68aa4be07a2d84803a88882561aecfa.json | ignore cases from some tricky scenarios | org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java | @@ -324,7 +324,29 @@ public void getListAsSingleString() {
String value = binder.getBinding("addresses").getValue();
assertEquals("s1:c1:st1:z1,s2:c2:st2:z2,", value);
}
-
+
+ @Test
+ @Ignore
+ public void getListAsSingleStringNoFormatter() {
+ binder.addBinding("addresses");
+ Address address1 = new Address();
+ address1.setStreet("s1");
+ address1.setCity("c1");
+ address1.setState("st1");
+ address1.setZip("z1");
+ Address address2 = new Address();
+ address2.setStreet("s2");
+ address2.setCity("c2");
+ address2.setState("st2");
+ address2.setZip("z2");
+ List<Address> addresses = new ArrayList<Address>(2);
+ addresses.add(address1);
+ addresses.add(address2);
+ bean.addresses = addresses;
+ String value = binder.getBinding("addresses").getValue();
+ assertEquals("s1:c1:st1:z1,s2:c2:st2:z2,", value);
+ }
+
@Test
public void bindToListHandleNullValueInNestedPath() {
binder.addBinding("addresses.street"); | false |
Other | spring-projects | spring-framework | 7c433712d1149ddb11c31e4a9f31ba362ed6dbb5.json | remove unused field | org.springframework.context/src/main/java/org/springframework/ui/binding/UserValue.java | @@ -53,20 +53,6 @@ public Object getValue() {
return value;
}
- /**
- * Is the user-entered value a String?
- */
- public boolean isString() {
- return value instanceof String;
- }
-
- /**
- * Is the user-entered value a String[]?
- */
- public boolean isStringArray() {
- return value instanceof String[];
- }
-
/**
* Creates a new UserValue list with a single element.
* @param property the property | false |
Other | spring-projects | spring-framework | e6b6743c444923e762ab672c5583349eba5766b0.json | bind template polish | org.springframework.context/src/main/java/org/springframework/model/binder/support/BindTemplate.java | @@ -27,7 +27,7 @@
* @author Keith Donald
* @since 3.0
* @see #setRequiredFields(String[])
- * @see #bind(Map)
+ * @see #bind(Map, FieldBinder)
*/
public class BindTemplate {
| false |
Other | spring-projects | spring-framework | 1a7ec7daf29e15a45c9bf5382ca4c080c53b5af8.json | use the annotation meta data in problem reporting | org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java | @@ -144,7 +144,7 @@ private class FinalConfigurationProblem extends Problem {
public FinalConfigurationProblem() {
super(String.format("@Configuration class '%s' may not be final. Remove the final modifier to continue.",
- getSimpleName()), new Location(getResource(), ConfigurationClass.this));
+ getSimpleName()), new Location(getResource(), getMetadata()));
}
}
@@ -155,7 +155,7 @@ private class OverloadedMethodProblem extends Problem {
public OverloadedMethodProblem(String methodName, int count) {
super(String.format("@Configuration class '%s' has %s overloaded factory methods of name '%s'. " +
"Only one factory method of the same name allowed.",
- getSimpleName(), count, methodName), new Location(getResource(), ConfigurationClass.this));
+ getSimpleName(), count, methodName), new Location(getResource(), getMetadata()));
}
}
| false |
Other | spring-projects | spring-framework | 1c5e1e04e0ec826d761c9d394b064900edc28d40.json | use the annotation meta data in problem reporting | org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java | @@ -144,7 +144,7 @@ private class FinalConfigurationProblem extends Problem {
public FinalConfigurationProblem() {
super(String.format("@Configuration class '%s' may not be final. Remove the final modifier to continue.",
- getSimpleName()), new Location(getResource()));
+ getSimpleName()), new Location(getResource(), ConfigurationClass.this));
}
}
@@ -155,7 +155,7 @@ private class OverloadedMethodProblem extends Problem {
public OverloadedMethodProblem(String methodName, int count) {
super(String.format("@Configuration class '%s' has %s overloaded factory methods of name '%s'. " +
"Only one factory method of the same name allowed.",
- getSimpleName(), count, methodName), new Location(getResource()));
+ getSimpleName(), count, methodName), new Location(getResource(), ConfigurationClass.this));
}
}
| true |
Other | spring-projects | spring-framework | 1c5e1e04e0ec826d761c9d394b064900edc28d40.json | use the annotation meta data in problem reporting | org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethod.java | @@ -53,7 +53,7 @@ public ConfigurationClass getDeclaringClass() {
}
public Location getResourceLocation() {
- return new Location(this.declaringClass.getResource(), this.metadata.getMethodName());
+ return new Location(this.declaringClass.getResource(), metadata);
}
public void validate(ProblemReporter problemReporter) { | true |
Other | spring-projects | spring-framework | 0a2f936b80389eac540e3ed81c3f2771b5a5482f.json | remove antlr dependency | org.springframework.expression/template.mf | @@ -4,6 +4,5 @@ Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.antlr.runtime.*;version="[3.0.1,4.0.0)",
org.springframework.core.*;version="[3.0.0, 3.0.1)",
org.springframework.util.*;version="[3.0.0, 3.0.1)" | false |
Other | spring-projects | spring-framework | 5ea898bdb476ec6e2d34acb58ed49d31a86f3b23.json | remove antlr dependency | org.springframework.context/.classpath | @@ -1,38 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.aop"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
- <classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-3.1.0.jar" sourcepath="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-sources-3.1.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-3.1.0.jar" sourcepath="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-sources-3.1.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.4.0/com.springsource.org.apache.commons.pool-1.4.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.4.0/com.springsource.org.apache.commons.pool-sources-1.4.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-1.2.0.jar" sourcepath="/IVY_CACHE/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-sources-1.2.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-1.5.1.jar" sourcepath="/IVY_CACHE/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-sources-1.5.1.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.beanshell/com.springsource.bsh/2.0.0.b4/com.springsource.bsh-2.0.0.b4.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/com.sun.enterprise/com.springsource.com.sun.enterprise.loader/1.0.0/com.springsource.com.sun.enterprise.loader-1.0.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/com.oracle.oc4j/com.springsource.oracle.classloader/10.1.3.1/com.springsource.oracle.classloader-10.1.3.1.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar" sourcepath="/IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar" sourcepath="/IVY_CACHE/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-sources-1.0.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/javax.xml.rpc/com.springsource.javax.xml.rpc/1.1.0/com.springsource.javax.xml.rpc-1.1.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.instrument"/>
- <classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar" sourcepath="/IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-sources-3.0.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.antlr/com.springsource.org.antlr/3.0.1/com.springsource.org.antlr-3.0.1.jar" sourcepath="/IVY_CACHE/org.antlr/com.springsource.org.antlr/3.0.1/com.springsource.org.antlr-sources-3.0.1.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-sources-1.2.2.osgi.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.expression"/>
- <classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.aop"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
+ <classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-3.1.0.jar" sourcepath="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-sources-3.1.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-3.1.0.jar" sourcepath="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-sources-3.1.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.4.0/com.springsource.org.apache.commons.pool-1.4.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.4.0/com.springsource.org.apache.commons.pool-sources-1.4.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-1.2.0.jar" sourcepath="/IVY_CACHE/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-sources-1.2.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-1.5.1.jar" sourcepath="/IVY_CACHE/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-sources-1.5.1.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.beanshell/com.springsource.bsh/2.0.0.b4/com.springsource.bsh-2.0.0.b4.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/com.sun.enterprise/com.springsource.com.sun.enterprise.loader/1.0.0/com.springsource.com.sun.enterprise.loader-1.0.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/com.oracle.oc4j/com.springsource.oracle.classloader/10.1.3.1/com.springsource.oracle.classloader-10.1.3.1.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar" sourcepath="/IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar" sourcepath="/IVY_CACHE/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-sources-1.0.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/javax.xml.rpc/com.springsource.javax.xml.rpc/1.1.0/com.springsource.javax.xml.rpc-1.1.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.instrument"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar" sourcepath="/IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-sources-3.0.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-sources-1.2.2.osgi.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.expression"/>
+ <classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
| true |
Other | spring-projects | spring-framework | 5ea898bdb476ec6e2d34acb58ed49d31a86f3b23.json | remove antlr dependency | org.springframework.context/ivy.xml | @@ -39,7 +39,6 @@
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
<dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="2.1.1" conf="provided, ws->compile"/>
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional, bytecode-proxy->compile"/>
- <dependency org="org.antlr" name="com.springsource.org.antlr" rev="3.0.1" conf="test->compile"/>
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.RELEASE" conf="optional, aspectj->compile"/> | true |
Other | spring-projects | spring-framework | d372a9ac5d6ed6dc2be64fb184ee4b0b33edaed3.json | use new SpEL parser | org.springframework.context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java | @@ -26,19 +26,19 @@
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.ParserContext;
-import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.util.Assert;
/**
* Standard implementation of the
* {@link org.springframework.beans.factory.config.BeanExpressionResolver}
* interface, parsing and evaluating Spring EL using Spring's expression module.
- *
+ *
* @author Juergen Hoeller
* @since 3.0
* @see org.springframework.expression.ExpressionParser
- * @see org.springframework.expression.spel.antlr.SpelAntlrExpressionParser
+ * @see org.springframework.expression.spel.standard.SpelExpressionParser
* @see org.springframework.expression.spel.support.StandardEvaluationContext
*/
public class StandardBeanExpressionResolver implements BeanExpressionResolver {
@@ -54,7 +54,7 @@ public class StandardBeanExpressionResolver implements BeanExpressionResolver {
private String expressionSuffix = DEFAULT_EXPRESSION_SUFFIX;
- private ExpressionParser expressionParser = new SpelAntlrExpressionParser();
+ private ExpressionParser expressionParser = new SpelExpressionParser();
private final Map<String, Expression> expressionCache = new ConcurrentHashMap<String, Expression>();
| false |
Other | spring-projects | spring-framework | 9306d6dbaabe21f50000406a3db982756297bce5.json | serialize full Pattern objects | org.springframework.aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -55,7 +55,7 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
/** Regular expressions to match */
private String[] patterns = new String[0];
- /** Regaular expressions <strong>not</strong> to match */
+ /** Regular expressions <strong>not</strong> to match */
private String[] excludedPatterns = new String[0];
@@ -155,14 +155,22 @@ protected boolean matchesPattern(String signatureString) {
/**
* Subclasses must implement this to initialize regexp pointcuts.
* Can be invoked multiple times.
- * <p>This method will be invoked from the setPatterns method,
+ * <p>This method will be invoked from the {@link #setPatterns} method,
* and also on deserialization.
* @param patterns the patterns to initialize
* @throws IllegalArgumentException in case of an invalid pattern
*/
protected abstract void initPatternRepresentation(String[] patterns) throws IllegalArgumentException;
- protected abstract void initExcludedPatternRepresentation(String[] excludedPatterns) throws IllegalArgumentException;
+ /**
+ * Subclasses must implement this to initialize regexp pointcuts.
+ * Can be invoked multiple times.
+ * <p>This method will be invoked from the {@link #setExcludedPatterns} method,
+ * and also on deserialization.
+ * @param patterns the patterns to initialize
+ * @throws IllegalArgumentException in case of an invalid pattern
+ */
+ protected abstract void initExcludedPatternRepresentation(String[] patterns) throws IllegalArgumentException;
/**
* Does the pattern at the given index match this string?
@@ -197,12 +205,10 @@ public boolean equals(Object other) {
@Override
public int hashCode() {
int result = 27;
- for (int i = 0; i < this.patterns.length; i++) {
- String pattern = this.patterns[i];
+ for (String pattern : this.patterns) {
result = 13 * result + pattern.hashCode();
}
- for (int i = 0; i < this.excludedPatterns.length; i++) {
- String excludedPattern = this.excludedPatterns[i];
+ for (String excludedPattern : this.excludedPatterns) {
result = 13 * result + excludedPattern.hashCode();
}
return result;
@@ -214,18 +220,4 @@ public String toString() {
", excluded patterns " + ObjectUtils.nullSafeToString(this.excludedPatterns);
}
-
- //---------------------------------------------------------------------
- // Serialization support
- //---------------------------------------------------------------------
-
- private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
- // Rely on default serialization; just initialize state after deserialization.
- ois.defaultReadObject();
-
- // Ask subclass to reinitialize.
- initPatternRepresentation(this.patterns);
- initExcludedPatternRepresentation(this.excludedPatterns);
- }
-
} | true |
Other | spring-projects | spring-framework | 9306d6dbaabe21f50000406a3db982756297bce5.json | serialize full Pattern objects | org.springframework.aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -42,12 +42,12 @@ public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
/**
* Compiled form of the patterns.
*/
- private transient Pattern[] compiledPatterns = new Pattern[0];
+ private Pattern[] compiledPatterns = new Pattern[0];
/**
* Compiled form of the exclusion patterns.
*/
- private transient Pattern[] compiledExclusionPatterns = new Pattern[0];
+ private Pattern[] compiledExclusionPatterns = new Pattern[0];
/**
@@ -59,21 +59,21 @@ protected void initPatternRepresentation(String[] patterns) throws PatternSyntax
}
/**
- * Returns <code>true</code> if the {@link Pattern} at index <code>patternIndex</code>
- * matches the supplied candidate <code>String</code>.
+ * Initialize exclusion {@link Pattern Patterns} from the supplied <code>String[]</code>.
*/
@Override
- protected boolean matches(String pattern, int patternIndex) {
- Matcher matcher = this.compiledPatterns[patternIndex].matcher(pattern);
- return matcher.matches();
+ protected void initExcludedPatternRepresentation(String[] excludedPatterns) throws PatternSyntaxException {
+ this.compiledExclusionPatterns = compilePatterns(excludedPatterns);
}
/**
- * Initialize exclusion {@link Pattern Patterns} from the supplied <code>String[]</code>.
+ * Returns <code>true</code> if the {@link Pattern} at index <code>patternIndex</code>
+ * matches the supplied candidate <code>String</code>.
*/
@Override
- protected void initExcludedPatternRepresentation(String[] excludedPatterns) throws IllegalArgumentException {
- this.compiledExclusionPatterns = compilePatterns(excludedPatterns);
+ protected boolean matches(String pattern, int patternIndex) {
+ Matcher matcher = this.compiledPatterns[patternIndex].matcher(pattern);
+ return matcher.matches();
}
/**
@@ -86,11 +86,12 @@ protected boolean matchesExclusion(String candidate, int patternIndex) {
return matcher.matches();
}
+
/**
* Compiles the supplied <code>String[]</code> into an array of
* {@link Pattern} objects and returns that array.
*/
- private Pattern[] compilePatterns(String[] source) {
+ private Pattern[] compilePatterns(String[] source) throws PatternSyntaxException {
Pattern[] destination = new Pattern[source.length];
for (int i = 0; i < source.length; i++) {
destination[i] = Pattern.compile(source[i]); | true |
Other | spring-projects | spring-framework | ed61da9112d19734a2897fcb9ccb83278fa89cd6.json | remove spring-parent to list of bundles | build-spring-framework/build.xml | @@ -21,7 +21,6 @@
<pathelement location="../org.springframework.web.servlet"/>
<pathelement location="../org.springframework.web.portlet"/>
<pathelement location="../org.springframework.test"/>
- <pathelement location="../org.springframework.spring-parent"/>
<pathelement location="../org.springframework.spring-library"/>
<pathelement location="../org.springframework.integration-tests"/>
</path>
| false |
Other | spring-projects | spring-framework | b132e964beb78e69ca5a459fdc481374cbe974e1.json | add paragraph on SpEL, reorganize section layout. | spring-framework-reference/src/new-in-3.xml | @@ -166,77 +166,77 @@
features in more detail in the following sections.</para>
<itemizedlist>
- <listitem>
- <para>Java 5+ foundation</para>
-
- <para>compatible with J2EE 1.4 and Java EE 5</para>
- </listitem>
-
<listitem>
<para>Spring Expression Language</para>
-
- <para>Unified EL++</para>
</listitem>
<listitem>
- <para>Container enhancements</para>
-
- <para>Core JavaConfigfeatures added</para>
+ <para>IoC enhancements</para>
</listitem>
<listitem>
<para>Comprehensive REST support</para>
+ </listitem>
- <para>and other Spring @MVC additions</para>
+ <listitem>
+ <para>@MVC additions</para>
</listitem>
<listitem>
<para>Declarative model validation</para>
-
- <para>Hibernate Validator, JSR 303</para>
</listitem>
<listitem>
<para>Early support for Java EE 6</para>
-
- <para>JSF 2.0, JPA 2.0, etc</para>
</listitem>
</itemizedlist>
</section>
- <section id="new-feature-java-5">
- <title>Java 5+ foundation</title>
-
- <para><emphasis>*** WORK IN PROGRESS ***</emphasis></para>
- </section>
-
<section id="new-feature-el">
<title>Spring Expression Language</title>
- <para><emphasis>*** WORK IN PROGRESS ***</emphasis></para>
+ <para>Spring introduces an expression language which is similar to Unified
+ EL in its syntax but offers significantly more feature. The expression
+ language can be used when defining XML and Annotation based bean
+ definitions and also serves as the foundation for expression language
+ support across the Spring portfolio. Details of this new functionality can
+ be found in the chapter <link linkend="expressions">Spring Expression
+ Language (SpEL).</link></para>
</section>
<section id="new-feature-java-config">
- <title>Container enhancements</title>
+ <title>The Inversion of Control (IoC) container</title>
- <para><emphasis>*** WORK IN PROGRESS ***</emphasis></para>
+ <para>Core JavaConfigfeatures added</para>
</section>
<section id="new-feature-rest">
- <title>Comprehensive REST support</title>
+ <title>The Web Tier</title>
+
+ <para>Work in progress</para>
+
+ <section>
+ <title>Comprehensive REST support</title>
+
+ <para>Work in progress</para>
+ </section>
+
+ <section>
+ <title>@MVC additions</title>
- <para><emphasis>*** WORK IN PROGRESS ***</emphasis></para>
+ <para>Work in progress</para>
+ </section>
</section>
<section id="new-feature-validation">
<title>Declarative model validation</title>
- <para><emphasis>*** WORK IN PROGRESS ***</emphasis></para>
+ <para>Hibernate Validator, JSR 303</para>
</section>
<section id="new-feature-jee-6">
<title>Early support for Java EE 6</title>
- <para><emphasis>*** WORK IN PROGRESS ***</emphasis></para>
+ <para>JSF 2.0, JPA 2.0, etc</para>
</section>
</chapter>
\ No newline at end of file | false |
Other | spring-projects | spring-framework | c4de2ba0069d5e1d714aa9fefed08377cfce5454.json | include missing package component | org.springframework.integration-tests/ivy.xml | @@ -44,7 +44,7 @@
<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.3.0" conf="test->compile"/>
<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="test->compile"/>
<dependency org="net.sourceforge.jexcelapi" name="com.springsource.jxl" rev="2.6.6" conf="test->compile"/>
- <dependency org="org.antlr" name="com.springsource.antlr" rev="3.0.1" conf="test->compile"/>
+ <dependency org="org.antlr" name="com.springsource.org.antlr" rev="3.0.1" conf="test->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi" conf="test->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" conf="test->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="test->compile"/> | false |
Other | spring-projects | spring-framework | 00018e511d71c3402939cfe22e4b7ab636cee01a.json | implement new interface method | org.springframework.context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java | @@ -17,6 +17,7 @@
package org.springframework.context.expression;
import org.springframework.beans.factory.config.BeanExpressionContext;
+import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.AccessException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.PropertyAccessor;
@@ -50,4 +51,9 @@ public Class[] getSpecificTargetClasses() {
return new Class[] {BeanExpressionContext.class};
}
+ public TypeDescriptor getTypeDescriptor(EvaluationContext context,
+ Object target, String name) {
+ return null;
+ }
+
}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | 00018e511d71c3402939cfe22e4b7ab636cee01a.json | implement new interface method | org.springframework.context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java | @@ -17,6 +17,7 @@
package org.springframework.context.expression;
import org.springframework.beans.factory.BeanFactory;
+import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.AccessException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.PropertyAccessor;
@@ -50,4 +51,9 @@ public Class[] getSpecificTargetClasses() {
return new Class[] {BeanFactory.class};
}
+ public TypeDescriptor getTypeDescriptor(EvaluationContext context,
+ Object target, String name) {
+ return null;
+ }
+
}
| true |
Other | spring-projects | spring-framework | 00018e511d71c3402939cfe22e4b7ab636cee01a.json | implement new interface method | org.springframework.context/src/main/java/org/springframework/context/expression/MapAccessor.java | @@ -18,6 +18,7 @@
import java.util.Map;
+import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.AccessException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.PropertyAccessor;
@@ -51,5 +52,10 @@ public void write(EvaluationContext context, Object target, String name, Object
public Class[] getSpecificTargetClasses() {
return new Class[] {Map.class};
}
+
+ public TypeDescriptor getTypeDescriptor(EvaluationContext context,
+ Object target, String name) {
+ return null;
+ }
}
| true |
Other | spring-projects | spring-framework | 30967d3b2060ace468a4bc1a6e2153fea26d7405.json | Update docs to use of @Bean inside a @Component | spring-framework-reference/src/beans.xml | @@ -6437,10 +6437,10 @@ public class FactoryMethodComponent {
}
}</programlisting>
- <para>This class is a Spring component and has appliation specific code
+ <para>This class is a Spring component and has application specific code
contained in its <methodname>DoWork</methodname> method. However, it
- also contributes a bean definition that has a factory method refering to
- the method <methodname>publicInstance</methodname>. The
+ also contributes a bean definition that has a factory method referring
+ to the method <methodname>publicInstance</methodname>. The
<literal>@Bean</literal> annotation identifies the factory method and
also other bean definition properties, such as a qualifier value via the
<classname>@Qualifier</classname> annotation. Other method level | false |
Other | spring-projects | spring-framework | c2f4f97fa5b6f2a5d4b9214151151f52ed163afe.json | Update docs to use of @Bean inside a @Component | spring-framework-reference/src/beans.xml | @@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="beans">
<title>The IoC container</title>
@@ -206,23 +205,23 @@
<para>Find below an example of the basic structure of XML-based
configuration metadata.</para>
- <programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+ <programlisting language="xml"><?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
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <bean id="..." class="...">
- <!-- collaborators and configuration for this bean go here -->
- </bean>
+ <bean id="..." class="...">
+ <!-- collaborators and configuration for this bean go here -->
+ </bean>
- <bean id="..." class="...">
- <!-- collaborators and configuration for this bean go here -->
- </bean>
+ <bean id="..." class="...">
+ <!-- collaborators and configuration for this bean go here -->
+ </bean>
- <!-- more bean definitions go here -->
+ <!-- more bean definitions go here -->
-</beans>]]></programlisting>
+</beans></programlisting>
</section>
</section>
@@ -255,16 +254,16 @@ BeanFactory factory = context;</programlisting>
load bean definitions from another file (or files). Let's look at a
sample:</para>
- <programlisting language="xml"><![CDATA[<beans>
+ <programlisting language="xml"><beans>
- <import resource="services.xml"/>
- <import resource="resources/messageSource.xml"/>
- <import resource="/resources/themeSource.xml"/>
+ <import resource="services.xml"/>
+ <import resource="resources/messageSource.xml"/>
+ <import resource="/resources/themeSource.xml"/>
- <bean id="bean1" class="..."/>
- <bean id="bean2" class="..."/>
+ <bean id="bean1" class="..."/>
+ <bean id="bean2" class="..."/>
-</beans>]]></programlisting>
+</beans></programlisting>
<para>In this example, external bean definitions are being loaded from
3 files, <literal>services.xml</literal>,
@@ -519,7 +518,7 @@ BeanFactory factory = context;</programlisting>
XML-based configuration metadata this may be accomplished via the
use of the <literal><alias/></literal> element.</para>
- <programlisting language="xml"><![CDATA[<alias name="fromName" alias="toName"/>]]></programlisting>
+ <programlisting language="xml"><alias name="fromName" alias="toName"/></programlisting>
<para>In this case, a bean in the same container which is named
<literal>'fromName'</literal>, may also after the use of this alias
@@ -535,8 +534,8 @@ BeanFactory factory = context;</programlisting>
easily handled by adding to the MyApp XML fragment the following
standalone aliases:</para>
- <programlisting language="xml"><![CDATA[<alias name="componentA-dataSource" alias="componentB-dataSource"/>
-<alias name="componentA-dataSource" alias="myApp-dataSource" />]]></programlisting>
+ <programlisting language="xml"><alias name="componentA-dataSource" alias="componentB-dataSource"/>
+<alias name="componentA-dataSource" alias="myApp-dataSource" /></programlisting>
<para>Now each component and the main application can refer to the
dataSource via a name that is unique and guaranteed not to clash
@@ -623,9 +622,9 @@ BeanFactory factory = context;</programlisting>
<para>When using XML-based configuration metadata you can specify
your bean class like so:</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleBean" class="examples.ExampleBean"/>
+ <programlisting language="xml"><bean id="exampleBean" class="examples.ExampleBean"/>
-<bean name="anotherExample" class="examples.ExampleBeanTwo"/>]]></programlisting>
+<bean name="anotherExample" class="examples.ExampleBeanTwo"/></programlisting>
<para>The mechanism for supplying arguments to the constructor (if
required), or setting properties of the object instance after it has
@@ -655,9 +654,9 @@ BeanFactory factory = context;</programlisting>
this example, the <methodname>createInstance()</methodname> method
must be a <emphasis>static</emphasis> method.</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleBean"
+ <programlisting language="xml"><bean id="exampleBean"
class="examples.ExampleBean2"
- factory-method="createInstance"/>]]></programlisting>
+ factory-method="createInstance"/></programlisting>
<para>The mechanism for supplying (optional) arguments to the
factory method, or setting properties of the object instance after
@@ -725,8 +724,8 @@ BeanFactory factory = context;</programlisting>
<interfacename>BeanFactory</interfacename> you would create one and read
in some bean definitions in the XML format as follows:</para>
- <programlisting language="java"><![CDATA[Resource res = new FileSystemResource("beans.xml");
-BeanFactory factory = new XmlBeanFactory(res);]]></programlisting>
+ <programlisting language="java">Resource res = new FileSystemResource("beans.xml");
+BeanFactory factory = new XmlBeanFactory(res);</programlisting>
<para>Basically that is all there is to it. Using
<methodname>getBean(String)</methodname> you can retrieve instances of
@@ -831,16 +830,16 @@ public class Foo {
specify the constructor argument indexes and / or types
explicitly.</para>
- <programlisting language="xml"><![CDATA[<beans>
- <bean name="foo" class="x.y.Foo">
- <constructor-arg>
- <bean class="x.y.Bar"/>
- </constructor-arg>
- <constructor-arg>
- <bean class="x.y.Baz"/>
- </constructor-arg>
- </bean>
-</beans>]]></programlisting>
+ <programlisting language="xml"><beans>
+ <bean name="foo" class="x.y.Foo">
+ <constructor-arg>
+ <bean class="x.y.Bar"/>
+ </constructor-arg>
+ <constructor-arg>
+ <bean class="x.y.Baz"/>
+ </constructor-arg>
+ </bean>
+</beans></programlisting>
<para>When another bean is referenced, the type is known, and
matching can occur (as was the case with the preceding example).
@@ -873,10 +872,10 @@ public class ExampleBean {
the constructor argument using the <literal>'type'</literal>
attribute. For example:</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleBean" class="examples.ExampleBean">
- <constructor-arg type="int" value="7500000"/>
- <constructor-arg type="java.lang.String" value="42"/>
-</bean>]]></programlisting>
+ <programlisting language="xml"><bean id="exampleBean" class="examples.ExampleBean">
+ <constructor-arg type="int" value="7500000"/>
+ <constructor-arg type="java.lang.String" value="42"/>
+</bean></programlisting>
</section>
<section id="beans-factory-ctor-arguments-index">
@@ -886,10 +885,10 @@ public class ExampleBean {
explicitly by use of the <literal>index</literal> attribute. For
example:</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleBean" class="examples.ExampleBean">
- <constructor-arg index="0" value="7500000"/>
- <constructor-arg index="1" value="42"/>
-</bean>]]></programlisting>
+ <programlisting language="xml"><bean id="exampleBean" class="examples.ExampleBean">
+ <constructor-arg index="0" value="7500000"/>
+ <constructor-arg index="1" value="42"/>
+</bean></programlisting>
<para>As well as solving the ambiguity problem of multiple simple
values, specifying an index also solves the problem of ambiguity
@@ -1100,7 +1099,7 @@ public class ExampleBean {
<bean id="anotherExampleBean" class="examples.AnotherBean"/>
<bean id="yetAnotherBean" class="examples.YetAnotherBean"/></programlisting>
- <programlisting language="java"><![CDATA[public class ExampleBean {
+ <programlisting language="java">public class ExampleBean {
private AnotherBean beanOne;
private YetAnotherBean beanTwo;
@@ -1117,7 +1116,7 @@ public class ExampleBean {
public void setIntegerProperty(int i) {
this.i = i;
}
-}]]></programlisting>
+}</programlisting>
<para>As you can see, setters have been declared to match against the
properties specified in the XML file. Find below an example of using
@@ -1139,7 +1138,7 @@ public class ExampleBean {
<bean id="anotherExampleBean" class="examples.AnotherBean"/>
<bean id="yetAnotherBean" class="examples.YetAnotherBean"/></programlisting>
- <programlisting language="java"><![CDATA[public class ExampleBean {
+ <programlisting language="java">public class ExampleBean {
private AnotherBean beanOne;
private YetAnotherBean beanTwo;
@@ -1151,7 +1150,7 @@ public class ExampleBean {
this.beanTwo = yetAnotherBean;
this.i = i;
}
-}]]></programlisting>
+}</programlisting>
<para>As you can see, the constructor arguments specified in the bean
definition will be used to pass in as arguments to the constructor of
@@ -1161,15 +1160,15 @@ public class ExampleBean {
constructor, Spring is told to call a <literal>static</literal>
factory method to return an instance of the object:</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleBean" class="examples.ExampleBean"
- factory-method="createInstance">
- <constructor-arg ref="anotherExampleBean"/>
- <constructor-arg ref="yetAnotherBean"/>
- <constructor-arg value="1"/>
-</bean>
+ <programlisting language="xml"><bean id="exampleBean" class="examples.ExampleBean"
+ factory-method="createInstance">
+ <constructor-arg ref="anotherExampleBean"/>
+ <constructor-arg ref="yetAnotherBean"/>
+ <constructor-arg value="1"/>
+</bean>
-<bean id="anotherExampleBean" class="examples.AnotherBean"/>
-<bean id="yetAnotherBean" class="examples.YetAnotherBean"/>]]></programlisting>
+<bean id="anotherExampleBean" class="examples.AnotherBean"/>
+<bean id="yetAnotherBean" class="examples.YetAnotherBean"/></programlisting>
<programlisting language="java">public class ExampleBean {
@@ -1296,23 +1295,23 @@ public class ExampleBean {
container (to a <literal><constructor-arg/></literal> or
<literal><property/></literal> element).</para>
- <programlisting language="xml"><![CDATA[<bean id="theTargetBean" class="..."/>
+ <programlisting language="xml"><bean id="theTargetBean" class="..."/>
-<bean id="theClientBean" class="...">
- <property name="targetName">
- <idref bean="theTargetBean" />
- </property>
-</bean>]]></programlisting>
+<bean id="theClientBean" class="...">
+ <property name="targetName">
+ <idref bean="theTargetBean" />
+ </property>
+</bean></programlisting>
<para>The above bean definition snippet is
<emphasis>exactly</emphasis> equivalent (at runtime) to the
following snippet:</para>
- <programlisting language="xml"><![CDATA[<bean id="theTargetBean" class="..." />
+ <programlisting language="xml"><bean id="theTargetBean" class="..." />
-<bean id="client" class="...">
- <property name="targetName" value="theTargetBean" />
-</bean>]]></programlisting>
+<bean id="client" class="...">
+ <property name="targetName" value="theTargetBean" />
+</bean></programlisting>
<para>The main reason the first form is preferable to the second is
that using the <literal>idref</literal> tag allows the container to
@@ -1375,7 +1374,7 @@ public class ExampleBean {
bean, or one of the values in the <literal>'name'</literal> attribute
of the target bean.</para>
- <programlisting language="xml"><![CDATA[<ref bean="someBean"/>]]></programlisting>
+ <programlisting language="xml"><ref bean="someBean"/></programlisting>
<para>Specifying the target bean by using the <literal>local</literal>
attribute leverages the ability of the XML parser to validate XML id
@@ -1387,7 +1386,7 @@ public class ExampleBean {
about errors as early as possible) if the target bean is in the same
XML file.</para>
- <programlisting language="xml"><![CDATA[<ref local="someBean"/>]]></programlisting>
+ <programlisting language="xml"><ref local="someBean"/></programlisting>
<para>Specifying the target bean by using the
<literal>'parent'</literal> attribute allows a reference to be created
@@ -1515,7 +1514,7 @@ public class ExampleBean {
value, can also again be any of the following
elements:</emphasis></para>
- <programlisting language="xml"><![CDATA[bean | ref | idref | list | set | map | props | value | null]]></programlisting>
+ <programlisting language="xml">bean | ref | idref | list | set | map | props | value | null</programlisting>
<section id="beans-collection-elements-merging">
<title>Collection merging</title>
@@ -1575,9 +1574,9 @@ public class ExampleBean {
<literal>adminEmails</literal> collection with the parent's
<literal>adminEmails</literal> collection.</para>
- <programlisting><![CDATA[administrator=administrator@example.com
+ <programlisting>administrator=administrator@example.com
sales=sales@example.com
-support=support@example.co.uk]]></programlisting>
+support=support@example.co.uk</programlisting>
<para>Notice how the child <classname>Properties</classname>
collection's value set will have inherited all the property elements
@@ -1632,26 +1631,26 @@ support=support@example.co.uk]]></programlisting>
instances will be converted to the appropriate type prior to being
added to the <interfacename>Collection</interfacename>.</para>
- <programlisting language="java"><![CDATA[public class Foo {
+ <programlisting language="java">public class Foo {
- private Map<String, Float> accounts;
+ private Map<String, Float> accounts;
- public void setAccounts(Map<String, Float> accounts) {
+ public void setAccounts(Map<String, Float> accounts) {
this.accounts = accounts;
}
-}]]></programlisting>
-
- <programlisting language="xml"><![CDATA[<beans>
- <bean id="foo" class="x.y.Foo">
- <property name="accounts">
- <map>
- <entry key="one" value="9.99"/>
- <entry key="two" value="2.75"/>
- <entry key="six" value="3.99"/>
- </map>
- </property>
- </bean>
-</beans>]]></programlisting>
+}</programlisting>
+
+ <programlisting language="xml"><beans>
+ <bean id="foo" class="x.y.Foo">
+ <property name="accounts">
+ <map>
+ <entry key="one" value="9.99"/>
+ <entry key="two" value="2.75"/>
+ <entry key="six" value="3.99"/>
+ </map>
+ </property>
+ </bean>
+</beans></programlisting>
<para>When the <literal>'accounts'</literal> property of the
<literal>'foo'</literal> bean is being prepared for injection, the
@@ -1676,18 +1675,18 @@ support=support@example.co.uk]]></programlisting>
email property being set to the empty <classname>String</classname>
value ("")</para>
- <programlisting language="xml"><![CDATA[<bean class="ExampleBean">
- <property name="email"><value/></property>
-</bean>]]></programlisting>
+ <programlisting language="xml"><bean class="ExampleBean">
+ <property name="email"><value/></property>
+</bean></programlisting>
<para>This is equivalent to the following Java code:
<methodname>exampleBean.setEmail("")</methodname>. The special
<literal><null></literal> element may be used to indicate a
<literal>null</literal> value. For example:</para>
- <programlisting language="xml"><![CDATA[<bean class="ExampleBean">
- <property name="email"><null/></property>
-</bean>]]></programlisting>
+ <programlisting language="xml"><bean class="ExampleBean">
+ <property name="email"><null/></property>
+</bean></programlisting>
<para>The above configuration is equivalent to the following Java
code: <methodname>exampleBean.setEmail(null)</methodname>.</para>
@@ -1714,45 +1713,45 @@ support=support@example.co.uk]]></programlisting>
embedding a full <literal><value/></literal> element.
Therefore, the following:</para>
- <programlisting language="xml"><![CDATA[<property name="myProperty">
- <value>hello</value>
-</property>]]></programlisting>
+ <programlisting language="xml"><property name="myProperty">
+ <value>hello</value>
+</property></programlisting>
- <programlisting language="xml"><![CDATA[<constructor-arg>
- <value>hello</value>
-</constructor-arg>]]></programlisting>
+ <programlisting language="xml"><constructor-arg>
+ <value>hello</value>
+</constructor-arg></programlisting>
- <programlisting language="xml"><![CDATA[<entry key="myKey">
- <value>hello</value>
-</entry>]]></programlisting>
+ <programlisting language="xml"><entry key="myKey">
+ <value>hello</value>
+</entry></programlisting>
<para>are equivalent to:</para>
- <programlisting language="xml"><![CDATA[<property name="myProperty" value="hello"/>]]></programlisting>
+ <programlisting language="xml"><property name="myProperty" value="hello"/></programlisting>
- <programlisting language="xml"><![CDATA[<constructor-arg value="hello"/>]]></programlisting>
+ <programlisting language="xml"><constructor-arg value="hello"/></programlisting>
- <programlisting language="xml"><![CDATA[<entry key="myKey" value="hello"/>]]></programlisting>
+ <programlisting language="xml"><entry key="myKey" value="hello"/></programlisting>
<para>The <literal><property/></literal> and
<literal><constructor-arg/></literal> elements support a
similar shortcut <literal>'ref'</literal> attribute which may be
used instead of a full nested <literal><ref/></literal>
element. Therefore, the following:</para>
- <programlisting language="xml"><![CDATA[<property name="myProperty">
- <ref bean="myBean">
-</property>]]></programlisting>
+ <programlisting language="xml"><property name="myProperty">
+ <ref bean="myBean">
+</property></programlisting>
- <programlisting language="xml"><![CDATA[<constructor-arg>
- <ref bean="myBean">
-</constructor-arg>]]></programlisting>
+ <programlisting language="xml"><constructor-arg>
+ <ref bean="myBean">
+</constructor-arg></programlisting>
<para>... are equivalent to:</para>
- <programlisting language="xml"><![CDATA[<property name="myProperty" ref="myBean"/>]]></programlisting>
+ <programlisting language="xml"><property name="myProperty" ref="myBean"/></programlisting>
- <programlisting language="xml"><![CDATA[<constructor-arg ref="myBean"/>]]></programlisting>
+ <programlisting language="xml"><constructor-arg ref="myBean"/></programlisting>
<para>Note however that the shortcut form is equivalent to a
<literal><ref bean="xxx"></literal> element; there is no
@@ -1765,16 +1764,16 @@ support=support@example.co.uk]]></programlisting>
<literal>'value'</literal> / <literal>'value-ref'</literal>
attributes. Therefore, the following:</para>
- <programlisting language="xml"><![CDATA[<entry>
- <key>
- <ref bean="myKeyBean" />
- </key>
- <ref bean="myValueBean" />
-</entry>]]></programlisting>
+ <programlisting language="xml"><entry>
+ <key>
+ <ref bean="myKeyBean" />
+ </key>
+ <ref bean="myValueBean" />
+</entry></programlisting>
<para>is equivalent to:</para>
- <programlisting language="xml"><![CDATA[<entry key-ref="myKeyBean" value-ref="myValueBean"/>]]></programlisting>
+ <programlisting language="xml"><entry key-ref="myKeyBean" value-ref="myValueBean"/></programlisting>
<para>Again, the shortcut form is equivalent to a <literal><ref
bean="xxx"></literal> element; there is no shortcut for
@@ -1808,19 +1807,19 @@ support=support@example.co.uk]]></programlisting>
the end: the first is using the standard XML format whereas the
second example is using the p-namespace.</para>
- <programlisting language="xml"><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
+ <programlisting language="xml"><beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean name="classic" class="com.example.ExampleBean">
- <property name="email" value="foo@bar.com/>
- </bean>
+ <bean name="classic" class="com.example.ExampleBean">
+ <property name="email" value="foo@bar.com/>
+ </bean>
- <bean name="p-namespace" class="com.example.ExampleBean"
- p:email="foo@bar.com"/>
-</beans>]]></programlisting>
+ <bean name="p-namespace" class="com.example.ExampleBean"
+ p:email="foo@bar.com"/>
+</beans></programlisting>
<para>As you can see, we are including an attribute in the
p-namespace called email in the bean definition - this is telling
@@ -1832,26 +1831,26 @@ support=support@example.co.uk]]></programlisting>
<para>This next example includes two more bean definitions that both
have a reference to another bean:</para>
- <programlisting language="xml"><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
+ <programlisting language="xml"><beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean name="john-classic" class="com.example.Person">
- <property name="name" value="John Doe"/>
- <property name="spouse" ref="jane"/>
- </bean>
+ <bean name="john-classic" class="com.example.Person">
+ <property name="name" value="John Doe"/>
+ <property name="spouse" ref="jane"/>
+ </bean>
- <bean name="john-modern"
+ <bean name="john-modern"
class="com.example.Person"
p:name="John Doe"
- p:spouse-ref="jane"/>
+ p:spouse-ref="jane"/>
- <bean name="jane" class="com.example.Person">
- <property name="name" value="Jane Doe"/>
- </bean>
-</beans>]]></programlisting>
+ <bean name="jane" class="com.example.Person">
+ <property name="name" value="Jane Doe"/>
+ </bean>
+</beans></programlisting>
<para>As you can see, this example doesn't only include a property
value using the p-namespace, but also uses a special format to
@@ -1889,9 +1888,9 @@ support=support@example.co.uk]]></programlisting>
the final property name are not <literal>null</literal>. Consider the
following bean definition...</para>
- <programlisting language="xml"><![CDATA[<bean id="foo" class="foo.Bar">
- <property name="fred.bob.sammy" value="123" />
-</bean>]]></programlisting>
+ <programlisting language="xml"><bean id="foo" class="foo.Bar">
+ <property name="fred.bob.sammy" value="123" />
+</bean></programlisting>
<para>The <literal>foo</literal> bean has a <literal>fred</literal>
property which has a <literal>bob</literal> property, which has a
@@ -1933,12 +1932,12 @@ support=support@example.co.uk]]></programlisting>
<literal>'depends-on'</literal> attribute, with commas, whitespace and
semicolons all valid delimiters, like so:</para>
- <programlisting language="xml"><![CDATA[<bean id="beanOne" class="ExampleBean" depends-on="manager,accountDao">
- <property name="manager" ref="manager" />
-</bean>
+ <programlisting language="xml"><bean id="beanOne" class="ExampleBean" depends-on="manager,accountDao">
+ <property name="manager" ref="manager" />
+</bean>
-<bean id="manager" class="ManagerBean" />
-<bean id="accountDao" class="x.y.jdbc.JdbcAccountDao" />]]></programlisting>
+<bean id="manager" class="ManagerBean" />
+<bean id="accountDao" class="x.y.jdbc.JdbcAccountDao" /></programlisting>
<note>
<para>The '<literal>depends-on</literal>' attribute at the bean
@@ -2545,9 +2544,9 @@ public class ReplacementComputeValue implements MethodReplacer {
fully qualified type name. For example, all the following would match
<classname>java.lang.String</classname>.</para>
- <programlisting language="java"><![CDATA[ java.lang.String
+ <programlisting language="java"> java.lang.String
String
- Str]]></programlisting>
+ Str</programlisting>
<para>Since the number of arguments is often enough to distinguish
between each possible choice, this shortcut can save a lot of typing,
@@ -2874,13 +2873,13 @@ public class ReplacementComputeValue implements MethodReplacer {
the declarations in your web application's
<literal>'web.xml'</literal> file.</para>
- <programlisting language="xml"><![CDATA[<web-app>
+ <programlisting language="xml"><web-app>
...
- <listener>
- <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
- </listener>
+ <listener>
+ <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+ </listener>
...
-</web-app>]]></programlisting>
+</web-app></programlisting>
<para>If you are using an older web container (Servlet 2.3), you will
need to use the provided
@@ -2892,18 +2891,18 @@ public class ReplacementComputeValue implements MethodReplacer {
mapping depends on the surrounding web application configuration and
so you will have to change it as appropriate.)</para>
- <programlisting language="xml"><![CDATA[<web-app>
+ <programlisting language="xml"><web-app>
..
- <filter>
- <filter-name>requestContextFilter</filter-name>
- <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>requestContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter>
+ <filter-name>requestContextFilter</filter-name>
+ <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>requestContextFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
...
-</web-app>]]></programlisting>
+</web-app></programlisting>
<para>That's it. <classname>DispatcherServlet</classname>,
<classname>RequestContextListener</classname> and
@@ -2919,7 +2918,7 @@ public class ReplacementComputeValue implements MethodReplacer {
<para>Consider the following bean definition:</para>
- <programlisting language="xml"><![CDATA[<bean id="loginAction" class="com.foo.LoginAction" scope="request"/>]]></programlisting>
+ <programlisting language="xml"><bean id="loginAction" class="com.foo.LoginAction" scope="request"/></programlisting>
<para>With the above bean definition in place, the Spring container
will create a brand new instance of the
@@ -2941,7 +2940,7 @@ public class ReplacementComputeValue implements MethodReplacer {
<para>Consider the following bean definition:</para>
- <programlisting language="xml"><![CDATA[<bean id="userPreferences" class="com.foo.UserPreferences" scope="session"/>]]></programlisting>
+ <programlisting language="xml"><bean id="userPreferences" class="com.foo.UserPreferences" scope="session"/></programlisting>
<para>With the above bean definition in place, the Spring container
will create a brand new instance of the
@@ -2968,7 +2967,7 @@ public class ReplacementComputeValue implements MethodReplacer {
<para>Consider the following bean definition:</para>
- <programlisting language="xml"><![CDATA[<bean id="userPreferences" class="com.foo.UserPreferences" scope="globalSession"/>]]></programlisting>
+ <programlisting language="xml"><bean id="userPreferences" class="com.foo.UserPreferences" scope="globalSession"/></programlisting>
<para>The <literal>global session</literal> scope is similar to the
standard HTTP <interfacename>Session</interfacename> scope (<link
@@ -3061,11 +3060,11 @@ public class ReplacementComputeValue implements MethodReplacer {
bean definition as it stands is
<emphasis>incomplete</emphasis>):</para>
- <programlisting language="xml"><![CDATA[<bean id="userPreferences" class="com.foo.UserPreferences" scope="session"/>
+ <programlisting language="xml"><bean id="userPreferences" class="com.foo.UserPreferences" scope="session"/>
-<bean id="userManager" class="com.foo.UserManager">
- <property name="userPreferences" ref="userPreferences"/>
-</bean>]]></programlisting>
+<bean id="userManager" class="com.foo.UserManager">
+ <property name="userPreferences" ref="userPreferences"/>
+</bean></programlisting>
<para>From the above configuration it is evident that the singleton
bean <literal>'userManager'</literal> is being injected with a
@@ -3205,28 +3204,28 @@ public class ReplacementComputeValue implements MethodReplacer {
of the bean, after having bound it to the session for future
reference).</para>
- <programlisting language="java"><![CDATA[Object get(String name, ObjectFactory objectFactory)]]></programlisting>
+ <programlisting language="java">Object get(String name, ObjectFactory objectFactory)</programlisting>
<para>The second method should remove the object from the underlying
scope. The session scope implementation for example, removes the
session-scoped bean from the underlying session. The object should be
returned (you are allowed to return null if the object with the
specified name wasn't found)</para>
- <programlisting language="java"><![CDATA[Object remove(String name)]]></programlisting>
+ <programlisting language="java">Object remove(String name)</programlisting>
<para>The third method is used to register callbacks the scope should
execute when it is destroyed or when the specified object in the scope
is destroyed. Please refer to the Javadoc or a Spring scope
implementation for more information on destruction callbacks.</para>
- <programlisting language="java"><![CDATA[void registerDestructionCallback(String name, Runnable destructionCallback)]]></programlisting>
+ <programlisting language="java">void registerDestructionCallback(String name, Runnable destructionCallback)</programlisting>
<para>The last method deals with obtaining the conversation identifier
for the underlying scope. This identifier is different for each scope.
For a session for example, this can be the session identifier.</para>
- <programlisting language="java"><![CDATA[String getConversationId()]]></programlisting>
+ <programlisting language="java">String getConversationId()</programlisting>
</section>
<section id="beans-factory-scopes-custom-using">
@@ -3242,7 +3241,7 @@ public class ReplacementComputeValue implements MethodReplacer {
<interfacename>BeanFactory</interfacename> implementations that ship
with Spring); this central method is displayed below:</para>
- <programlisting language="java"><![CDATA[void registerScope(String scopeName, Scope scope);]]></programlisting>
+ <programlisting language="java">void registerScope(String scopeName, Scope scope);</programlisting>
<para>The first argument to the
<methodname>registerScope(..)</methodname> method is the unique name
@@ -3359,7 +3358,7 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", customScope
<interfacename>InitializingBean</interfacename> interface specifies
exactly one method:</para>
- <programlisting language="java"><![CDATA[void afterPropertiesSet() throws Exception;]]></programlisting>
+ <programlisting language="java">void afterPropertiesSet() throws Exception;</programlisting>
<para>Generally, the use of the
<interfacename>InitializingBean</interfacename> interface can be
@@ -3370,7 +3369,7 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", customScope
<literal>'init-method'</literal> attribute. For example, the following
definition:</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleInitBean" class="examples.ExampleBean" init-method="init"/>]]></programlisting>
+ <programlisting language="xml"><bean id="exampleInitBean" class="examples.ExampleBean" init-method="init"/></programlisting>
<programlisting language="java">public class ExampleBean {
@@ -3381,7 +3380,7 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", customScope
<para>...is exactly the same as...</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleInitBean" class="examples.AnotherExampleBean"/>]]></programlisting>
+ <programlisting language="xml"><bean id="exampleInitBean" class="examples.AnotherExampleBean"/></programlisting>
<programlisting language="java">public class AnotherExampleBean implements InitializingBean {
@@ -3403,7 +3402,7 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", customScope
<interfacename>DisposableBean</interfacename> interface specifies a
single method:</para>
- <programlisting language="java"><![CDATA[void destroy() throws Exception;]]></programlisting>
+ <programlisting language="java">void destroy() throws Exception;</programlisting>
<para>Generally, the use of the
<interfacename>DisposableBean</interfacename> callback interface can
@@ -3415,7 +3414,7 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", customScope
<literal><bean/></literal>. For example, the following
definition:</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleInitBean" class="examples.ExampleBean" destroy-method="cleanup"/>]]></programlisting>
+ <programlisting language="xml"><bean id="exampleInitBean" class="examples.ExampleBean" destroy-method="cleanup"/></programlisting>
<programlisting language="java">public class ExampleBean {
@@ -3426,7 +3425,7 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", customScope
<para>...is exactly the same as...</para>
- <programlisting language="xml"><![CDATA[<bean id="exampleInitBean" class="examples.AnotherExampleBean"/>]]></programlisting>
+ <programlisting language="xml"><bean id="exampleInitBean" class="examples.AnotherExampleBean"/></programlisting>
<programlisting language="java">public class AnotherExampleBean implements DisposableBean {
@@ -3667,10 +3666,10 @@ public final class Boot {
<interfacename>BeanFactory</interfacename> that created it, when it is
created by that <interfacename>BeanFactory</interfacename>.</para>
- <programlisting language="java"><![CDATA[public interface BeanFactoryAware {
+ <programlisting language="java">public interface BeanFactoryAware {
void setBeanFactory(BeanFactory beanFactory) throws BeansException;
-}]]></programlisting>
+}</programlisting>
<para>This allows beans to manipulate the
<interfacename>BeanFactory</interfacename> that created them
@@ -3713,7 +3712,7 @@ public final class Boot {
<classname>ObjectFactoryCreatingFactoryBean</classname> with the name
of the bean that is to be looked up. Let's look at an example:</para>
- <programlisting language="java"><![CDATA[package x.y;
+ <programlisting language="java">package x.y;
public class NewsFeed {
@@ -3726,9 +3725,9 @@ public class NewsFeed {
public String getNews() {
return this.toString() + ": '" + news + "'";
}
-}]]></programlisting>
+}</programlisting>
- <programlisting language="java"><![CDATA[package x.y;
+ <programlisting language="java">package x.y;
import org.springframework.beans.factory.ObjectFactory;
@@ -3746,28 +3745,28 @@ public class NewsFeedManager {
NewsFeed news = (NewsFeed) factory.getObject();
System.out.println(news.getNews());
}
-}]]></programlisting>
+}</programlisting>
<para>Find below the XML configuration to wire together the above
classes using the
<classname>ObjectFactoryCreatingFactoryBean</classname>
approach.</para>
- <programlisting language="xml"><![CDATA[<beans>
- <bean id="newsFeedManager" class="x.y.NewsFeedManager">
- <property name="factory">
- <bean
-class="org.springframework.beans.factory.config.ObjectFactoryCreatingFactoryBean">
- <property name="targetBeanName">
- <idref local="newsFeed" />
- </property>
- </bean>
- </property>
- </bean>
- <bean id="newsFeed" class="x.y.NewsFeed" scope="prototype">
- <property name="news" value="... that's fit to print!" />
- </bean>
-</beans>]]></programlisting>
+ <programlisting language="xml"><beans>
+ <bean id="newsFeedManager" class="x.y.NewsFeedManager">
+ <property name="factory">
+ <bean
+class="org.springframework.beans.factory.config.ObjectFactoryCreatingFactoryBean">
+ <property name="targetBeanName">
+ <idref local="newsFeed" />
+ </property>
+ </bean>
+ </property>
+ </bean>
+ <bean id="newsFeed" class="x.y.NewsFeed" scope="prototype">
+ <property name="news" value="... that's fit to print!" />
+ </bean>
+</beans></programlisting>
<para>And here is a small driver program to test the fact that new
(prototype) instances of the <literal>newsFeed</literal> bean are
@@ -3776,7 +3775,7 @@ class="org.springframework.beans.factory.config.ObjectFactoryCreatingFactoryBean
<classname>NewsFeedManager</classname>'s
<methodname>printNews()</methodname> method.</para>
- <programlisting language="java"><![CDATA[import org.springframework.context.ApplicationContext;
+ <programlisting language="java">import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import x.y.NewsFeedManager;
@@ -3789,13 +3788,13 @@ public class Main {
manager.printNews();
manager.printNews();
}
-}]]></programlisting>
+}</programlisting>
<para>The output from running the above program will look like so
(results will of course vary on your machine).</para>
- <programlisting language="java"><![CDATA[x.y.NewsFeed@1292d26: '... that's fit to print!'
-x.y.NewsFeed@5329c5: '... that's fit to print!']]></programlisting>
+ <programlisting language="java">x.y.NewsFeed@1292d26: '... that's fit to print!'
+x.y.NewsFeed@5329c5: '... that's fit to print!'</programlisting>
<para>As of Spring 2.5, you can rely upon autowiring of the
<interfacename>BeanFactory</interfacename> as yet another alternative
@@ -4138,7 +4137,7 @@ public class InstantiationTracingBeanPostProcessor implements BeanPostProcessor
<para>Find below a small driver script to exercise the above code and
configuration;</para>
- <programlisting language="java"><![CDATA[import org.springframework.context.ApplicationContext;
+ <programlisting language="java">import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.scripting.Messenger;
@@ -4149,13 +4148,13 @@ public final class Boot {
Messenger messenger = (Messenger) ctx.getBean("messenger");
System.out.println(messenger);
}
-}]]></programlisting>
+}</programlisting>
<para>The output of executing the above program will be (something
like) this:</para>
- <programlisting><![CDATA[Bean 'messenger' created : org.springframework.scripting.groovy.GroovyMessenger@272961
-org.springframework.scripting.groovy.GroovyMessenger@272961]]></programlisting>
+ <programlisting>Bean 'messenger' created : org.springframework.scripting.groovy.GroovyMessenger@272961
+org.springframework.scripting.groovy.GroovyMessenger@272961</programlisting>
</section>
<section id="beans-factory-extension-bpp-examples-rabpp">
@@ -4316,18 +4315,18 @@ cfg.postProcessBeanFactory(factory);</programlisting>
<para>The actual values come from another file in the standard Java
<classname>Properties</classname> format:</para>
- <programlisting language="java"><![CDATA[jdbc.driverClassName=org.hsqldb.jdbcDriver
+ <programlisting language="java">jdbc.driverClassName=org.hsqldb.jdbcDriver
jdbc.url=jdbc:hsqldb:hsql://production:9002
jdbc.username=sa
-jdbc.password=root]]></programlisting>
+jdbc.password=root</programlisting>
<para>With the <literal>context</literal> namespace introduced in
Spring 2.5, it is possible to configure property placeholders with a
dedicated configuration element. Multiple locations may be provided as
a comma-separated list for the <literal>location</literal>
attribute.</para>
- <programlisting language="xml"><![CDATA[<context:property-placeholder location="classpath:com/foo/jdbc.properties"/>]]></programlisting>
+ <programlisting language="xml"><context:property-placeholder location="classpath:com/foo/jdbc.properties"/></programlisting>
<para>The <classname>PropertyPlaceholderConfigurer</classname> doesn't
only look for properties in the <classname>Properties</classname> file
@@ -4350,16 +4349,16 @@ jdbc.password=root]]></programlisting>
you have to pick a particular implementation class at runtime. For
example:</para>
- <programlisting language="xml"><![CDATA[<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <value>classpath:com/foo/strategy.properties</value>
- </property>
- <property name="properties">
- <value>custom.strategy.class=com.foo.DefaultStrategy</value>
- </property>
-</bean>
+ <programlisting language="xml"><bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <value>classpath:com/foo/strategy.properties</value>
+ </property>
+ <property name="properties">
+ <value>custom.strategy.class=com.foo.DefaultStrategy</value>
+ </property>
+</bean>
-<bean id="serviceStrategy" class="${custom.strategy.class}"/>]]></programlisting>
+<bean id="serviceStrategy" class="${custom.strategy.class}"/></programlisting>
<para>If the class is unable to be resolved at runtime to a valid
class, resolution of the bean will fail once it is about to be
@@ -4393,12 +4392,12 @@ jdbc.password=root]]></programlisting>
<para>Properties file configuration lines are expected to be in the
format:</para>
- <programlisting language="java"><![CDATA[beanName.property=value]]></programlisting>
+ <programlisting language="java">beanName.property=value</programlisting>
<para>An example properties file might look like this:</para>
- <programlisting language="java"><![CDATA[dataSource.driverClassName=com.mysql.jdbc.Driver
-dataSource.url=jdbc:mysql:mydb]]></programlisting>
+ <programlisting language="java">dataSource.driverClassName=com.mysql.jdbc.Driver
+dataSource.url=jdbc:mysql:mydb</programlisting>
<para>This example file would be usable against a container definition
which contains a bean called <emphasis>dataSource</emphasis>, which
@@ -4410,7 +4409,7 @@ dataSource.url=jdbc:mysql:mydb]]></programlisting>
is already non-null (presumably initialized by the constructors). In
this example...</para>
- <programlisting language="java"><![CDATA[foo.fred.bob.sammy=123]]></programlisting>
+ <programlisting language="java">foo.fred.bob.sammy=123</programlisting>
<para>... the <literal>sammy</literal> property of the
<literal>bob</literal> property of the <literal>fred</literal>
@@ -4426,7 +4425,7 @@ dataSource.url=jdbc:mysql:mydb]]></programlisting>
Spring 2.5, it is possible to configure property overriding with a
dedicated configuration element:</para>
- <programlisting language="xml"><![CDATA[<context:property-override location="classpath:override.properties"/>]]></programlisting>
+ <programlisting language="xml"><context:property-override location="classpath:override.properties"/></programlisting>
</section>
</section>
@@ -4719,18 +4718,18 @@ dataSource.url=jdbc:mysql:mydb]]></programlisting>
source. The <classname>ResourceBundleMessageSource</classname> is more
interesting and is the one we will provide an example for:</para>
- <programlisting language="xml"><![CDATA[<beans>
- <bean id="messageSource"
- class="org.springframework.context.support.ResourceBundleMessageSource">
- <property name="basenames">
- <list>
- <value>format</value>
- <value>exceptions</value>
- <value>windows</value>
- </list>
- </property>
- </bean>
-</beans>]]></programlisting>
+ <programlisting language="xml"><beans>
+ <bean id="messageSource"
+ class="org.springframework.context.support.ResourceBundleMessageSource">
+ <property name="basenames">
+ <list>
+ <value>format</value>
+ <value>exceptions</value>
+ <value>windows</value>
+ </list>
+ </property>
+ </bean>
+</beans></programlisting>
<para>This assumes you have three resource bundles defined on your
classpath called <literal>format</literal>,
@@ -4753,15 +4752,15 @@ argument.required=The '{0}' argument is required.</programlisting>
implementations and so can be cast to the
<classname>MessageSource</classname> interface.</para>
- <programlisting language="java"><![CDATA[public static void main(String[] args) {
+ <programlisting language="java">public static void main(String[] args) {
MessageSource resources = new ClassPathXmlApplicationContext("beans.xml");
String message = resources.getMessage("message", null, "Default", null);
System.out.println(message);
-}]]></programlisting>
+}</programlisting>
<para>The resulting output from the above program will be...</para>
- <programlisting><![CDATA[Alligators rock!]]></programlisting>
+ <programlisting>Alligators rock!</programlisting>
<para>So to summarize, the <classname>MessageSource</classname> is
defined in a file called <literal>'beans.xml'</literal> (this file
@@ -4793,7 +4792,7 @@ argument.required=The '{0}' argument is required.</programlisting>
</beans></programlisting>
- <programlisting language="java"><![CDATA[public class Example {
+ <programlisting language="java">public class Example {
private MessageSource messages;
@@ -4807,12 +4806,12 @@ argument.required=The '{0}' argument is required.</programlisting>
System.out.println(message);
}
-}]]></programlisting>
+}</programlisting>
<para>The resulting output from the invocation of the
<methodname>execute()</methodname> method will be...</para>
- <programlisting><![CDATA[The 'userDao' argument is required.]]></programlisting>
+ <programlisting>The 'userDao' argument is required.</programlisting>
<para>With regard to internationalization (i18n), Spring's various
<classname>MessageResource</classname> implementations follow the same
@@ -4832,17 +4831,17 @@ argument.required=The '{0}' argument is required.</programlisting>
<programlisting><lineannotation># in 'exceptions_en_GB.properties'</lineannotation>
argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</programlisting>
- <programlisting language="java"><![CDATA[public static void main(final String[] args) {
+ <programlisting language="java">public static void main(final String[] args) {
MessageSource resources = new ClassPathXmlApplicationContext("beans.xml");
String message = resources.getMessage("argument.required",
new Object [] {"userDao"}, "Required", Locale.UK);
System.out.println(message);
-}]]></programlisting>
+}</programlisting>
<para>The resulting output from the running of the above program will
be...</para>
- <programlisting><![CDATA[Ebagum lad, the 'userDao' argument is required, I say, required.]]></programlisting>
+ <programlisting>Ebagum lad, the 'userDao' argument is required, I say, required.</programlisting>
<para>The <classname>MessageSourceAware</classname> interface can also
be used to acquire a reference to any
@@ -4989,19 +4988,19 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</
<para>Let's look at an example. First, the
<interfacename>ApplicationContext</interfacename>:</para>
- <programlisting language="xml"><![CDATA[<bean id="emailer" class="example.EmailBean">
- <property name="blackList">
- <list>
- <value>black@list.org</value>
- <value>white@list.org</value>
- <value>john@doe.org</value>
- </list>
- </property>
-</bean>
+ <programlisting language="xml"><bean id="emailer" class="example.EmailBean">
+ <property name="blackList">
+ <list>
+ <value>black@list.org</value>
+ <value>white@list.org</value>
+ <value>john@doe.org</value>
+ </list>
+ </property>
+</bean>
-<bean id="blackListListener" class="example.BlackListNotifier">
- <property name="notificationAddress" value="spam@list.org"/>
-</bean>]]></programlisting>
+<bean id="blackListListener" class="example.BlackListNotifier">
+ <property name="notificationAddress" value="spam@list.org"/>
+</bean></programlisting>
<para>Now, let's look at the actual classes:</para>
@@ -5732,12 +5731,12 @@ public @interface Genre {
Internet connection is available. First define the simple
annotation:</para>
- <programlisting language="java"><![CDATA[@Target({ElementType.FIELD, ElementType.PARAMETER})
+ <programlisting language="java">@Target({ElementType.FIELD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Qualifier
public @interface Offline {
-}]]></programlisting>
+}</programlisting>
<para>Then add the annotation to the field or property to be
autowired:</para>
@@ -5767,22 +5766,22 @@ public @interface Offline {
be considered an autowire candidate. As an example, consider the
following annotation definition:</para>
- <programlisting language="java"><![CDATA[@Target({ElementType.FIELD, ElementType.PARAMETER})
+ <programlisting language="java">@Target({ElementType.FIELD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Qualifier
public @interface MovieQualifier {
String genre();
Format format();
-}]]></programlisting>
+}</programlisting>
<para>In this case <literal>Format</literal> is an enum:</para>
- <programlisting language="java"><![CDATA[public enum Format {
+ <programlisting language="java">public enum Format {
VHS, DVD, BLURAY
-}]]></programlisting>
+}</programlisting>
<para>The fields to be autowired are annotated with the custom qualifier
and include values for both attributes: <literal>'genre'</literal> and
@@ -5871,13 +5870,13 @@ public @interface MovieQualifier {
even if they are not themselves annotated with Spring's
<interfacename>@Qualifier</interfacename> annotation.</para>
- <programlisting language="xml"><![CDATA[<bean id="customAutowireConfigurer" class="org.springframework.beans.factory.annotation.CustomAutowireConfigurer">
- <property name="customQualifierTypes">
- <set>
- <value>example.CustomQualifier</value>
- </set>
- </property>
-</bean>]]></programlisting>
+ <programlisting language="xml"><bean id="customAutowireConfigurer" class="org.springframework.beans.factory.annotation.CustomAutowireConfigurer">
+ <property name="customQualifierTypes">
+ <set>
+ <value>example.CustomQualifier</value>
+ </set>
+ </property>
+</bean></programlisting>
<para>Note that the particular implementation of
<interfacename>AutowireCandidateResolver</interfacename> that will be
@@ -6097,7 +6096,7 @@ public @interface MovieQualifier {
<interfacename>ApplicationContext</interfacename>. For example, the
following two classes are eligible for such autodetection:</para>
- <programlisting language="java"><![CDATA[@Service
+ <programlisting language="java">@Service
public class SimpleMovieLister {
private MovieFinder movieFinder;
@@ -6106,7 +6105,7 @@ public class SimpleMovieLister {
public SimpleMovieLister(MovieFinder movieFinder) {
this.movieFinder = movieFinder;
}
-}]]></programlisting>
+}</programlisting>
<programlisting language="java">@Repository
public class JpaMovieFinder implements MovieFinder {
@@ -6119,18 +6118,18 @@ public class JpaMovieFinder implements MovieFinder {
alternatively a comma-separated list could be specified that included
the parent package of each class).</para>
- <programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+ <programlisting language="xml"><?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:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
- <context:component-scan base-package="org.example"/>
+ <context:component-scan base-package="org.example"/>
-</beans>]]></programlisting>
+</beans></programlisting>
<note>
<para>Note that the scanning of classpath packages requires the
@@ -6247,14 +6246,14 @@ public class JpaMovieFinder implements MovieFinder {
<interfacename>@Repository</interfacename> annotations and using "stub"
repositories instead.</para>
- <programlisting language="xml"><![CDATA[<beans ...>
+ <programlisting language="xml"><beans ...>
- <context:component-scan base-package="org.example">
- <context:include-filter type="regex" expression=".*Stub.*Repository"/>
- <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Repository"/>
- </context:component-scan>
+ <context:component-scan base-package="org.example">
+ <context:include-filter type="regex" expression=".*Stub.*Repository"/>
+ <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Repository"/>
+ </context:component-scan>
-</beans>]]></programlisting>
+</beans></programlisting>
<note>
<para>It is also possible to disable the default filters by providing
@@ -6307,12 +6306,12 @@ public class MovieFinderImpl implements MovieFinder {
scanner:</para>
</note>
- <programlisting language="xml"><![CDATA[<beans ...>
+ <programlisting language="xml"><beans ...>
- <context:component-scan base-package="org.example"
- name-generator="org.example.MyNameGenerator" />
+ <context:component-scan base-package="org.example"
+ name-generator="org.example.MyNameGenerator" />
-</beans>]]></programlisting>
+</beans></programlisting>
<para>As a general rule, consider specifying the name with the
annotation whenever other components may be making explicit references
@@ -6345,12 +6344,12 @@ public class MovieFinderImpl implements MovieFinder {
scanner:</para>
</note>
- <programlisting language="xml"><![CDATA[<beans ...>
+ <programlisting language="xml"><beans ...>
- <context:component-scan base-package="org.example"
- scope-resolver="org.example.MyScopeResolver" />
+ <context:component-scan base-package="org.example"
+ scope-resolver="org.example.MyScopeResolver" />
-</beans>]]></programlisting>
+</beans></programlisting>
<para>When using certain non-singleton scopes, it may be necessary to
generate proxies for the scoped objects. The reasoning is described in
@@ -6361,12 +6360,12 @@ public class MovieFinderImpl implements MovieFinder {
'interfaces', and 'targetClass'. For example, the following
configuration will result in standard JDK dynamic proxies:</para>
- <programlisting language="xml"><![CDATA[<beans ...>
+ <programlisting language="xml"><beans ...>
- <context:component-scan base-package="org.example"
- scoped-proxy="interfaces" />
+ <context:component-scan base-package="org.example"
+ scoped-proxy="interfaces" />
-</beans>]]></programlisting>
+</beans></programlisting>
</section>
<section id="beans-scanning-qualifiers">
@@ -6414,57 +6413,96 @@ public class CachingMovieCatalog implements MovieCatalog {
per-class.</para>
</note>
</section>
-<section id="beans-factorybeans-annotations">
- <title>Defining FactoryBeans with annotations</title>
-
- <para>FactoryBeans can be defined in code using the
- <classname>@FactoryMethod </classname>method level annotation. Factory bean
- definiton supports using standard as well as custom qualifiers using
- annotations. The scope of the object produces and if it should be a scoped
- AOP proxy are determined by the presence of <classname>@Scope</classname>
- and <classname>@ScopedProxy</classname> annotations. The default scope for
- methods with <classname>@FactoryMethod</classname> can also be inherited
- from the class level. The following example shows a variety of usages of the
- <classname>@FactoryMethod</classname> annotation.</para>
-
- <programlisting language="java">@Component
+
+ <section id="beans-factorybeans-annotations">
+ <title>Defining bean metadata within components</title>
+
+ <para>Spring components can also contribute bean definition metadata to
+ the container. This is done with the same <literal>@Bean</literal>
+ annotation used to define bean metadata within
+ <literal>@Configuration</literal> annotated classes. Here is a simple
+ example</para>
+
+ <programlisting>@Component
+public class FactoryMethodComponent {
+
+ @Bean @Qualifier("public")
+ public TestBean publicInstance() {
+ return new TestBean("publicInstance");
+ }
+
+ public void DoWork()
+ {
+ // Component method implementation omitted
+ }
+}</programlisting>
+
+ <para>This class is a Spring component and has appliation specific code
+ contained in its <methodname>DoWork</methodname> method. However, it
+ also contributes a bean definition that has a factory method refering to
+ the method <methodname>publicInstance</methodname>. The
+ <literal>@Bean</literal> annotation identifies the factory method and
+ also other bean definition properties, such as a qualifier value via the
+ <classname>@Qualifier</classname> annotation. Other method level
+ annotations that can be specified are <literal>@Scope</literal>,
+ <literal>@Lazy</literal>, and custom qualifier annotations. Autowired
+ fields and methods are supported as before with the additional support
+ for autowiring of @Bean methods, as shown in the example below</para>
+
+ <programlisting language="java">@Component
public class FactoryMethodComponent {
- private static TestBean staticTestBean = new TestBean("staticInstance",1);
-
- @Autowired @Qualifier("public")
- public TestBean autowiredTestBean;
-
- private static int i;
-
- @FactoryMethod @Qualifier("static")
- public static TestBean staticInstance()
- {
- return staticTestBean;
- }
-
- @FactoryMethod @Qualifier("public")
- public TestBean getPublicInstance() {
- return new TestBean("publicInstance");
- }
-
- @FactoryMethod @BeanAge(1)
- protected TestBean getProtectedInstance() {
- return new TestBean("protectedInstance", 1);
- }
-
- @FactoryMethod @Scope("prototype")
- private TestBean getPrivateInstance() {
- return new TestBean("privateInstance", i++);
- }
-
- @FactoryMethod @Scope("request") @ScopedProxy
- private TestBean getPrivateInstance() {
- return new TestBean("privateInstance", i++);
- }
+ private static int i;
+
+ @Bean @Qualifier("public")
+ public TestBean publicInstance() {
+ return new TestBean("publicInstance");
+ }
+
+ // use of a custom qualifier and autowiring of method parameters
+
+ @Bean @BeanAge(1)
+ protected TestBean protectedInstance(@Qualifier("public") TestBean spouse, @Value("#{privateInstance.age}") String country) {
+ TestBean tb = new TestBean("protectedInstance", 1);
+ tb.setSpouse(tb);
+ tb.setCountry(country);
+ return tb;
+ }
+
+ @Bean @Scope("prototype")
+ private TestBean privateInstance() {
+ return new TestBean("privateInstance", i++);
+ }
+
+ @Bean @Scope(value = "request", proxyMode = ScopedProxyMode.TARGET_CLASS)
+ public TestBean requestScopedInstance() {
+ return new TestBean("requestScopedInstance", 3);
+ }
}
</programlisting>
-</section>
+
+ <para>Note the use of autowiring of the <classname>String</classname>
+ method parameter <literal>country</literal> to the value of the
+ <literal>Age</literal> property on another bean named
+ <literal>privateInstance</literal>. A Spring Expression Language element
+ is used to define the value of the property via the notation <literal>#{
+ <expression> }</literal>. For <literal>@Value</literal>
+ annotations, an expression resolver is preconfigured to look for bean
+ names when resolving expression text.</para>
+
+ <para>The <literal>@Bean</literal> methods in a Spring component are
+ processed differently than their counterparts inside a Spring
+ <literal>@Configuration</literal> class. The difference is that
+ <literal>@Component</literal> classes are not enhanced with CGLIB to
+ intercept the invocation of methods and fields. CGLIB proxying is the
+ means by which invoking methods or fields within
+ <literal>@Configuration</literal> classes' <literal>@Bean</literal>
+ methods create bean metadata references to collaborating objects and do
+ <emphasis>not</emphasis> invoke the method with normal Java semantics.
+ In contrast, calling a method or field within a
+ <literal>@Component</literal> classes' <literal>@Bean</literal> method
+ <emphasis>has</emphasis> standard Java semantics.</para>
+ </section>
</section>
<section id="context-load-time-weaver">
@@ -6473,11 +6511,11 @@ public class FactoryMethodComponent {
<para>The <literal>context</literal> namespace introduced in Spring 2.5
provides a <literal>load-time-weaver</literal> element.</para>
- <programlisting language="xml"><![CDATA[<beans ...>
+ <programlisting language="xml"><beans ...>
- <context:load-time-weaver/>
+ <context:load-time-weaver/>
-</beans>]]></programlisting>
+</beans></programlisting>
<para>Adding this element to an XML-based Spring configuration file
activates a Spring <interfacename>LoadTimeWeaver</interfacename> for the
@@ -6491,4 +6529,4 @@ public class FactoryMethodComponent {
for more detail. For more on AspectJ load-time weaving, see <xref
linkend="aop-aj-ltw" />.</para>
</section>
-</chapter>
\ No newline at end of file
+</chapter> | true |
Other | spring-projects | spring-framework | c2f4f97fa5b6f2a5d4b9214151151f52ed163afe.json | Update docs to use of @Bean inside a @Component | spring-framework-reference/src/new-in-3.xml | @@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="new-in-3">
<title>What's new in Spring 3.0?</title>
@@ -178,8 +177,9 @@
</listitem>
<listitem>
- <para>Object to XML mapping functionality (OXM) moved from Spring Web Services project</para>
- </listitem>
+ <para>Object to XML mapping functionality (OXM) moved from Spring Web
+ Services project</para>
+ </listitem>
<listitem>
<para>Comprehensive REST support</para>
@@ -348,32 +348,33 @@ public class AppConfig{
</section>
<section>
- <title>Factory Bean definitions using annotations</title>
+ <title>Defining bean metadata within components</title>
- <para>FactoryBeans can be defined within a Spring component definition
- and registered using standard component-scanning techniques. See <link
- linkend="beans-factorybeans-annotations">Factory Bean Definitions
- using annotations</link> for more information</para>
+ <para><literal>@Bean</literal> annotated methods are also supported
+ inside Spring components. They contribute a factory bean definition to
+ the container. See <link
+ linkend="beans-factorybeans-annotations">Defining bean metadata within
+ components</link> for more information</para>
</section>
- </section>
-
- <section id="new-feature-oxm">
- <title>The Data Tier</title>
+ </section>
- <para>Object to XML mapping functionality (OXM) from the Spring Web Services project have
- been moved to the core Spring Framework now. The functionality is found in the
- <literal>org.springframework.oxm</literal> package. More information on
- the use of the <literal>OXM</literal> can be found
- in the <link linkend="oxm">Marshalling XML using O/X Mappers</link> chapter.</para>
+ <section id="new-feature-oxm">
+ <title>The Data Tier</title>
- </section>
+ <para>Object to XML mapping functionality (OXM) from the Spring Web
+ Services project have been moved to the core Spring Framework now. The
+ functionality is found in the <literal>org.springframework.oxm</literal>
+ package. More information on the use of the <literal>OXM</literal> can
+ be found in the <link linkend="oxm">Marshalling XML using O/X
+ Mappers</link> chapter.</para>
+ </section>
<section id="new-feature-rest">
<title>The Web Tier</title>
- <para>The most exciting new feature for the Web Tier is the support for building
- RESTful web services and web applications. There are also some new annotations that
- can be used in any web application.</para>
+ <para>The most exciting new feature for the Web Tier is the support for
+ building RESTful web services and web applications. There are also some
+ new annotations that can be used in any web application.</para>
<section>
<title>Comprehensive REST support</title>
@@ -387,14 +388,14 @@ public class AppConfig{
functionality make use of
<interfacename>HttpConverter</interfacename>s to facilitate the
conversion between objects and their representation in HTTP request
- and replies. </para>
+ and replies.</para>
<para>The <classname>MarhsallingHttpMessageConverter</classname> uses
- the <emphasis>Object to XML mapping</emphasis> functionality mentioned earlier.</para>
+ the <emphasis>Object to XML mapping</emphasis> functionality mentioned
+ earlier.</para>
<para>Refer to the section on <link linkend="rest">REST support</link>
for more information.</para>
-
</section>
<section>
@@ -407,7 +408,6 @@ public class AppConfig{
@CookieValue annotation</link> and <link
linkend="mvc-ann-requestheader">Mapping request header attributes with
the @RequestHeader annotation</link> for more information.</para>
-
</section>
</section>
@@ -422,10 +422,11 @@ public class AppConfig{
<section id="new-feature-jee-6">
<title>Early support for Java EE 6</title>
- <para>We provide support for asynchronous method invocations through the use of
- the new @Async annotation (or EJB 3.1's @Asynchronous annotation).</para>
+ <para>We provide support for asynchronous method invocations through the
+ use of the new @Async annotation (or EJB 3.1's @Asynchronous
+ annotation).</para>
- <para>JSF 2.0, JPA 2.0, etc</para>
+ <para>JSF 2.0, JPA 2.0, etc</para>
<para>Work in progress... not part of the Spring 3.0 M3 release.</para>
</section> | true |
Other | spring-projects | spring-framework | c2f4f97fa5b6f2a5d4b9214151151f52ed163afe.json | Update docs to use of @Bean inside a @Component | spring-framework-reference/src/rest.xml | @@ -853,8 +853,10 @@ URI location = template.postForLocation(uri, booking, String.class, "1");
<section id="rest-message-conversion">
<title>HTTP Message Conversion</title>
- <para>Objects passed to and returned from the methods getForObject(),
- postForLocation(), and put() and are converted to HTTP requests and from
+ <para>Objects passed to and returned from the methods
+ <methodname>getForObject</methodname>,
+ <methodname>postForLocation</methodname>, and
+ <methodname>put</methodname> are converted to HTTP requests and from
HTTP responses by <interfacename>HttpMessageConverters</interfacename>.
The <interfacename>HttpMessageConverter</interfacename> interface is
show below to give you a better feel for its functionality</para> | true |
Other | spring-projects | spring-framework | dc2ca51f4e69676b7f2bc6183b2605c0b6d2a52e.json | Reorder the publishing | build-spring-framework/publish-top-level.xml | @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="publish-top-level" xmlns:aws="antlib:org.springframework.build.aws">
- <target name="publish" depends="publish-multi-bundle.publish, publish-package"
+ <target name="publish" depends="publish-package, publish-multi-bundle.publish"
description="Publish package, Ivy, and Maven artifacts"/>
<target name="publish-package" depends="aws.init"> | false |
Other | spring-projects | spring-framework | df3881d1e87579b2cad7ac4a059e83b0f8320af9.json | Update groovy dependency to match ivy.xml | org.springframework.context/context.iml | @@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="module" module-name="aop" />
- <orderEntry type="module" module-name="beans" />
- <orderEntry type="module" module-name="core" />
- <orderEntry type="module" module-name="expression" />
- <orderEntry type="module" module-name="instrument" />
- <orderEntry type="library" name="AOP Alliance" level="project" />
- <orderEntry type="library" name="AspectJ" level="project" />
- <orderEntry type="library" name="CGLIB" level="project" />
- <orderEntry type="library" name="Commons Logging" level="project" />
- <orderEntry type="library" name="Commons Pool" level="project" />
- <orderEntry type="library" name="EasyMock" level="project" />
- <orderEntry type="library" name="JUnit" level="project" />
- <orderEntry type="library" name="Log4j" level="project" />
- <orderEntry type="library" name="SLF4j" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../org.springframework.asm/target/artifacts/org.springframework.asm.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-sources-1.0.0.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/org.beanshell/com.springsource.bsh/2.0.0.b4/com.springsource.bsh-2.0.0.b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/com.sun.enterprise/com.springsource.com.sun.enterprise.loader/1.0.0/com.springsource.com.sun.enterprise.loader-1.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-sources-3.0.0.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/com.oracle.oc4j/com.springsource.oracle.classloader/10.1.3.1/com.springsource.oracle.classloader-10.1.3.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-1.5.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-sources-1.5.1.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-1.2.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-sources-1.2.0.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/javax.validation/com.springsource.javax.validation/1.0.0.CR3/com.springsource.javax.validation-1.0.0.CR3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/javax.validation/com.springsource.javax.validation/1.0.0.CR3/com.springsource.javax.validation-sources-1.0.0.CR3.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.0.0.Beta2/com.springsource.org.hibernate.validator-4.0.0.Beta2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.0.0.Beta2/com.springsource.org.hibernate.validator-sources-4.0.0.Beta2.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- </component>
- <component name="copyright">
- <Base>
- <setting name="state" value="2" />
- </Base>
- </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="module" module-name="aop" />
+ <orderEntry type="module" module-name="beans" />
+ <orderEntry type="module" module-name="core" />
+ <orderEntry type="module" module-name="expression" />
+ <orderEntry type="module" module-name="instrument" />
+ <orderEntry type="library" name="AOP Alliance" level="project" />
+ <orderEntry type="library" name="AspectJ" level="project" />
+ <orderEntry type="library" name="CGLIB" level="project" />
+ <orderEntry type="library" name="Commons Logging" level="project" />
+ <orderEntry type="library" name="Commons Pool" level="project" />
+ <orderEntry type="library" name="EasyMock" level="project" />
+ <orderEntry type="library" name="JUnit" level="project" />
+ <orderEntry type="library" name="Log4j" level="project" />
+ <orderEntry type="library" name="SLF4j" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../org.springframework.asm/target/artifacts/org.springframework.asm.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/javax.persistence/com.springsource.javax.persistence/1.0.0/com.springsource.javax.persistence-sources-1.0.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.beanshell/com.springsource.bsh/2.0.0.b4/com.springsource.bsh-2.0.0.b4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/com.sun.enterprise/com.springsource.com.sun.enterprise.loader/1.0.0/com.springsource.com.sun.enterprise.loader-1.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-sources-3.0.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/com.oracle.oc4j/com.springsource.oracle.classloader/10.1.3.1/com.springsource.oracle.classloader-10.1.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.6.3/com.springsource.org.codehaus.groovy-1.6.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.6.3/com.springsource.org.codehaus.groovy-sources-1.6.3.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-1.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-sources-1.2.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/javax.validation/com.springsource.javax.validation/1.0.0.CR3/com.springsource.javax.validation-1.0.0.CR3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/javax.validation/com.springsource.javax.validation/1.0.0.CR3/com.springsource.javax.validation-sources-1.0.0.CR3.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.0.0.Beta2/com.springsource.org.hibernate.validator-4.0.0.Beta2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate.validator/4.0.0.Beta2/com.springsource.org.hibernate.validator-sources-4.0.0.Beta2.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="2" />
+ </Base>
+ </component>
+</module>
+ | false |
Other | spring-projects | spring-framework | ea9df82d2adb82fbb337b328e965a6e439541695.json | ignore failing tests | org.springframework.core/.settings/org.eclipse.jdt.core.prefs | @@ -1,4 +1,4 @@
-#Thu Dec 18 06:34:35 PST 2008
+#Mon Mar 30 13:51:02 EDT 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -62,10 +62,10 @@ org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
@@ -256,7 +256,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=120
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 | true |
Other | spring-projects | spring-framework | ea9df82d2adb82fbb337b328e965a6e439541695.json | ignore failing tests | org.springframework.core/.settings/org.eclipse.jdt.ui.prefs | @@ -1,4 +1,4 @@
-#Thu Dec 18 06:34:35 PST 2008
+#Mon Mar 30 13:51:02 EDT 2009
eclipse.preferences.version=1
-formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
+formatter_profile=_Spring
formatter_settings_version=11 | true |
Other | spring-projects | spring-framework | ea9df82d2adb82fbb337b328e965a6e439541695.json | ignore failing tests | org.springframework.core/src/test/java/org/springframework/core/convert/service/GenericConversionServiceTests.java | @@ -25,6 +25,7 @@
import junit.framework.TestCase;
import org.junit.Ignore;
+import org.junit.Test;
import org.springframework.core.convert.ConversionException;
import org.springframework.core.convert.ConversionExecutionException;
import org.springframework.core.convert.ConversionExecutor;
@@ -229,15 +230,17 @@ public void testConversionListToArrayWithComponentConversion() {
}
@Ignore
- public void testConversionObjectToArray() {
+ @Test
+ public void conversionObjectToArray() {
ConversionExecutor executor = service.getConversionExecutor(type(String.class), type(String[].class));
String[] result = (String[]) executor.execute("1,2,3");
assertEquals(1, result.length);
assertEquals("1,2,3", result[0]);
}
@Ignore
- public void testConversionObjectToArrayWithElementConversion() {
+ @Test
+ public void conversionObjectToArrayWithElementConversion() {
service.addConverter(new StringToInteger());
ConversionExecutor executor = service.getConversionExecutor(type(String.class), type(Integer[].class));
Integer[] result = (Integer[]) executor.execute("123");
@@ -305,14 +308,16 @@ public long longValue() {
}
@Ignore
- public void testCustomConverterConversionForwardIndex() {
+ @Test
+ public void customConverterConversionForwardIndex() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(String.class), type(Principal.class));
assertEquals("keith", ((Principal) executor.execute("keith")).getName());
}
@Ignore
- public void testCustomConverterConversionReverseIndex() {
+ @Test
+ public void customConverterConversionReverseIndex() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(Principal.class), type(String.class));
assertEquals("keith", executor.execute(new Principal() {
@@ -323,14 +328,16 @@ public String getName() {
}
@Ignore
- public void testCustomConverterConversionForSameType() {
+ @Test
+ public void customConverterConversionForSameType() {
service.addConverter("trimmer", new Trimmer());
ConversionExecutor executor = service.getConversionExecutor("trimmer", type(String.class), type(String.class));
assertEquals("a string", executor.execute("a string "));
}
@Ignore
- public void testCustomConverterLookupNotCompatibleSource() {
+ @Test
+ public void customConverterLookupNotCompatibleSource() {
service.addConverter("trimmer", new Trimmer());
try {
service.getConversionExecutor("trimmer", type(Object.class), type(String.class));
@@ -341,7 +348,8 @@ public void testCustomConverterLookupNotCompatibleSource() {
}
@Ignore
- public void testCustomConverterLookupNotCompatibleTarget() {
+ @Test
+ public void customConverterLookupNotCompatibleTarget() {
service.addConverter("trimmer", new Trimmer());
try {
service.getConversionExecutor("trimmer", type(String.class), type(Object.class));
@@ -351,7 +359,8 @@ public void testCustomConverterLookupNotCompatibleTarget() {
}
@Ignore
- public void testCustomConverterLookupNotCompatibleTargetReverse() {
+ @Test
+ public void customConverterLookupNotCompatibleTargetReverse() {
service.addConverter("princy", new CustomTwoWayConverter());
try {
service.getConversionExecutor("princy", type(Principal.class), type(Integer.class));
@@ -361,7 +370,8 @@ public void testCustomConverterLookupNotCompatibleTargetReverse() {
}
@Ignore
- public void testCustomConverterConversionArrayToArray() {
+ @Test
+ public void customConverterConversionArrayToArray() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(String[].class), type(Principal[].class));
Principal[] p = (Principal[]) executor.execute(new String[] { "princy1", "princy2" });
@@ -370,7 +380,8 @@ public void testCustomConverterConversionArrayToArray() {
}
@Ignore
- public void testCustomConverterConversionArrayToArrayReverse() {
+ @Test
+ public void customConverterConversionArrayToArrayReverse() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(Principal[].class), type(String[].class));
final Principal princy1 = new Principal() {
@@ -389,7 +400,8 @@ public String getName() {
}
@Ignore
- public void testCustomConverterLookupArrayToArrayBogusSource() {
+ @Test
+ public void customConverterLookupArrayToArrayBogusSource() {
service.addConverter("princy", new CustomTwoWayConverter());
try {
service.getConversionExecutor("princy", type(Integer[].class), type(Principal[].class));
@@ -399,7 +411,8 @@ public void testCustomConverterLookupArrayToArrayBogusSource() {
}
@Ignore
- public void testCustomConverterLookupArrayToArrayBogusTarget() {
+ @Test
+ public void customConverterLookupArrayToArrayBogusTarget() {
service.addConverter("princy", new CustomTwoWayConverter());
try {
service.getConversionExecutor("princy", type(Principal[].class), type(Integer[].class));
@@ -409,7 +422,8 @@ public void testCustomConverterLookupArrayToArrayBogusTarget() {
}
@Ignore
- public void testCustomConverterConversionArrayToCollection() {
+ @Test
+ public void customConverterConversionArrayToCollection() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(String[].class), type(List.class));
List list = (List) executor.execute(new String[] { "princy1", "princy2" });
@@ -418,7 +432,8 @@ public void testCustomConverterConversionArrayToCollection() {
}
@Ignore
- public void testCustomConverterConversionArrayToCollectionReverse() {
+ @Test
+ public void customConverterConversionArrayToCollectionReverse() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(Principal[].class), type(List.class));
final Principal princy1 = new Principal() {
@@ -437,7 +452,8 @@ public String getName() {
}
@Ignore
- public void testCustomConverterLookupArrayToCollectionBogusSource() {
+ @Test
+ public void customConverterLookupArrayToCollectionBogusSource() {
service.addConverter("princy", new CustomTwoWayConverter());
try {
service.getConversionExecutor("princy", type(Integer[].class), type(List.class));
@@ -448,7 +464,8 @@ public void testCustomConverterLookupArrayToCollectionBogusSource() {
}
@Ignore
- public void testCustomConverterLookupCollectionToArray() {
+ @Test
+ public void customConverterLookupCollectionToArray() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(List.class), type(Principal[].class));
List princyList = new ArrayList();
@@ -460,7 +477,8 @@ public void testCustomConverterLookupCollectionToArray() {
}
@Ignore
- public void testCustomConverterLookupCollectionToArrayReverse() {
+ @Test
+ public void customConverterLookupCollectionToArrayReverse() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(List.class), type(String[].class));
final Principal princy1 = new Principal() {
@@ -482,7 +500,8 @@ public String getName() {
}
@Ignore
- public void testCustomConverterLookupCollectionToArrayBogusTarget() {
+ @Test
+ public void customConverterLookupCollectionToArrayBogusTarget() {
service.addConverter("princy", new CustomTwoWayConverter());
try {
service.getConversionExecutor("princy", type(List.class), type(Integer[].class));
@@ -493,15 +512,17 @@ public void testCustomConverterLookupCollectionToArrayBogusTarget() {
}
@Ignore
- public void testCustomConverterConversionObjectToArray() {
+ @Test
+ public void customConverterConversionObjectToArray() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(String.class), type(Principal[].class));
Principal[] p = (Principal[]) executor.execute("princy1");
assertEquals("princy1", p[0].getName());
}
@Ignore
- public void testCustomConverterConversionObjectToArrayReverse() {
+ @Test
+ public void customConverterConversionObjectToArrayReverse() {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", type(Principal.class), type(String[].class));
final Principal princy1 = new Principal() {
@@ -514,7 +535,8 @@ public String getName() {
}
@Ignore
- public void testCustomConverterLookupObjectToArrayBogusSource() {
+ @Test
+ public void customConverterLookupObjectToArrayBogusSource() {
service.addConverter("princy", new CustomTwoWayConverter());
try {
service.getConversionExecutor("princy", type(Integer.class), type(Principal[].class)); | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/ConversionException.java | @@ -0,0 +1,41 @@
+/*
+ * Copyright 2004-2009 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.core.convert;
+
+/**
+ * Base class for exceptions thrown by the convert system.
+ *
+ * @author Keith Donald
+ */
+public abstract class ConversionException extends RuntimeException {
+
+ /**
+ * Creates a new conversion exception.
+ * @param message the exception message
+ * @param cause the cause
+ */
+ public ConversionException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Creates a new conversion exception.
+ * @param message the exception message
+ */
+ public ConversionException(String message) {
+ super(message);
+ }
+} | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/ConversionExecutionException.java | @@ -0,0 +1,96 @@
+/*
+ * Copyright 2004-2009 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.core.convert;
+
+import org.springframework.core.style.StylerUtils;
+
+/**
+ * Thrown when an attempt to execute a type conversion fails.
+ *
+ * @author Keith Donald
+ */
+public class ConversionExecutionException extends ConversionException {
+
+ /**
+ * The value we tried to convert. Transient because we cannot guarantee that the value is Serializable.
+ */
+ private transient Object value;
+
+ /**
+ * The source type we tried to convert the value from.
+ */
+ private Class<?> sourceClass;
+
+ /**
+ * The target type we tried to convert the value to.
+ */
+ private Class<?> targetClass;
+
+ /**
+ * Creates a new conversion exception.
+ * @param value the value we tried to convert
+ * @param sourceClass the value's original type
+ * @param targetClass the value's target type
+ * @param cause the cause of the conversion failure
+ */
+ public ConversionExecutionException(Object value, Class<?> sourceClass, Class<?> targetClass, Throwable cause) {
+ super(defaultMessage(value, sourceClass, targetClass, cause), cause);
+ this.value = value;
+ this.sourceClass = sourceClass;
+ this.targetClass = targetClass;
+ }
+
+ /**
+ * Creates a new conversion exception.
+ * @param value the value we tried to convert
+ * @param sourceClass the value's original type
+ * @param targetClass the value's target type
+ * @param message a descriptive message of what went wrong.
+ */
+ public ConversionExecutionException(Object value, Class<?> sourceClass, Class<?> targetClass, String message) {
+ super(message);
+ this.value = value;
+ this.sourceClass = sourceClass;
+ this.targetClass = targetClass;
+ }
+
+ /**
+ * Returns the actual value we tried to convert, an instance of {@link #getSourceClass()}.
+ */
+ public Object getValue() {
+ return value;
+ }
+
+ /**
+ * Returns the source type we tried to convert the value from.
+ */
+ public Class<?> getSourceClass() {
+ return sourceClass;
+ }
+
+ /**
+ * Returns the target type we tried to convert the value to.
+ */
+ public Class<?> getTargetClass() {
+ return targetClass;
+ }
+
+ private static String defaultMessage(Object value, Class<?> sourceClass, Class<?> targetClass, Throwable cause) {
+ return "Unable to convert value " + StylerUtils.style(value) + " from type '" + sourceClass.getName()
+ + "' to type '" + targetClass.getName() + "'; reason = '" + cause.getMessage() + "'";
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/ConversionExecutor.java | @@ -0,0 +1,45 @@
+/*
+ * Copyright 2004-2009 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.core.convert;
+
+/**
+ * A command object that is parameterized with the information necessary to perform a conversion of a source input to a
+ * target output. Encapsulates knowledge about how to convert source objects to a specific target type using a specific
+ * converter.
+ *
+ * @author Keith Donald
+ */
+public interface ConversionExecutor<S, T> {
+
+ /**
+ * Returns the source class of conversions performed by this executor.
+ * @return the source class
+ */
+ public Class<S> getSourceClass();
+
+ /**
+ * Returns the target class of conversions performed by this executor.
+ * @return the target class
+ */
+ public Class<T> getTargetClass();
+
+ /**
+ * Execute the conversion for the provided source object.
+ * @param source the source object to convert
+ */
+ public T execute(S source) throws ConversionExecutionException;
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/ConversionExecutorNotFoundException.java | @@ -0,0 +1,55 @@
+/*
+ * Copyright 2004-2009 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.core.convert;
+
+/**
+ * Thrown when a conversion executor could not be found in a conversion service.
+ *
+ * @see ConversionService#getConversionExecutor(Class, Class)
+ * @author Keith Donald
+ */
+public class ConversionExecutorNotFoundException extends ConversionException {
+
+ private Class<?> sourceClass;
+
+ private Class<?> targetClass;
+
+ /**
+ * Creates a new conversion executor not found exception.
+ * @param sourceClass the source type requested to convert from
+ * @param targetClass the target type requested to convert to
+ * @param message a descriptive message
+ */
+ public ConversionExecutorNotFoundException(Class<?> sourceClass, Class<?> targetClass, String message) {
+ super(message);
+ this.sourceClass = sourceClass;
+ this.targetClass = targetClass;
+ }
+
+ /**
+ * Returns the source type requested to convert from.
+ */
+ public Class<?> getSourceClass() {
+ return sourceClass;
+ }
+
+ /**
+ * Returns the target type requested to convert to.
+ */
+ public Class<?> getTargetClass() {
+ return targetClass;
+ }
+} | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/ConversionService.java | @@ -0,0 +1,88 @@
+/*
+ * Copyright 2004-2009 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.core.convert;
+
+/**
+ * A service interface for type conversion. This is the entry point into the convert system. Call one of the
+ * {@link #executeConversion(Object, Class) executeConversion} operations to perform a thread-safe type conversion using
+ * this system. Call one of the {@link #getConversionExecutor(Class, Class) getConversionExecutor} operations to obtain
+ * a thread-safe {@link ConversionExecutor} command for later use.
+ *
+ * @author Keith Donald
+ */
+public interface ConversionService {
+
+ /**
+ * Convert the source object to <code>targetClass</code>
+ * @param source the source to convert from (may be null)
+ * @param targetClass the target class to convert to
+ * @return the converted object, an instance of the <code>targetClass</code>, or <code>null</code> if a null source
+ * was provided
+ * @throws ConversionExecutorNotFoundException if no suitable conversion executor could be found to convert the
+ * source to an instance of targetClass
+ * @throws ConversionException if an exception occurred during the conversion process
+ */
+ public <T> T executeConversion(Object source, Class<T> targetClass) throws ConversionExecutorNotFoundException,
+ ConversionException;
+
+ /**
+ * Convert the source object to <code>targetClass</code> using a custom converter.
+ * @param converterId the id of the custom converter, which must be registered with this conversion service and
+ * capable of converting to the targetClass
+ * @param source the source to convert from (may be null)
+ * @param targetClass the target class to convert to
+ * @return the converted object, an instance of the <code>targetClass</code>, or <code>null</code> if a null source
+ * was provided
+ * @throws ConversionExecutorNotFoundException if no suitable conversion executor could be found to convert the
+ * source to an instance of targetClass
+ * @throws ConversionException if an exception occurred during the conversion process
+ */
+ public <T> T executeConversion(String converterId, Object source, Class<T> targetClass)
+ throws ConversionExecutorNotFoundException, ConversionException;
+
+ /**
+ * Get a ConversionExecutor capable of converting objects from <code>sourceClass</code> to <code>targetClass</code>.
+ * The returned ConversionExecutor is thread-safe and may safely be cached for later use by client code.
+ * @param sourceClass the source class to convert from (required)
+ * @param targetClass the target class to convert to (required)
+ * @return the executor that can execute instance type conversion, never null
+ * @throws ConversionExecutorNotFoundException when no suitable conversion executor could be found
+ */
+ public <S, T> ConversionExecutor<S, T> getConversionExecutor(Class<S> sourceClass, Class<T> targetClass)
+ throws ConversionExecutorNotFoundException;
+
+ /**
+ * Get a ConversionExecutor that uses a custom converter to capable convert objects from <code>sourceClass</code> to
+ * <code>targetClass</code>. The returned ConversionExecutor is thread-safe and may safely be cached for use in
+ * client code.
+ * @param converterId the id of the custom converter, which must be registered with this conversion service and
+ * capable of converting from sourceClass to targetClass (required)
+ * @param sourceClass the source class to convert from (required)
+ * @param targetClass the target class to convert to (required)
+ * @return the executor that can execute instance type conversion, never null
+ * @throws ConversionExecutorNotFoundException when no suitable conversion executor could be found
+ */
+ public <S, T> ConversionExecutor<S, T> getConversionExecutor(String converterId, Class<S> sourceClass,
+ Class<T> targetClass) throws ConversionExecutorNotFoundException;
+
+ /**
+ * Lookup a class by its well-known alias. For example, <code>long</code> for <code>java.lang.Long</code>
+ * @param alias the class alias
+ * @return the class, or <code>null</code> if no alias exists
+ */
+ public Class<?> getClassForAlias(String alias);
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/Converter.java | @@ -0,0 +1,51 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+import org.springframework.core.convert.ConversionException;
+import org.springframework.core.convert.ConversionService;
+
+/**
+ * A converter converts a source object of type S to a target type of type T and back.
+ * <p>
+ * Implementations of this interface are thread-safe and can be shared. Converters are typically registered with and
+ * accessed through a {@link ConversionService}.
+ * </p>
+ * @author Keith Donald
+ */
+public interface Converter<S, T> {
+
+ /**
+ * Convert the source S to target type T.
+ * @param source the source object to convert, which must be an instance of S
+ * @return the converted object, which must be an instance of T
+ * @throws Exception an exception occurred performing the conversion; may be any checked exception, the conversion
+ * system will handle wrapping the failure in a {@link ConversionException} that provides a consistent type
+ * conversion error context
+ */
+ public T convert(S source) throws Exception;
+
+ /**
+ * Convert the target T back to source type S.
+ * @param target the target object to convert, which must be an instance of T
+ * @return the converted object, which must be an instance of S
+ * @throws Exception an exception occurred performing the conversion; may be any checked exception, the conversion
+ * system will handle wrapping the failure in a {@link ConversionException} that provides a consistent type
+ * conversion error context
+ */
+ public S convertBack(T target) throws Exception;
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/NumberToNumber.java | @@ -0,0 +1,47 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+import org.springframework.util.NumberUtils;
+
+/**
+ *Converts from any JDK-standard Number implementation to any other JDK-standard Number implementation.
+ *
+ * Support Number classes include byte, short, integer, float, double, long, big integer, big decimal. This class
+ * delegates to {@link NumberUtils#convertNumberToTargetClass(Number, Class)} to perform the conversion.
+ *
+ * @see java.lang.Byte
+ * @see java.lang.Short
+ * @see java.lang.Integer
+ * @see java.lang.Long
+ * @see java.math.BigInteger
+ * @see java.lang.Float
+ * @see java.lang.Double
+ * @see java.math.BigDecimal
+ *
+ * @author Keith Donald
+ */
+public class NumberToNumber implements SuperConverter<Number, Number> {
+
+ public <N extends Number> N convert(Number source, Class<N> targetClass) throws Exception {
+ return NumberUtils.convertNumberToTargetClass(source, targetClass);
+ }
+
+ public Number convertBack(Number target) throws Exception {
+ return target;
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToBigDecimal.java | @@ -0,0 +1,35 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+import java.math.BigDecimal;
+
+/**
+ * Converts a String to a BigDecimal and back.
+ *
+ * @author Keith Donald
+ */
+public class StringToBigDecimal implements Converter<String, BigDecimal> {
+
+ public BigDecimal convert(String source) throws Exception {
+ return new BigDecimal(source);
+ }
+
+ public String convertBack(BigDecimal target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToBigInteger.java | @@ -0,0 +1,35 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+import java.math.BigInteger;
+
+/**
+ * Converts a String to a BigInteger and back.
+ *
+ * @author Keith Donald
+ */
+public class StringToBigInteger implements Converter<String, BigInteger> {
+
+ public BigInteger convert(String source) throws Exception {
+ return new BigInteger(source);
+ }
+
+ public String convertBack(BigInteger target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToBoolean.java | @@ -0,0 +1,81 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts String to a Boolean and back.
+ *
+ * @author Keith Donald
+ */
+public class StringToBoolean implements Converter<String, Boolean> {
+
+ private static final String VALUE_TRUE = "true";
+
+ private static final String VALUE_FALSE = "false";
+
+ private String trueString;
+
+ private String falseString;
+
+ /**
+ * Create a StringToBoolean converter.
+ */
+ public StringToBoolean() {
+ }
+
+ /**
+ * Create a StringToBoolean converter configured with specific values for true and false strings.
+ * @param trueString special true string to use
+ * @param falseString special false string to use
+ */
+ public StringToBoolean(String trueString, String falseString) {
+ this.trueString = trueString;
+ this.falseString = falseString;
+ }
+
+ public Boolean convert(String source) throws Exception {
+ if (trueString != null && source.equals(trueString)) {
+ return Boolean.TRUE;
+ } else if (falseString != null && source.equals(falseString)) {
+ return Boolean.FALSE;
+ } else if (trueString == null && source.equals(VALUE_TRUE)) {
+ return Boolean.TRUE;
+ } else if (falseString == null && source.equals(VALUE_FALSE)) {
+ return Boolean.FALSE;
+ } else {
+ throw new IllegalArgumentException("Invalid boolean value [" + source + "]");
+ }
+ }
+
+ public String convertBack(Boolean target) throws Exception {
+ if (Boolean.TRUE.equals(target)) {
+ if (trueString != null) {
+ return trueString;
+ } else {
+ return VALUE_TRUE;
+ }
+ } else if (Boolean.FALSE.equals(target)) {
+ if (falseString != null) {
+ return falseString;
+ } else {
+ return VALUE_FALSE;
+ }
+ } else {
+ throw new IllegalArgumentException("Invalid boolean value [" + target + "]");
+ }
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToByte.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to a Byte and back.
+ *
+ * @author Keith Donald
+ */
+public class StringToByte implements Converter<String, Byte> {
+
+ public Byte convert(String source) throws Exception {
+ return new Byte(source);
+ }
+
+ public String convertBack(Byte target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToCharacter.java | @@ -0,0 +1,36 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to a Character and back.
+ *
+ * @author Keith Donald
+ */
+public class StringToCharacter implements Converter<String, Character> {
+
+ public Character convert(String source) throws Exception {
+ if (source.length() > 1) {
+ throw new IllegalArgumentException("To be a Character the String '" + source + "' must have a length of 1");
+ }
+ return new Character(source.charAt(0));
+ }
+
+ public String convertBack(Character target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToDouble.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to a Double and back.
+ *
+ * @author Keith Donald
+ */
+public class StringToDouble implements Converter<String, Double> {
+
+ public Double convert(String source) throws Exception {
+ return Double.valueOf(source);
+ }
+
+ public String convertBack(Double target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToEnum.java | @@ -0,0 +1,34 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts from a String to Enum and back.
+ *
+ * @author Scott Andrews
+ */
+@SuppressWarnings("unchecked")
+public class StringToEnum implements SuperConverter<String, Enum> {
+
+ public <E extends Enum> E convert(String source, Class<E> targetClass) throws Exception {
+ return Enum.valueOf(targetClass, source);
+ }
+
+ public String convertBack(Enum target) throws Exception {
+ return target.name();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToFloat.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to an Short using {@link Short#valueOf(String)}.
+ *
+ * @author Keith Donald
+ */
+public class StringToFloat implements Converter<String, Float> {
+
+ public Float convert(String source) throws Exception {
+ return Float.valueOf(source);
+ }
+
+ public String convertBack(Float target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToInteger.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to an Integer using {@link Integer#valueOf(String)}.
+ *
+ * @author Keith Donald
+ */
+public class StringToInteger implements Converter<String, Integer> {
+
+ public Integer convert(String source) throws Exception {
+ return Integer.valueOf(source);
+ }
+
+ public String convertBack(Integer target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToLocale.java | @@ -0,0 +1,37 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+import java.util.Locale;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * Converts a String to a Locale using {@link StringUtils#parseLocaleString(String)}.
+ *
+ * @author Keith Donald
+ */
+public class StringToLocale implements Converter<String, Locale> {
+
+ public Locale convert(String source) throws Exception {
+ return StringUtils.parseLocaleString(source);
+ }
+
+ public String convertBack(Locale target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToLong.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to an Long using {@link Long#valueOf(String)}.
+ *
+ * @author Keith Donald
+ */
+public class StringToLong implements Converter<String, Long> {
+
+ public Long convert(String source) throws Exception {
+ return Long.valueOf(source);
+ }
+
+ public String convertBack(Long target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/StringToShort.java | @@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+/**
+ * Converts a String to an Short using {@link Short#valueOf(String)}.
+ *
+ * @author Keith Donald
+ */
+public class StringToShort implements Converter<String, Short> {
+
+ public Short convert(String source) throws Exception {
+ return Short.valueOf(source);
+ }
+
+ public String convertBack(Short target) throws Exception {
+ return target.toString();
+ }
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/SuperConverter.java | @@ -0,0 +1,54 @@
+/*
+ * Copyright 2004-2009 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.core.convert.converter;
+
+import org.springframework.core.convert.ConversionException;
+import org.springframework.core.convert.ConversionService;
+
+/**
+ * A super converter converts a source object of type S to a target type of type AT and back, where AT is equal to or a
+ * subclass of T.
+ * <p>
+ * Implementations of this interface are thread-safe and can be shared. Converters are typically registered with and
+ * accessed through a {@link ConversionService}.
+ * </p>
+ * @author Keith Donald
+ */
+public interface SuperConverter<S, T> {
+
+ /**
+ * Convert the source S to an instance of AT.
+ * @param source the source object to convert, which must be an instance of S
+ * @param actualTargetClass the actual target class to convert to (AT), which must be equal to or a specialization
+ * of T.
+ * @return the converted object, which must be an instance of AT
+ * @throws Exception an exception occurred performing the conversion; may be any checked exception, the conversion
+ * system will handle wrapping the failure in a {@link ConversionException} that provides a consistent type
+ * conversion error context
+ */
+ public <AT extends T> AT convert(S source, Class<AT> actualTargetClass) throws Exception;
+
+ /**
+ * Convert the target T to an instance of S.
+ * @param target the target object to convert, which must be an instance of T.
+ * @return the converted object, which must be an instance of S.
+ * @throws Exception an exception occurred performing the conversion; may be any checked exception, the conversion
+ * system will handle wrapping the failure in a {@link ConversionException} that provides a consistent type
+ * conversion error context
+ */
+ public S convertBack(T target) throws Exception;
+
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/converter/package.html | @@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+User Converter API and default Converter implementations.
+</p>
+</body>
+</html>
\ No newline at end of file | true |
Other | spring-projects | spring-framework | c278e1e94360c773c617e8e30945de42ca0999ef.json | convert system spi and api | org.springframework.core/src/main/java/org/springframework/core/convert/package.html | @@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Type conversion system SPI.
+</p>
+</body>
+</html>
\ No newline at end of file | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/ivy.xml | @@ -59,6 +59,8 @@
conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.oxm" rev="latest.integration"
+ conf="compile->compile"/>
<!-- test dependencies -->
<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2"
conf="test->runtime"/>
@@ -67,6 +69,8 @@
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>
<dependency org="org.mortbay.jetty" name="com.springsource.org.mortbay.jetty.server" rev="6.1.9"
conf="test->compile"/>
+ <dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0"
+ conf="test->compile"/>
</dependencies>
</ivy-module> | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/src/main/java/org/springframework/http/converter/xml/AbstractXmlHttpMessageConverter.java | @@ -0,0 +1,107 @@
+/*
+ * Copyright 2008 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.http.converter.xml;
+
+import java.io.IOException;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.AbstractHttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConversionException;
+
+/**
+ * Abstract base class for {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverters} that
+ * convert from/to XML.
+ *
+ * <p>By default, subclasses of this converter support {@code text/xml} and {@code application/xml}. This can be
+ * overridden by setting the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property.
+ *
+ * @author Arjen Poutsma
+ * @since 3.0
+ */
+public abstract class AbstractXmlHttpMessageConverter<T> extends AbstractHttpMessageConverter<T> {
+
+ private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+
+ /**
+ * Protected constructor that sets the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} to {@code
+ * text/xml} and {@code application/xml}.
+ */
+ protected AbstractXmlHttpMessageConverter() {
+ super(new MediaType("application", "xml"), new MediaType("text", "xml"));
+ }
+
+ /** Invokes {@link #readFromSource(Class, HttpHeaders, Source)}. */
+ public final T read(Class<T> clazz, HttpInputMessage inputMessage) throws IOException {
+ return readFromSource(clazz, inputMessage.getHeaders(), new StreamSource(inputMessage.getBody()));
+ }
+
+ /**
+ * Abstract template method called from {@link #read(Class, HttpInputMessage)}.
+ *
+ * @param clazz the type of object to return
+ * @param headers the HTTP input headers
+ * @param source the HTTP input body
+ * @return the converted object
+ * @throws IOException in case of I/O errors
+ * @throws org.springframework.http.converter.HttpMessageConversionException in case of conversion errors
+ */
+ protected abstract T readFromSource(Class<T> clazz, HttpHeaders headers, Source source) throws IOException;
+
+ @Override
+ protected final void writeToInternal(T t, HttpOutputMessage outputMessage) throws IOException {
+ writeToResult(t, outputMessage.getHeaders(), new StreamResult(outputMessage.getBody()));
+ }
+
+ /**
+ * Abstract template method called from {@link #writeToInternal(Object, HttpOutputMessage)}.
+ *
+ * @param t the object to write to the output message
+ * @param headers the HTTP output headers
+ * @param result the HTTP output body
+ * @throws IOException in case of I/O errors
+ * @throws HttpMessageConversionException in case of conversion errors
+ */
+ protected abstract void writeToResult(T t, HttpHeaders headers, Result result) throws IOException;
+
+ /**
+ * Transforms the given {@code Source} to the {@code Result}.
+ *
+ * @param source the source to transform from
+ * @param result the result to transform to
+ * @throws HttpMessageConversionException in case of transformation errors
+ */
+ protected void transform(Source source, Result result) {
+ try {
+ Transformer transformer = transformerFactory.newTransformer();
+ transformer.transform(source, result);
+ }
+ catch (TransformerException ex) {
+ throw new HttpMessageConversionException("Could not transform XML", ex);
+ }
+ }
+
+} | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java | @@ -0,0 +1,108 @@
+package org.springframework.http.converter.xml;
+
+import java.io.IOException;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.http.HttpHeaders;
+import org.springframework.oxm.Marshaller;
+import org.springframework.oxm.Unmarshaller;
+import org.springframework.util.Assert;
+
+/**
+ * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that can read
+ * and write XML using Spring's {@link Marshaller} and {@link Unmarshaller} abstractions.
+ *
+ * <p>This converter requires a {@code Marshaller} and {@code Unmarshaller} before it can be used. These can be injected
+ * by the {@linkplain #MarshallingHttpMessageConverter(Marshaller) constructor} or {@linkplain
+ * #setMarshaller(Marshaller) bean properties}.
+ *
+ * <p>By default, this converter supports {@code text/xml} and {@code application/xml}. This can be overridden by
+ * setting the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property.
+ *
+ * @author Arjen Poutsma
+ * @since 3.0
+ */
+
+public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConverter<Object>
+ implements InitializingBean {
+
+ private Marshaller marshaller;
+
+ private Unmarshaller unmarshaller;
+
+ /**
+ * Construct a new {@code MarshallingHttpMessageConverter} with no {@link Marshaller} or {@link Unmarshaller} set. The
+ * marshaller and unmarshaller must be set after construction by invoking {@link #setMarshaller(Marshaller)} and {@link
+ * #setUnmarshaller(Unmarshaller)} .
+ */
+ public MarshallingHttpMessageConverter() {
+ }
+
+ /**
+ * Construct a new {@code MarshallingMessageConverter} with the given {@link Marshaller} set. <p>If the given {@link
+ * Marshaller} also implements the {@link Unmarshaller} interface, it is used for both marshalling and unmarshalling.
+ * Otherwise, an exception is thrown. <p>Note that all {@code Marshaller} implementations in Spring also implement the
+ * {@code Unmarshaller} interface, so that you can safely use this constructor.
+ *
+ * @param marshaller object used as marshaller and unmarshaller
+ * @throws IllegalArgumentException when <code>marshaller</code> does not implement the {@link Unmarshaller} interface
+ * as well
+ */
+ public MarshallingHttpMessageConverter(Marshaller marshaller) {
+ Assert.notNull(marshaller, "marshaller must not be null");
+ if (!(marshaller instanceof Unmarshaller)) {
+ throw new IllegalArgumentException("Marshaller [" + marshaller + "] does not implement the Unmarshaller " +
+ "interface. Please set an Unmarshaller explicitely by using the " +
+ "MarshallingHttpMessageConverter(Marshaller, Unmarshaller) constructor.");
+ }
+ else {
+ this.marshaller = marshaller;
+ this.unmarshaller = (Unmarshaller) marshaller;
+ }
+ }
+
+ /**
+ * Construct a new <code>MarshallingMessageConverter</code> with the given {@code Marshaller} and {@code
+ * Unmarshaller}.
+ *
+ * @param marshaller the Marshaller to use
+ * @param unmarshaller the Unmarshaller to use
+ */
+ public MarshallingHttpMessageConverter(Marshaller marshaller, Unmarshaller unmarshaller) {
+ Assert.notNull(marshaller, "marshaller must not be null");
+ Assert.notNull(unmarshaller, "unmarshaller must not be null");
+ this.marshaller = marshaller;
+ this.unmarshaller = unmarshaller;
+ }
+
+ /** Set the {@link Marshaller} to be used by this message converter. */
+ public void setMarshaller(Marshaller marshaller) {
+ this.marshaller = marshaller;
+ }
+
+ /** Set the {@link Unmarshaller} to be used by this message converter. */
+ public void setUnmarshaller(Unmarshaller unmarshaller) {
+ this.unmarshaller = unmarshaller;
+ }
+
+ public void afterPropertiesSet() {
+ Assert.notNull(this.marshaller, "Property 'marshaller' is required");
+ Assert.notNull(this.unmarshaller, "Property 'unmarshaller' is required");
+ }
+
+ public boolean supports(Class<?> clazz) {
+ return unmarshaller.supports(clazz);
+ }
+
+ @Override
+ protected Object readFromSource(Class<Object> clazz, HttpHeaders headers, Source source) throws IOException {
+ return unmarshaller.unmarshal(source);
+ }
+
+ @Override
+ protected void writeToResult(Object o, HttpHeaders headers, Result result) throws IOException {
+ marshaller.marshal(o, result);
+ }
+} | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java | @@ -0,0 +1,58 @@
+package org.springframework.http.converter.xml;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.xml.sax.InputSource;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.converter.HttpMessageConversionException;
+
+/** @author Arjen Poutsma */
+public class SourceHttpMessageConverter<T extends Source> extends AbstractXmlHttpMessageConverter<T> {
+
+ public boolean supports(Class<? extends T> clazz) {
+ return Source.class.isAssignableFrom(clazz);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ protected T readFromSource(Class<T> clazz, HttpHeaders headers, Source source) throws IOException {
+ if (DOMSource.class.equals(clazz)) {
+ DOMResult domResult = new DOMResult();
+ transform(source, domResult);
+ return (T) new DOMSource(domResult.getNode());
+ }
+ else if (SAXSource.class.equals(clazz)) {
+ ByteArrayInputStream bis = transformToByteArray(source);
+ return (T) new SAXSource(new InputSource(bis));
+ }
+ else if (StreamSource.class.equals(clazz) || Source.class.equals(clazz)) {
+ ByteArrayInputStream bis = transformToByteArray(source);
+ return (T) new StreamSource(bis);
+ }
+ else {
+ throw new HttpMessageConversionException(
+ "Could not read class [" + clazz + "]. Only DOMSource, SAXSource, and StreamSource are supported.");
+ }
+ }
+
+ private ByteArrayInputStream transformToByteArray(Source source) {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ transform(source, new StreamResult(bos));
+ return new ByteArrayInputStream(bos.toByteArray());
+ }
+
+ @Override
+ protected void writeToResult(T t, HttpHeaders headers, Result result) throws IOException {
+ transform(t, result);
+ }
+} | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/src/main/java/org/springframework/http/converter/xml/package.html | @@ -0,0 +1,7 @@
+<html>
+<body>
+
+Provides a HttpMessageConverter implementations for handling XML.
+
+</body>
+</html> | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTest.java | @@ -0,0 +1,60 @@
+package org.springframework.http.converter.xml;
+
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.MockHttpInputMessage;
+import org.springframework.http.MockHttpOutputMessage;
+import org.springframework.oxm.Marshaller;
+import org.springframework.oxm.Unmarshaller;
+
+/** @author Arjen Poutsma */
+public class MarshallingHttpMessageConverterTest {
+
+ private MarshallingHttpMessageConverter converter;
+
+ private Marshaller marshaller;
+
+ private Unmarshaller unmarshaller;
+
+ @Before
+ public void setUp() {
+ marshaller = createMock(Marshaller.class);
+ unmarshaller = createMock(Unmarshaller.class);
+
+ converter = new MarshallingHttpMessageConverter(marshaller, unmarshaller);
+ }
+
+ @Test
+ public void read() throws Exception {
+ String body = "<root>Hello World</root>";
+ MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+
+ expect(unmarshaller.unmarshal(isA(StreamSource.class))).andReturn(body);
+
+ replay(marshaller, unmarshaller);
+ String result = (String) converter.read(Object.class, inputMessage);
+ assertEquals("Invalid result", body, result);
+ verify(marshaller, unmarshaller);
+ }
+
+ @Test
+ public void write() throws Exception {
+ String body = "<root>Hello World</root>";
+ MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+
+ marshaller.marshal(eq(body), isA(StreamResult.class));
+
+ replay(marshaller, unmarshaller);
+ converter.write(body, outputMessage);
+ assertEquals("Invalid content-type", new MediaType("application", "xml"),
+ outputMessage.getHeaders().getContentType());
+ verify(marshaller, unmarshaller);
+ }
+} | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTest.java | @@ -0,0 +1,89 @@
+package org.springframework.http.converter.xml;
+
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.MockHttpInputMessage;
+import org.springframework.http.MockHttpOutputMessage;
+import org.springframework.util.FileCopyUtils;
+
+/** @author Arjen Poutsma */
+public class SourceHttpMessageConverterTest {
+
+ @Test
+ public void readDOMSource() throws Exception {
+ SourceHttpMessageConverter<DOMSource> converter = new SourceHttpMessageConverter<DOMSource>();
+ String body = "<root>Hello World</root>";
+ MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+ inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+ DOMSource result = converter.read(DOMSource.class, inputMessage);
+ Document document = (Document) result.getNode();
+ assertEquals("Invalid result", "root", document.getDocumentElement().getLocalName());
+ }
+
+ @Test
+ public void readSAXSource() throws Exception {
+ SourceHttpMessageConverter<SAXSource> converter = new SourceHttpMessageConverter<SAXSource>();
+ String body = "<root>Hello World</root>";
+ MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+ inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+ SAXSource result = converter.read(SAXSource.class, inputMessage);
+ InputSource inputSource = result.getInputSource();
+ String s = FileCopyUtils.copyToString(new InputStreamReader(inputSource.getByteStream()));
+ assertXMLEqual("Invalid result", body, s);
+ }
+
+ @Test
+ public void readStreamSource() throws Exception {
+ SourceHttpMessageConverter<StreamSource> converter = new SourceHttpMessageConverter<StreamSource>();
+ String body = "<root>Hello World</root>";
+ MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+ inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+ StreamSource result = converter.read(StreamSource.class, inputMessage);
+ String s = FileCopyUtils.copyToString(new InputStreamReader(result.getInputStream()));
+ assertXMLEqual("Invalid result", body, s);
+ }
+
+ @Test
+ public void readSource() throws Exception {
+ SourceHttpMessageConverter<Source> converter = new SourceHttpMessageConverter<Source>();
+ String body = "<root>Hello World</root>";
+ MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+ inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+ converter.read(Source.class, inputMessage);
+ }
+
+ @Test
+ public void write() throws Exception {
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(true);
+ Document document = documentBuilderFactory.newDocumentBuilder().newDocument();
+ Element rootElement = document.createElement("root");
+ document.appendChild(rootElement);
+ rootElement.setTextContent("Hello World");
+ DOMSource domSource = new DOMSource(document);
+
+ SourceHttpMessageConverter<Source> converter = new SourceHttpMessageConverter<Source>();
+ MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+ converter.write(domSource, outputMessage);
+ assertXMLEqual("Invalid result", "<root>Hello World</root>",
+ outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+ assertEquals("Invalid content-type", new MediaType("application", "xml"),
+ outputMessage.getHeaders().getContentType());
+ }
+
+
+} | true |
Other | spring-projects | spring-framework | ca01cb4df61c1b41afe0ae5ad178181c4cabdf20.json | SPR-5539: Add XML HttpMessageConverters | org.springframework.web/web.iml | @@ -15,6 +15,7 @@
<orderEntry type="module" module-name="beans" />
<orderEntry type="module" module-name="context" />
<orderEntry type="module" module-name="core" />
+ <orderEntry type="module" module-name="oxm" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -222,6 +223,17 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
</component>
<component name="copyright">
<Base> | true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/ivy.xml | @@ -19,6 +19,7 @@
</publications>
<dependencies>
+ <dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="0.9.0" conf="compile->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->runtime"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/> | true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/petclinic.iml | @@ -76,30 +76,41 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module" module-name="orm" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar!/" />
+ <root url="jar://$IVY_CACHE$/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-2.0.0.b41-beta2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar!/" />
+ <root url="jar://$IVY_CACHE$/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-sources-2.0.0.b41-beta2.jar!/" />
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="orm" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$IVY_CACHE$/org.aspectj/com.springsource.org.aspectj.weaver/1.5.4/com.springsource.org.aspectj.weaver-1.5.4.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-3.2.6.ga.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-sources-3.2.6.ga.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -108,43 +119,208 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$IVY_CACHE$/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-2.0.0.b41-beta2.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$IVY_CACHE$/com.sun.syndication/com.springsource.com.sun.syndication/0.9.0/com.springsource.com.sun.syndication-0.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$IVY_CACHE$/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-sources-2.0.0.b41-beta2.jar!/" />
+ <root url="jar://$IVY_CACHE$/com.sun.syndication/com.springsource.com.sun.syndication/0.9.0/com.springsource.com.sun.syndication-sources-0.9.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-3.2.6.ga.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-sources-3.2.6.ga.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.2.RELEASE.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-sources-1.2.2.osgi.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$IVY_CACHE$/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar!/" />
+ <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="__TEMPLATE__">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright 2002-&#36;today.year 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." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
| true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Visit.java | @@ -63,7 +63,7 @@ public Pet getPet() {
/** Setter for property pet.
* @param pet New value of property pet.
*/
- protected void setPet(Pet pet) {
+ public void setPet(Pet pet) {
this.pet = pet;
}
| true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java | @@ -5,8 +5,9 @@
import org.springframework.samples.petclinic.Clinic;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
/**
@@ -42,8 +43,8 @@ public void welcomeHandler() {
/**
* Custom handler for displaying vets.
- * <p>
- * Note that this handler returns a plain {@link ModelMap} object instead of
+ *
+ * <p>Note that this handler returns a plain {@link ModelMap} object instead of
* a ModelAndView, thus leveraging convention-based model attribute names.
* It relies on the RequestToViewNameTranslator to determine the logical
* view name based on the request URL: "/vets.do" -> "vets".
@@ -68,4 +69,17 @@ public ModelAndView ownerHandler(@PathVariable("ownerId") int ownerId) {
return mav;
}
+ /**
+ * Custom handler for displaying an list of visits.
+ *
+ * @param petId the ID of the pet whose visits to display
+ * @return a ModelMap with the model attributes for the view
+ */
+ @RequestMapping(value="/owners/*/pets/{petId}/visits", method=RequestMethod.GET)
+ public ModelAndView visitsHandler(@PathVariable int petId) {
+ ModelAndView mav = new ModelAndView("visits");
+ mav.addObject("visits", this.clinic.loadPet(petId).getVisits());
+ return mav;
+ }
+
} | true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitsAtomView.java | @@ -0,0 +1,82 @@
+/*
+ * Copyright 2002-2009 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.samples.petclinic.web;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sun.syndication.feed.atom.Content;
+import com.sun.syndication.feed.atom.Entry;
+import com.sun.syndication.feed.atom.Feed;
+
+import org.springframework.samples.petclinic.Visit;
+import org.springframework.web.servlet.view.feed.AbstractAtomFeedView;
+
+/**
+ * A view creating a Atom representation from a list of Visit objects.
+ *
+ * @author Alef Arendsen
+ * @author Arjen Poutsma
+ */
+public class VisitsAtomView extends AbstractAtomFeedView {
+
+ @Override
+ protected void buildFeedMetadata(Map<String, Object> model, Feed feed, HttpServletRequest request) {
+ feed.setId("tag:springsource.com");
+ feed.setTitle("Pet Clinic Visits");
+ @SuppressWarnings("unchecked")
+ List<Visit> visits = (List<Visit>) model.get("visits");
+ for (Visit visit : visits) {
+ Date date = visit.getDate();
+ if (feed.getUpdated() == null || date.compareTo(feed.getUpdated()) > 0) {
+ feed.setUpdated(date);
+ }
+ }
+ }
+
+ @Override
+ protected List<Entry> buildFeedEntries(Map<String, Object> model,
+ HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+ @SuppressWarnings("unchecked")
+ List<Visit> visits = (List<Visit>) model.get("visits");
+ List<Entry> entries = new ArrayList<Entry>(visits.size());
+
+ for (Visit visit : visits) {
+ Entry entry = new Entry();
+ String date = String.format("%1$tY-%1$tm-%1$td", visit.getDate());
+ // see http://diveintomark.org/archives/2004/05/28/howto-atom-id#other
+ entry.setId(String.format("tag:springsource.com,%s:%d", date, visit.getId()));
+ entry.setTitle(String.format("%s visit on %s", visit.getPet().getName(), date));
+ entry.setUpdated(visit.getDate());
+
+ Content summary = new Content();
+ summary.setValue(visit.getDescription());
+ entry.setSummary(summary);
+
+ entries.add(entry);
+ }
+
+ return entries;
+
+ }
+
+} | true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owner.jsp | @@ -94,6 +94,14 @@
</spring:url>
<a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
</td>
+ <td></td>
+ <td>
+ <spring:url value="{ownerId}/pets/{petId}/visits" var="feedUrl">
+ <spring:param name="ownerId" value="${owner.id}"/>
+ <spring:param name="petId" value="${pet.id}"/>
+ </spring:url>
+ <a href="${fn:escapeXml(feedUrl)}" rel="alternate" type="application/atom+xml">Atom Feed</a>
+ </td>
</tr>
</table>
</c:forEach> | true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml | @@ -57,6 +57,18 @@
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" p:prefix="/WEB-INF/jsp/"
p:suffix=".jsp"/>
+ <!--
+ - The BeanNameViewResolver is used to pick up the visits view name (below).
+ - It has the order property set to 1, which means that this will
+ - be the first view resolver to be used.
+ -->
+ <bean class="org.springframework.web.servlet.view.BeanNameViewResolver" p:order="1"/>
+
+ <!--
+ - The AtomView rendering a Atom feed of the visits
+ -->
+ <bean id="visits" class="org.springframework.samples.petclinic.web.VisitsAtomView"/>
+
<!--
- Message source for this context, loaded from localized "messages_xx" files.
- Could also reside in the root application context, as it is generic, | true |
Other | spring-projects | spring-framework | b96a7a7a8c11d417d2f2dbab098b9be9021ce44a.json | SPR-5460: Add AtomView sample to PetClinic | org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java | @@ -0,0 +1,90 @@
+/*
+ * Copyright 2002-2009 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.samples.petclinic.web;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.syndication.feed.atom.Entry;
+import com.sun.syndication.feed.atom.Feed;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.samples.petclinic.Pet;
+import org.springframework.samples.petclinic.PetType;
+import org.springframework.samples.petclinic.Visit;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class VisitsAtomViewTest {
+
+ private VisitsAtomView visitView;
+
+ private Map<String, Object> model;
+
+ private Feed feed;
+
+ @Before
+ public void setUp() {
+ visitView = new VisitsAtomView();
+ PetType dog = new PetType();
+ dog.setName("dog");
+ Pet bello = new Pet();
+ bello.setName("Bello");
+ bello.setType(dog);
+ Visit belloVisit = new Visit();
+ belloVisit.setPet(bello);
+ belloVisit.setDate(new Date(2009, 0, 1));
+ belloVisit.setDescription("Bello visit");
+ Pet wodan = new Pet();
+ wodan.setName("Wodan");
+ wodan.setType(dog);
+ Visit wodanVisit = new Visit();
+ wodanVisit.setPet(wodan);
+ wodanVisit.setDate(new Date(2009, 0, 2));
+ wodanVisit.setDescription("Wodan visit");
+ List<Visit> visits = new ArrayList<Visit>();
+ visits.add(belloVisit);
+ visits.add(wodanVisit);
+
+ model = new HashMap<String, Object>();
+ model.put("visits", visits);
+ feed = new Feed();
+
+ }
+
+ @Test
+ public void buildFeedMetadata() {
+ visitView.buildFeedMetadata(model, feed, null);
+
+ assertNotNull("No id set", feed.getId());
+ assertNotNull("No title set", feed.getTitle());
+ assertEquals("Invalid update set", new Date(2009, 0, 2), feed.getUpdated());
+ }
+
+ @Test
+ public void buildFeedEntries() throws Exception {
+ List<Entry> entries = visitView.buildFeedEntries(model, null, null);
+ assertEquals("Invalid amount of entries", 2, entries.size());
+ }
+} | true |
Other | spring-projects | spring-framework | 31331e6ad31fb51e26ce926dfa8f1e06a15af608.json | Avoid NPE in ObjectToObjectConverter
Bypass ObjectToObject conversion when source and object types are
identical and protect against a null source object.
Prior to this commit the TypeDescriptor was used to determine if
conversion was necessary. This caused issues when comparing a
descriptor with annotations to one without. The updated code
now compares using TypeDescriptor.getType().
The ObjectToObject converter will now no longer attempt to convert
null source objects.
Issue: SPR-9933 | spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java | @@ -48,10 +48,17 @@ public Set<ConvertiblePair> getConvertibleTypes() {
}
public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
- return !sourceType.equals(targetType) && hasValueOfMethodOrConstructor(targetType.getType(), sourceType.getType());
+ if (sourceType.getType().equals(targetType.getType())) {
+ // no conversion required
+ return false;
+ }
+ return hasValueOfMethodOrConstructor(targetType.getType(), sourceType.getType());
}
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
Class<?> sourceClass = sourceType.getType();
Class<?> targetClass = targetType.getType();
Method method = getValueOfMethodOn(targetClass, sourceClass); | true |
Other | spring-projects | spring-framework | 31331e6ad31fb51e26ce926dfa8f1e06a15af608.json | Avoid NPE in ObjectToObjectConverter
Bypass ObjectToObject conversion when source and object types are
identical and protect against a null source object.
Prior to this commit the TypeDescriptor was used to determine if
conversion was necessary. This caused issues when comparing a
descriptor with annotations to one without. The updated code
now compares using TypeDescriptor.getType().
The ObjectToObject converter will now no longer attempt to convert
null source objects.
Issue: SPR-9933 | spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java | @@ -18,6 +18,8 @@
import java.awt.Color;
import java.awt.SystemColor;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -744,6 +746,22 @@ public void testEnumWithInterfaceToStringConversion() {
assertEquals("1", result);
}
+ @Test
+ public void convertNullAnnotatedStringToString() throws Exception {
+ DefaultConversionService.addDefaultConverters(conversionService);
+ String source = null;
+ TypeDescriptor sourceType = new TypeDescriptor(getClass().getField("annotatedString"));
+ TypeDescriptor targetType = TypeDescriptor.valueOf(String.class);
+ conversionService.convert(source, sourceType, targetType);
+ }
+
+ @ExampleAnnotation
+ public String annotatedString;
+
+ @Retention(RetentionPolicy.RUNTIME)
+ public static @interface ExampleAnnotation {
+ }
+
private static class MyConditionalConverter implements Converter<String, Color>,
ConditionalConverter {
| true |
Other | spring-projects | spring-framework | 5a1f924ac328827c31ced745a65867d4a1feca17.json | Resolve Collection element types during conversion
TypeDescriptor.valueOf now uses GenericCollectionTypeResolver to resolve
Collection and Map element types whereas previously this information was
simply not supported, i.e. null.
Issue: SPR-9257 | spring-core/src/main/java/org/springframework/core/convert/ClassDescriptor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -18,8 +18,11 @@
import java.lang.annotation.Annotation;
+import org.springframework.core.GenericCollectionTypeResolver;
+
/**
* @author Keith Donald
+ * @author Phillip Webb
* @since 3.1
*/
class ClassDescriptor extends AbstractDescriptor {
@@ -34,18 +37,21 @@ public Annotation[] getAnnotations() {
}
@Override
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected Class<?> resolveCollectionElementType() {
- return null;
+ return GenericCollectionTypeResolver.getCollectionType((Class) getType());
}
@Override
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected Class<?> resolveMapKeyType() {
- return null;
+ return GenericCollectionTypeResolver.getMapKeyType((Class) getType());
}
@Override
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected Class<?> resolveMapValueType() {
- return null;
+ return GenericCollectionTypeResolver.getMapValueType((Class) getType());
}
@Override | true |
Other | spring-projects | spring-framework | 5a1f924ac328827c31ced745a65867d4a1feca17.json | Resolve Collection element types during conversion
TypeDescriptor.valueOf now uses GenericCollectionTypeResolver to resolve
Collection and Map element types whereas previously this information was
simply not supported, i.e. null.
Issue: SPR-9257 | spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java | @@ -24,6 +24,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -818,4 +819,26 @@ public void testUpCastNotSuper() throws Exception {
}
}
+ @Test
+ public void elementTypeForCollectionSubclass() throws Exception {
+ @SuppressWarnings("serial")
+ class CustomSet extends HashSet<String> {
+ }
+
+ assertEquals(TypeDescriptor.valueOf(CustomSet.class).getElementTypeDescriptor(), TypeDescriptor.valueOf(String.class));
+ assertEquals(TypeDescriptor.forObject(new CustomSet()).getElementTypeDescriptor(), TypeDescriptor.valueOf(String.class));
+ }
+
+ @Test
+ public void elementTypeForMapSubclass() throws Exception {
+ @SuppressWarnings("serial")
+ class CustomMap extends HashMap<String, Integer> {
+ }
+
+ assertEquals(TypeDescriptor.valueOf(CustomMap.class).getMapKeyTypeDescriptor(), TypeDescriptor.valueOf(String.class));
+ assertEquals(TypeDescriptor.valueOf(CustomMap.class).getMapValueTypeDescriptor(), TypeDescriptor.valueOf(Integer.class));
+ assertEquals(TypeDescriptor.forObject(new CustomMap()).getMapKeyTypeDescriptor(), TypeDescriptor.valueOf(String.class));
+ assertEquals(TypeDescriptor.forObject(new CustomMap()).getMapValueTypeDescriptor(), TypeDescriptor.valueOf(Integer.class));
+ }
+
} | true |
Other | spring-projects | spring-framework | edce2e7bcab12cb6ffac60f9a952a76889f987aa.json | Allow SpEL reserved words in type package names
Expand the kinds of tokens considered when parsing qualified type names.
This allows previously reserved words (for example 'mod') to be used as
part of a package name.
Issue: SPR-9862 | spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java | @@ -17,8 +17,10 @@
package org.springframework.expression.spel.standard;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
+import java.util.regex.Pattern;
import org.springframework.expression.ParseException;
import org.springframework.expression.ParserContext;
@@ -29,6 +31,7 @@
import org.springframework.expression.spel.SpelParserConfiguration;
import org.springframework.expression.spel.ast.*;
import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
/**
* Hand written SpEL parser. Instances are reusable but are not thread safe.
@@ -38,6 +41,8 @@
*/
class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
+ private static final Pattern VALID_QUALIFIED_ID_PATTERN = Pattern.compile("[\\p{L}\\p{N}_$]+");
+
// The expression being parsed
private String expressionString;
@@ -567,14 +572,35 @@ private boolean maybeEatSelection(boolean nullSafeNavigation) {
* TODO AndyC Could create complete identifiers (a.b.c) here rather than a sequence of them? (a, b, c)
*/
private SpelNodeImpl eatPossiblyQualifiedId() {
- List<SpelNodeImpl> qualifiedIdPieces = new ArrayList<SpelNodeImpl>();
- Token startnode = eatToken(TokenKind.IDENTIFIER);
- qualifiedIdPieces.add(new Identifier(startnode.stringValue(),toPos(startnode)));
- while (peekToken(TokenKind.DOT,true)) {
- Token node = eatToken(TokenKind.IDENTIFIER);
- qualifiedIdPieces.add(new Identifier(node.stringValue(),toPos(node)));
- }
- return new QualifiedIdentifier(toPos(startnode.startpos,qualifiedIdPieces.get(qualifiedIdPieces.size()-1).getEndPosition()),qualifiedIdPieces.toArray(new SpelNodeImpl[qualifiedIdPieces.size()]));
+ LinkedList<SpelNodeImpl> qualifiedIdPieces = new LinkedList<SpelNodeImpl>();
+ Token node = peekToken();
+ while (isValidQualifiedId(node)) {
+ nextToken();
+ if(node.kind != TokenKind.DOT) {
+ qualifiedIdPieces.add(new Identifier(node.stringValue(),toPos(node)));
+ }
+ node = peekToken();
+ }
+ if(qualifiedIdPieces.isEmpty()) {
+ if(node == null) {
+ raiseInternalException( expressionString.length(), SpelMessage.OOD);
+ }
+ raiseInternalException(node.startpos, SpelMessage.NOT_EXPECTED_TOKEN,
+ "qualified ID", node.getKind().toString().toLowerCase());
+ }
+ int pos = toPos(qualifiedIdPieces.getFirst().getStartPosition(), qualifiedIdPieces.getLast().getEndPosition());
+ return new QualifiedIdentifier(pos, qualifiedIdPieces.toArray(new SpelNodeImpl[qualifiedIdPieces.size()]));
+ }
+
+ private boolean isValidQualifiedId(Token node) {
+ if(node == null || node.kind == TokenKind.LITERAL_STRING) {
+ return false;
+ }
+ if(node.kind == TokenKind.DOT || node.kind == TokenKind.IDENTIFIER) {
+ return true;
+ }
+ String value = node.stringValue();
+ return StringUtils.hasLength(value) && VALID_QUALIFIED_ID_PATTERN.matcher(value).matches();
}
// This is complicated due to the support for dollars in identifiers. Dollars are normally separate tokens but | true |
Other | spring-projects | spring-framework | edce2e7bcab12cb6ffac60f9a952a76889f987aa.json | Allow SpEL reserved words in type package names
Expand the kinds of tokens considered when parsing qualified type names.
This allows previously reserved words (for example 'mod') to be used as
part of a package name.
Issue: SPR-9862 | spring-expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -20,7 +20,7 @@
/**
* Tests the messages and exceptions that come out for badly formed expressions
- *
+ *
* @author Andy Clement
*/
public class ParserErrorMessagesTests extends ExpressionTestCase {
@@ -56,7 +56,7 @@ public void testBrokenExpression07() {
// T() can only take an identifier (possibly qualified), not a literal
// message ought to say identifier rather than ID
parseAndCheckError("null instanceof T('a')", SpelMessage.NOT_EXPECTED_TOKEN, 18,
- "identifier","literal_string");
+ "qualified ID","literal_string");
}
} | true |
Other | spring-projects | spring-framework | edce2e7bcab12cb6ffac60f9a952a76889f987aa.json | Allow SpEL reserved words in type package names
Expand the kinds of tokens considered when parsing qualified type names.
This allows previously reserved words (for example 'mod') to be used as
part of a package name.
Issue: SPR-9862 | spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java | @@ -16,32 +16,49 @@
package org.springframework.expression.spel;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import junit.framework.Assert;
+
import org.junit.Ignore;
import org.junit.Test;
+
import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.expression.*;
+import org.springframework.expression.AccessException;
+import org.springframework.expression.BeanResolver;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.EvaluationException;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.MethodExecutor;
+import org.springframework.expression.MethodResolver;
+import org.springframework.expression.ParserContext;
+import org.springframework.expression.PropertyAccessor;
+import org.springframework.expression.TypedValue;
import org.springframework.expression.spel.standard.SpelExpression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.ReflectiveMethodResolver;
import org.springframework.expression.spel.support.ReflectivePropertyAccessor;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.expression.spel.support.StandardTypeLocator;
+import org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
- * Tests based on Jiras up to the release of Spring 3.0.0
+ * Reproduction tests cornering various SpEL JIRA issues.
*
* @author Andy Clement
* @author Clark Duplichien
*/
-public class SpringEL300Tests extends ExpressionTestCase {
+public class SpelReproTests extends ExpressionTestCase {
@Test
public void testNPE_SPR5661() {
@@ -147,12 +164,12 @@ public void testSPR5905_InnerTypeReferences() throws Exception {
Expression expr = new SpelExpressionParser().parseRaw("T(java.util.Map$Entry)");
Assert.assertEquals(Map.Entry.class,expr.getValue(eContext));
- expr = new SpelExpressionParser().parseRaw("T(org.springframework.expression.spel.SpringEL300Tests$Outer$Inner).run()");
+ expr = new SpelExpressionParser().parseRaw("T(org.springframework.expression.spel.SpelReproTests$Outer$Inner).run()");
Assert.assertEquals(12,expr.getValue(eContext));
- expr = new SpelExpressionParser().parseRaw("new org.springframework.expression.spel.SpringEL300Tests$Outer$Inner().run2()");
+ expr = new SpelExpressionParser().parseRaw("new org.springframework.expression.spel.SpelReproTests$Outer$Inner().run2()");
Assert.assertEquals(13,expr.getValue(eContext));
-}
+ }
static class Outer {
static class Inner {
@@ -1034,6 +1051,15 @@ public Reserver getReserver() {
Assert.assertEquals("abc",exp.getValue(ctx));
}
+ @Test
+ public void testReservedWordProperties_9862() throws Exception {
+ StandardEvaluationContext ctx = new StandardEvaluationContext();
+ SpelExpressionParser parser = new SpelExpressionParser();
+ SpelExpression expression = parser.parseRaw("T(org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver).CONST");
+ Object value = expression.getValue(ctx);
+ assertEquals(value, Reserver.CONST);
+ }
+
/**
* We add property accessors in the order:
* First, Second, Third, Fourth. | true |
Other | spring-projects | spring-framework | edce2e7bcab12cb6ffac60f9a952a76889f987aa.json | Allow SpEL reserved words in type package names
Expand the kinds of tokens considered when parsing qualified type names.
This allows previously reserved words (for example 'mod') to be used as
part of a package name.
Issue: SPR-9862 | spring-expression/src/test/java/org/springframework/expression/spel/testresources/le/div/mod/reserved/Reserver.java | @@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-2012 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.expression.spel.testresources.le.div.mod.reserved;
+
+/**
+ * For use when testing that the SpEL expression parser can accommodate SpEL's own
+ * reserved words being used in package names.
+ *
+ * @author Phillip Webb
+ */
+public class Reserver {
+
+ public static final String CONST = "Const";
+
+} | true |
Other | spring-projects | spring-framework | 38bfb2bd893f062a9d90d3cfd14a2b0d619a4b5a.json | Introduce MessageCodeFormatter abstraction
This commit refactors changes introduced in 21760a8 as follows:
- Introduce top-level MessageCodeFormatter interface and
DefaultMessageCodesResolver#setMessageCodeFormatter property to allow
for user-defined message code formatting strategies
- Rename DefaultMessageCodesResolver.Style enum => DMCR.Format
- Refactor DefaultMessageCodesResolver.Format to implement the new
MessageCodeFormatter interface
The result is that users have convenient access to common formatting
strategies via the Format enum, while retaining the flexibility to
provide their own custom MessageCodeFormatter implementation if desired.
See DefaultMessageCodesResolverTests#shouldSupport*Format tests for
usage examples.
Issue: SPR-9707 | spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java | @@ -29,7 +29,8 @@
* Default implementation of the {@link MessageCodesResolver} interface.
*
* <p>Will create two message codes for an object error, in the following order (when
- * using the {@link Style#PREFIX_ERROR_CODE prefixed} {@link #setStyle(Style) style}):
+ * using the {@link Format#PREFIX_ERROR_CODE prefixed}
+ * {@link #setMessageCodeFormatter(MessageCodeFormatter) formatter}):
* <ul>
* <li>1.: code + "." + object name
* <li>2.: code
@@ -73,15 +74,17 @@
* </ul>
*
* <p>By default the {@code errorCode}s will be placed at the beginning of constructed
- * message strings. The {@link #setStyle(Style) style} property can be used to specify
- * alternative {@link Style styles} of concatination.
+ * message strings. The {@link #setMessageCodeFormatter(MessageCodeFormatter)
+ * messageCodeFormatter} property can be used to specify an alternative concatenation
+ * {@link MessageCodeFormatter format}.
*
* <p>In order to group all codes into a specific category within your resource bundles,
* e.g. "validation.typeMismatch.name" instead of the default "typeMismatch.name",
* consider specifying a {@link #setPrefix prefix} to be applied.
*
* @author Juergen Hoeller
* @author Phillip Webb
+ * @author Chris Beams
* @since 1.0.1
*/
@SuppressWarnings("serial")
@@ -92,12 +95,12 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
*/
public static final String CODE_SEPARATOR = ".";
- private static final Style DEFAULT_STYLE = Style.PREFIX_ERROR_CODE;
+ private static final MessageCodeFormatter DEFAULT_FORMATTER = Format.PREFIX_ERROR_CODE;
private String prefix = "";
- private Style style = DEFAULT_STYLE;
+ private MessageCodeFormatter formatter = DEFAULT_FORMATTER;
/**
@@ -110,11 +113,12 @@ public void setPrefix(String prefix) {
}
/**
- * Specify the style of message code that will be built by this resolver.
- * <p>Default is {@link Style#PREFIX_ERROR_CODE}.
+ * Specify the format for message codes built by this resolver.
+ * <p>The default is {@link Format#PREFIX_ERROR_CODE}.
+ * @since 3.2
*/
- public void setStyle(Style style) {
- this.style = (style == null ? DEFAULT_STYLE : style);
+ public void setMessageCodeFormatter(MessageCodeFormatter formatter) {
+ this.formatter = (formatter == null ? DEFAULT_FORMATTER : formatter);
}
/**
@@ -163,29 +167,7 @@ private void addCodes(Collection<String> codeList, String errorCode, String obje
}
private void addCode(Collection<String> codeList, String errorCode, String objectName, String field) {
- String code = getCode(errorCode, objectName, field);
- codeList.add(postProcessMessageCode(code));
- }
-
- private String getCode(String errorCode, String objectName, String field) {
- switch (this.style) {
- case PREFIX_ERROR_CODE:
- return toDelimitedString(errorCode, objectName, field);
- case POSTFIX_ERROR_CODE:
- return toDelimitedString(objectName, field, errorCode);
- }
- throw new IllegalStateException("Unknown style " + this.style);
- }
-
- private String toDelimitedString(String... elements) {
- StringBuilder rtn = new StringBuilder();
- for (String element : elements) {
- if(StringUtils.hasLength(element)) {
- rtn.append(rtn.length() == 0 ? "" : CODE_SEPARATOR);
- rtn.append(element);
- }
- }
- return rtn.toString();
+ codeList.add(postProcessMessageCode(this.formatter.format(errorCode, objectName, field)));
}
/**
@@ -222,21 +204,51 @@ protected String postProcessMessageCode(String code) {
/**
- * The various styles that can be used to construct message codes.
+ * Common message code formats.
+ *
+ * @author Phil Webb
+ * @author Chris Beams
+ * @since 3.2
+ * @see MessageCodeFormatter
+ * @see DefaultMessageCodesResolver#setMessageCodeFormatter(MessageCodeFormatter)
*/
- public static enum Style {
+ public static enum Format implements MessageCodeFormatter {
/**
- * Prefix the error code at the beginning of the generated message code. eg:
+ * Prefix the error code at the beginning of the generated message code. e.g.:
* {@code errorCode + "." + object name + "." + field}
*/
- PREFIX_ERROR_CODE,
+ PREFIX_ERROR_CODE {
+ public String format(String errorCode, String objectName, String field) {
+ return toDelimitedString(errorCode, objectName, field);
+ }
+ },
/**
- * Postfix the error code at the end of the generated message code. eg:
+ * Postfix the error code at the end of the generated message code. e.g.:
* {@code object name + "." + field + "." + errorCode}
*/
- POSTFIX_ERROR_CODE
+ POSTFIX_ERROR_CODE {
+ public String format(String errorCode, String objectName, String field) {
+ return toDelimitedString(objectName, field, errorCode);
+ }
+ };
+
+ /**
+ * Concatenate the given elements, delimiting each with
+ * {@link DefaultMessageCodesResolver#CODE_SEPARATOR}, skipping zero-length or
+ * null elements altogether.
+ */
+ public static String toDelimitedString(String... elements) {
+ StringBuilder rtn = new StringBuilder();
+ for (String element : elements) {
+ if(StringUtils.hasLength(element)) {
+ rtn.append(rtn.length() == 0 ? "" : CODE_SEPARATOR);
+ rtn.append(element);
+ }
+ }
+ return rtn.toString();
+ }
}
} | true |
Other | spring-projects | spring-framework | 38bfb2bd893f062a9d90d3cfd14a2b0d619a4b5a.json | Introduce MessageCodeFormatter abstraction
This commit refactors changes introduced in 21760a8 as follows:
- Introduce top-level MessageCodeFormatter interface and
DefaultMessageCodesResolver#setMessageCodeFormatter property to allow
for user-defined message code formatting strategies
- Rename DefaultMessageCodesResolver.Style enum => DMCR.Format
- Refactor DefaultMessageCodesResolver.Format to implement the new
MessageCodeFormatter interface
The result is that users have convenient access to common formatting
strategies via the Format enum, while retaining the flexibility to
provide their own custom MessageCodeFormatter implementation if desired.
See DefaultMessageCodesResolverTests#shouldSupport*Format tests for
usage examples.
Issue: SPR-9707 | spring-context/src/main/java/org/springframework/validation/MessageCodeFormatter.java | @@ -0,0 +1,38 @@
+/*
+ * Copyright 2002-2012 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.validation;
+
+/**
+ * A strategy interface for formatting message codes.
+ *
+ * @author Chris Beams
+ * @since 3.2
+ * @see DefaultMessageCodesResolver
+ */
+public interface MessageCodeFormatter {
+
+ /**
+ * Build and return a message code consisting of the given fields, usually delimited
+ * by {@link DefaultMessageCodesResolver#CODE_SEPARATOR}.
+ * @param errorCode e.g.: "typeMismatch"
+ * @param objectName e.g.: "user"
+ * @param field e.g. "age"
+ * @return concatenated message code, e.g.: "typeMismatch.user.age"
+ * @see DefaultMessageCodesResolver.Format
+ */
+ String format(String errorCode, String objectName, String field);
+}
\ No newline at end of file | true |
Other | spring-projects | spring-framework | 38bfb2bd893f062a9d90d3cfd14a2b0d619a4b5a.json | Introduce MessageCodeFormatter abstraction
This commit refactors changes introduced in 21760a8 as follows:
- Introduce top-level MessageCodeFormatter interface and
DefaultMessageCodesResolver#setMessageCodeFormatter property to allow
for user-defined message code formatting strategies
- Rename DefaultMessageCodesResolver.Style enum => DMCR.Format
- Refactor DefaultMessageCodesResolver.Format to implement the new
MessageCodeFormatter interface
The result is that users have convenient access to common formatting
strategies via the Format enum, while retaining the flexibility to
provide their own custom MessageCodeFormatter implementation if desired.
See DefaultMessageCodesResolverTests#shouldSupport*Format tests for
usage examples.
Issue: SPR-9707 | spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java | @@ -22,7 +22,7 @@
import org.junit.Test;
import org.springframework.beans.TestBean;
-import org.springframework.validation.DefaultMessageCodesResolver.Style;
+import org.springframework.validation.DefaultMessageCodesResolver.Format;
/**
* Tests for {@link DefaultMessageCodesResolver}.
@@ -123,17 +123,17 @@ public void shouldSupportNullFieldType() throws Exception {
}
@Test
- public void shouldSupportPostfixStyle() throws Exception {
- resolver.setStyle(Style.POSTFIX_ERROR_CODE);
+ public void shouldSupportPostfixFormat() throws Exception {
+ resolver.setMessageCodeFormatter(Format.POSTFIX_ERROR_CODE);
String[] codes = resolver.resolveMessageCodes("errorCode", "objectName");
assertThat(codes, is(equalTo(new String[] {
"objectName.errorCode",
"errorCode" })));
}
@Test
- public void shouldSupportFieldPostfixStyle() throws Exception {
- resolver.setStyle(Style.POSTFIX_ERROR_CODE);
+ public void shouldSupportFieldPostfixFormat() throws Exception {
+ resolver.setMessageCodeFormatter(Format.POSTFIX_ERROR_CODE);
String[] codes = resolver.resolveMessageCodes("errorCode", "objectName", "field",
TestBean.class);
assertThat(codes, is(equalTo(new String[] {
@@ -142,4 +142,18 @@ public void shouldSupportFieldPostfixStyle() throws Exception {
"org.springframework.beans.TestBean.errorCode",
"errorCode" })));
}
+
+ @Test
+ public void shouldSupportCustomFormat() throws Exception {
+ resolver.setMessageCodeFormatter(new MessageCodeFormatter() {
+ public String format(String errorCode, String objectName, String field) {
+ return DefaultMessageCodesResolver.Format.toDelimitedString(
+ "CUSTOM-" + errorCode, objectName, field);
+ }
+ });
+ String[] codes = resolver.resolveMessageCodes("errorCode", "objectName");
+ assertThat(codes, is(equalTo(new String[] {
+ "CUSTOM-errorCode.objectName",
+ "CUSTOM-errorCode" })));
+ }
} | true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalConversion.java | @@ -0,0 +1,55 @@
+/*
+ * Copyright 2012 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.core.convert.converter;
+
+import org.springframework.core.convert.TypeDescriptor;
+
+/**
+ * Allows a {@link Converter}, {@link GenericConverter} or {@link ConverterFactory} to
+ * conditionally execute based on attributes of the {@code source} and {@code target}
+ * {@link TypeDescriptor}.
+ *
+ * <p>Often used to selectively match custom conversion logic based on the presence of a
+ * field or class-level characteristic, such as an annotation or method. For example, when
+ * converting from a String field to a Date field, an implementation might return
+ *
+ * {@code true} if the target field has also been annotated with {@code @DateTimeFormat}.
+ *
+ * <p>As another example, when converting from a String field to an {@code Account} field, an
+ * implementation might return {@code true} if the target Account class defines a
+ * {@code public static findAccount(String)} method.
+ *
+ * @author Keith Donald
+ * @author Phillip Webb
+ * @since 3.2
+ * @see Converter
+ * @see GenericConverter
+ * @see ConverterFactory
+ * @see ConditionalGenericConverter
+ */
+public interface ConditionalConversion {
+
+ /**
+ * Should the converter from {@code sourceType} to {@code targetType} currently under
+ * consideration be selected?
+ *
+ * @param sourceType the type descriptor of the field we are converting from
+ * @param targetType the type descriptor of the field we are converting to
+ * @return true if conversion should be performed, false otherwise
+ */
+ boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType);
+} | true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -18,34 +18,19 @@
import org.springframework.core.convert.TypeDescriptor;
+
/**
- * A generic converter that conditionally executes.
- *
- * <p>Applies a rule that determines if a converter between a set of
- * {@link #getConvertibleTypes() convertible types} matches given a client request to
- * convert between a source field of convertible type S and a target field of convertible type T.
- *
- * <p>Often used to selectively match custom conversion logic based on the presence of
- * a field or class-level characteristic, such as an annotation or method. For example,
- * when converting from a String field to a Date field, an implementation might return
- * <code>true</code> if the target field has also been annotated with <code>@DateTimeFormat</code>.
- *
- * <p>As another example, when converting from a String field to an Account field,
- * an implementation might return true if the target Account class defines a
- * <code>public static findAccount(String)</code> method.
+ * A {@link GenericConverter} that may conditionally execute based on attributes of the
+ * {@code source} and {@code target} {@link TypeDescriptor}. See
+ * {@link ConditionalConversion} for details.
*
* @author Keith Donald
+ * @author Phillip Webb
* @since 3.0
+ * @see GenericConverter
+ * @see ConditionalConversion
*/
-public interface ConditionalGenericConverter extends GenericConverter {
-
- /**
- * Should the converter from <code>sourceType</code> to <code>targetType</code>
- * currently under consideration be selected?
- * @param sourceType the type descriptor of the field we are converting from
- * @param targetType the type descriptor of the field we are converting to
- * @return true if conversion should be performed, false otherwise
- */
- boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType);
+public interface ConditionalGenericConverter extends GenericConverter,
+ ConditionalConversion {
} | true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -20,10 +20,13 @@
* A converter converts a source object of type S to a target of type T.
* Implementations of this interface are thread-safe and can be shared.
*
+ * <p>Implementations may additionally implement {@link ConditionalConversion}.
+ *
* @author Keith Donald
+ * @since 3.0
+ * @see ConditionalConversion
* @param <S> The source type
* @param <T> The target type
- * @since 3.0
*/
public interface Converter<S, T> {
| true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/main/java/org/springframework/core/convert/converter/ConverterFactory.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -19,8 +19,11 @@
/**
* A factory for "ranged" converters that can convert objects from S to subtypes of R.
*
+ * <p>Implementations may additionally implement {@link ConditionalConversion}.
+ *
* @author Keith Donald
* @since 3.0
+ * @see ConditionalConversion
* @param <S> The source type converters created by this factory can convert from
* @param <R> The target range (or base) type converters created by this factory can convert to;
* for example {@link Number} for a set of number subtypes. | true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 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,18 +34,24 @@
* <p>This interface should generally not be used when the simpler {@link Converter} or
* {@link ConverterFactory} interfaces are sufficient.
*
+ * <p>Implementations may additionally implement {@link ConditionalConversion}.
+ *
* @author Keith Donald
* @author Juergen Hoeller
* @since 3.0
* @see TypeDescriptor
* @see Converter
* @see ConverterFactory
+ * @see ConditionalConversion
*/
public interface GenericConverter {
/**
- * Return the source and target types which this converter can convert between.
- * <p>Each entry is a convertible source-to-target type pair.
+ * Return the source and target types which this converter can convert between. Each
+ * entry is a convertible source-to-target type pair.
+ * <p>
+ * For {@link ConditionalConversion conditional} converters this method may return
+ * {@code null} to indicate all source-to-target pairs should be considered. *
*/
Set<ConvertiblePair> getConvertibleTypes();
| true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java | @@ -34,6 +34,7 @@
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.ConditionalConversion;
import org.springframework.core.convert.converter.ConditionalGenericConverter;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.converter.ConverterFactory;
@@ -289,6 +290,10 @@ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
if(!this.typeInfo.getTargetType().equals(targetType.getObjectType())) {
return false;
}
+ if (this.converter instanceof ConditionalConversion) {
+ return ((ConditionalConversion) this.converter).matches(sourceType,
+ targetType);
+ }
return true;
}
@@ -310,7 +315,7 @@ public String toString() {
* Adapts a {@link ConverterFactory} to a {@link GenericConverter}.
*/
@SuppressWarnings("unchecked")
- private final class ConverterFactoryAdapter implements GenericConverter {
+ private final class ConverterFactoryAdapter implements ConditionalGenericConverter {
private final ConvertiblePair typeInfo;
@@ -327,6 +332,21 @@ public Set<ConvertiblePair> getConvertibleTypes() {
return Collections.singleton(this.typeInfo);
}
+ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+ boolean matches = true;
+ if (this.converterFactory instanceof ConditionalConversion) {
+ matches = ((ConditionalConversion) this.converterFactory).matches(
+ sourceType, targetType);
+ }
+ if(matches) {
+ Converter<?, ?> converter = converterFactory.getConverter(targetType.getType());
+ if(converter instanceof ConditionalConversion) {
+ matches = ((ConditionalConversion) converter).matches(sourceType, targetType);
+ }
+ }
+ return matches;
+ }
+
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
if (source == null) {
return convertNullSource(sourceType, targetType);
@@ -393,15 +413,23 @@ private static class Converters {
IGNORED_CLASSES = Collections.unmodifiableSet(ignored);
}
+ private final Set<GenericConverter> globalConverters =
+ new LinkedHashSet<GenericConverter>();
+
private final Map<ConvertiblePair, ConvertersForPair> converters =
new LinkedHashMap<ConvertiblePair, ConvertersForPair>(36);
public void add(GenericConverter converter) {
Set<ConvertiblePair> convertibleTypes = converter.getConvertibleTypes();
- Assert.state(converter.getConvertibleTypes() != null, "Converter does not specifiy ConvertibleTypes");
- for (ConvertiblePair convertiblePair : convertibleTypes) {
- ConvertersForPair convertersForPair = getMatchableConverters(convertiblePair);
- convertersForPair.add(converter);
+ if (convertibleTypes == null) {
+ Assert.state(converter instanceof ConditionalConversion,
+ "Only conditional converters may return null convertible types");
+ globalConverters.add(converter);
+ } else {
+ for (ConvertiblePair convertiblePair : convertibleTypes) {
+ ConvertersForPair convertersForPair = getMatchableConverters(convertiblePair);
+ convertersForPair.add(converter);
+ }
}
}
@@ -454,6 +482,15 @@ private GenericConverter getRegisteredConverter(TypeDescriptor sourceType, TypeD
return converter;
}
+ // Check ConditionalGenericConverter that match all types
+ for (GenericConverter globalConverter : this.globalConverters) {
+ if (((ConditionalConversion)globalConverter).matches(
+ sourceCandidate,
+ targetCandidate)) {
+ return globalConverter;
+ }
+ }
+
return null;
}
| true |
Other | spring-projects | spring-framework | f13e3ad72b813d35d3187394dc53f98a35003c9a.json | Extend conditional conversion support
Introduce new ConditionalConversion interface that can be applied to
Converter, ConverterFactory or GenericConverter interfaces to make
them conditional. Prior to this commit the only
ConditionalGenericConverter could be conditional.
Issue: SPR-9928 | spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java | @@ -31,7 +31,9 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -42,7 +44,9 @@
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.ConditionalConversion;
import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
import org.springframework.core.convert.converter.GenericConverter;
import org.springframework.core.io.DescriptiveResource;
import org.springframework.core.io.Resource;
@@ -644,4 +648,134 @@ public void removeConvertible() throws Exception {
conversionService.removeConvertible(String.class, Color.class);
assertFalse(conversionService.canConvert(String.class, Color.class));
}
+
+ @Test
+ public void conditionalConverter() throws Exception {
+ GenericConversionService conversionService = new GenericConversionService();
+ MyConditionalConverter converter = new MyConditionalConverter();
+ conversionService.addConverter(new ColorConverter());
+ conversionService.addConverter(converter);
+ assertEquals(Color.BLACK, conversionService.convert("#000000", Color.class));
+ assertTrue(converter.getMatchAttempts() > 0);
+ }
+
+ @Test
+ public void conditionalConverterFactory() throws Exception {
+ GenericConversionService conversionService = new GenericConversionService();
+ MyConditionalConverterFactory converter = new MyConditionalConverterFactory();
+ conversionService.addConverter(new ColorConverter());
+ conversionService.addConverterFactory(converter);
+ assertEquals(Color.BLACK, conversionService.convert("#000000", Color.class));
+ assertTrue(converter.getMatchAttempts() > 0);
+ assertTrue(converter.getNestedMatchAttempts() > 0);
+ }
+
+ @Test
+ public void shouldNotSuportNullConvertibleTypesFromNonConditionalGenericConverter()
+ throws Exception {
+ GenericConversionService conversionService = new GenericConversionService();
+ GenericConverter converter = new GenericConverter() {
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ return null;
+ }
+
+ public Object convert(Object source, TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ return null;
+ }
+ };
+ try {
+ conversionService.addConverter(converter);
+ fail("Did not throw");
+ } catch (IllegalStateException e) {
+ assertEquals("Only conditional converters may return null convertible types", e.getMessage());
+ }
+ }
+
+ @Test
+ public void conditionalConversionForAllTypes() throws Exception {
+ GenericConversionService conversionService = new GenericConversionService();
+ MyConditionalGenericConverter converter = new MyConditionalGenericConverter();
+ conversionService.addConverter(converter);
+ assertEquals((Integer) 3, conversionService.convert(3, Integer.class));
+ Iterator<TypeDescriptor> iterator = converter.getSourceTypes().iterator();
+ assertEquals(Integer.class, iterator.next().getType());
+ assertEquals(Number.class, iterator.next().getType());
+ TypeDescriptor last = null;
+ while (iterator.hasNext()) {
+ last = iterator.next();
+ }
+ assertEquals(Object.class, last.getType());
+ }
+
+ private static class MyConditionalConverter implements Converter<String, Color>,
+ ConditionalConversion {
+
+ private int matchAttempts = 0;
+
+ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+ matchAttempts++;
+ return false;
+ }
+
+ public Color convert(String source) {
+ throw new IllegalStateException();
+ }
+
+ public int getMatchAttempts() {
+ return matchAttempts;
+ }
+ }
+
+ private static class MyConditionalGenericConverter implements GenericConverter,
+ ConditionalConversion {
+
+ private Set<TypeDescriptor> sourceTypes = new LinkedHashSet<TypeDescriptor>();
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ return null;
+ }
+
+ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+ sourceTypes.add(sourceType);
+ return false;
+ }
+
+ public Object convert(Object source, TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ return null;
+ }
+
+ public Set<TypeDescriptor> getSourceTypes() {
+ return sourceTypes;
+ }
+ }
+
+ private static class MyConditionalConverterFactory implements
+ ConverterFactory<String, Color>, ConditionalConversion {
+
+ private MyConditionalConverter converter = new MyConditionalConverter();
+
+ private int matchAttempts = 0;
+
+ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+ matchAttempts++;
+ return true;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T extends Color> Converter<String, T> getConverter(Class<T> targetType) {
+ return (Converter<String, T>) converter;
+ }
+
+ public int getMatchAttempts() {
+ return matchAttempts;
+ }
+
+ public int getNestedMatchAttempts() {
+ return converter.getMatchAttempts();
+ }
+ }
+
} | true |
Other | spring-projects | spring-framework | d8469d118b41fd18b70a11f0c0dcd12b60a8f6c6.json | Fix issue with extracting matrix variables
The servlet spec recommends removing path parameters from the
contextPath, servletPath, and pathInfo but not from the requestURI.
This poses a challenge for the UrlPathHelper, which determines the
lookup path by comparing the above.
This change introduces a method that matches the requestURI to the
contextPath and servletPath ignoring path parameters (i.e. matrix
variables) for comparison purposes while also preserving them in the
resulting lookup path. | spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java | @@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
@@ -172,9 +173,10 @@ public String getLookupPathForRequest(HttpServletRequest request) {
public String getPathWithinServletMapping(HttpServletRequest request) {
String pathWithinApp = getPathWithinApplication(request);
String servletPath = getServletPath(request);
- if (pathWithinApp.startsWith(servletPath)) {
+ String path = getRemainingPath(pathWithinApp, servletPath, false);
+ if (path != null) {
// Normal case: URI contains servlet path.
- return pathWithinApp.substring(servletPath.length());
+ return path;
}
else {
// Special case: URI is different from servlet path.
@@ -195,17 +197,54 @@ public String getPathWithinServletMapping(HttpServletRequest request) {
public String getPathWithinApplication(HttpServletRequest request) {
String contextPath = getContextPath(request);
String requestUri = getRequestUri(request);
- if (StringUtils.startsWithIgnoreCase(requestUri, contextPath)) {
+ String path = getRemainingPath(requestUri, contextPath, true);
+ if (path != null) {
// Normal case: URI contains context path.
- String path = requestUri.substring(contextPath.length());
return (StringUtils.hasText(path) ? path : "/");
}
else {
- // Special case: rather unusual.
return requestUri;
}
}
+ /**
+ * Match the given "mapping" to the start of the "requestUri" and if there
+ * is a match return the extra part. This method is needed because the
+ * context path and the servlet path returned by the HttpServletRequest are
+ * stripped of semicolon content unlike the requesUri.
+ */
+ private String getRemainingPath(String requestUri, String mapping, boolean ignoreCase) {
+ int index1 = 0;
+ int index2 = 0;
+ for ( ; (index1 < requestUri.length()) && (index2 < mapping.length()); index1++, index2++) {
+ char c1 = requestUri.charAt(index1);
+ char c2 = mapping.charAt(index2);
+ if (c1 == ';') {
+ index1 = requestUri.indexOf('/', index1);
+ if (index1 == -1) {
+ return null;
+ }
+ c1 = requestUri.charAt(index1);
+ }
+ if (c1 == c2) {
+ continue;
+ }
+ if (ignoreCase && (Character.toLowerCase(c1) == Character.toLowerCase(c2))) {
+ continue;
+ }
+ return null;
+ }
+ if (index2 != mapping.length()) {
+ return null;
+ }
+ if (index1 == requestUri.length()) {
+ return "";
+ }
+ else if (requestUri.charAt(index1) == ';') {
+ index1 = requestUri.indexOf('/', index1);
+ }
+ return (index1 != -1) ? requestUri.substring(index1) : "";
+ }
/**
* Return the request URI for the given request, detecting an include request | true |
Other | spring-projects | spring-framework | d8469d118b41fd18b70a11f0c0dcd12b60a8f6c6.json | Fix issue with extracting matrix variables
The servlet spec recommends removing path parameters from the
contextPath, servletPath, and pathInfo but not from the requestURI.
This poses a challenge for the UrlPathHelper, which determines the
lookup path by comparing the above.
This change introduces a method that matches the requestURI to the
contextPath and servletPath ignoring path parameters (i.e. matrix
variables) for comparison purposes while also preserving them in the
resulting lookup path. | spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java | @@ -69,6 +69,15 @@ public void getPathWithinApplicationForSlashContextPath() {
assertEquals("Incorrect path returned", "/welcome.html", helper.getPathWithinApplication(request));
}
+ @Test
+ public void getPathWithinServlet() {
+ request.setContextPath("/petclinic");
+ request.setServletPath("/main");
+ request.setRequestURI("/petclinic/main/welcome.html");
+
+ assertEquals("Incorrect path returned", "/welcome.html", helper.getPathWithinServletMapping(request));
+ }
+
@Test
public void getRequestUri() {
request.setRequestURI("/welcome.html");
@@ -104,6 +113,29 @@ public void getRequestKeepSemicolonContent() throws UnsupportedEncodingException
assertEquals("jsessionid should always be removed", "/foo;a=b;c=d", helper.getRequestUri(request));
}
+ @Test
+ public void getLookupPathWithSemicolonContent() {
+ helper.setRemoveSemicolonContent(false);
+
+ request.setContextPath("/petclinic");
+ request.setServletPath("/main");
+ request.setRequestURI("/petclinic;a=b/main;b=c/welcome.html;c=d");
+
+ assertEquals("/welcome.html;c=d", helper.getLookupPathForRequest(request));
+ }
+
+ @Test
+ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
+ helper.setRemoveSemicolonContent(false);
+
+ request.setContextPath("/petclinic");
+ request.setServletPath("/welcome.html");
+ request.setRequestURI("/petclinic;a=b/welcome.html;c=d");
+
+ assertEquals("/welcome.html;c=d", helper.getLookupPathForRequest(request));
+ }
+
+
//
// suite of tests root requests for default servlets (SRV 11.2) on Websphere vs Tomcat and other containers
// see: http://jira.springframework.org/browse/SPR-7064 | true |
Other | spring-projects | spring-framework | d8469d118b41fd18b70a11f0c0dcd12b60a8f6c6.json | Fix issue with extracting matrix variables
The servlet spec recommends removing path parameters from the
contextPath, servletPath, and pathInfo but not from the requestURI.
This poses a challenge for the UrlPathHelper, which determines the
lookup path by comparing the above.
This change introduces a method that matches the requestURI to the
contextPath and servletPath ignoring path parameters (i.e. matrix
variables) for comparison purposes while also preserving them in the
resulting lookup path. | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java | @@ -116,7 +116,7 @@ else if (paramValues.size() == 1) {
protected void handleMissingValue(String name, MethodParameter param) throws ServletRequestBindingException {
String paramType = param.getParameterType().getName();
throw new ServletRequestBindingException(
- "Missing URI path parameter '" + name + "' for method parameter type [" + paramType + "]");
+ "Missing matrix variable '" + name + "' for method parameter type [" + paramType + "]");
}
| true |
Other | spring-projects | spring-framework | 826057bcdea8bfe5984c7c4df2b3faff35dcae52.json | Expose convenience method in MVC Java config
The new method allows modifying or overriding the
ConfigurableWebBindingInitializer instance used for data binder
initialization.
Issue: SPR-8984 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java | @@ -56,6 +56,7 @@
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
import org.springframework.web.HttpRequestHandler;
import org.springframework.web.accept.ContentNegotiationManager;
+import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
@@ -351,11 +352,6 @@ protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer c
*/
@Bean
public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
- ConfigurableWebBindingInitializer webBindingInitializer = new ConfigurableWebBindingInitializer();
- webBindingInitializer.setConversionService(mvcConversionService());
- webBindingInitializer.setValidator(mvcValidator());
- webBindingInitializer.setMessageCodesResolver(getMessageCodesResolver());
-
List<HandlerMethodArgumentResolver> argumentResolvers = new ArrayList<HandlerMethodArgumentResolver>();
addArgumentResolvers(argumentResolvers);
@@ -365,7 +361,7 @@ public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
RequestMappingHandlerAdapter adapter = new RequestMappingHandlerAdapter();
adapter.setContentNegotiationManager(mvcContentNegotiationManager());
adapter.setMessageConverters(getMessageConverters());
- adapter.setWebBindingInitializer(webBindingInitializer);
+ adapter.setWebBindingInitializer(getConfigurableWebBindingInitializer());
adapter.setCustomArgumentResolvers(argumentResolvers);
adapter.setCustomReturnValueHandlers(returnValueHandlers);
@@ -385,7 +381,19 @@ public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
}
/**
- * Returns a {@link FormattingConversionService} for use with annotated
+ * Return the {@link ConfigurableWebBindingInitializer} to use for
+ * initializing all {@link WebDataBinder} instances.
+ */
+ protected ConfigurableWebBindingInitializer getConfigurableWebBindingInitializer() {
+ ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer();
+ initializer.setConversionService(mvcConversionService());
+ initializer.setValidator(mvcValidator());
+ initializer.setMessageCodesResolver(getMessageCodesResolver());
+ return initializer;
+ }
+
+ /**
+ * Return a {@link FormattingConversionService} for use with annotated
* controller methods and the {@code spring:eval} JSP tag.
* Also see {@link #addFormatters} as an alternative to overriding this method.
*/
@@ -397,7 +405,7 @@ public FormattingConversionService mvcConversionService() {
}
/**
- * Returns a global {@link Validator} instance for example for validating
+ * Return a global {@link Validator} instance for example for validating
* {@code @ModelAttribute} and {@code @RequestBody} method arguments.
* Delegates to {@link #getValidator()} first and if that returns {@code null}
* checks the classpath for the presence of a JSR-303 implementations | false |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java | @@ -178,6 +178,15 @@ protected boolean shouldNotFilterAsyncDispatch() {
return false;
}
+ /**
+ * Returns "false" so that the filter may provide a Hibernate
+ * {@code Session} to each error dispatches.
+ */
+ @Override
+ protected boolean shouldNotFilterErrorDispatch() {
+ return false;
+ }
+
@Override
protected void doFilterInternal(
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -187,7 +196,6 @@ protected void doFilterInternal(
boolean participate = false;
WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
- boolean isFirstRequest = !asyncManager.hasConcurrentResult();
String key = getAlreadyFilteredAttributeName();
if (isSingleSession()) {
@@ -197,6 +205,7 @@ protected void doFilterInternal(
participate = true;
}
else {
+ boolean isFirstRequest = !isAsyncDispatch(request);
if (isFirstRequest || !applySessionBindingInterceptor(asyncManager, key)) {
logger.debug("Opening single Hibernate Session in OpenSessionInViewFilter");
Session session = getSession(sessionFactory);
@@ -210,8 +219,7 @@ protected void doFilterInternal(
}
else {
// deferred close mode
- Assert.state(!asyncManager.isConcurrentHandlingStarted(),
- "Deferred close mode is not supported on async dispatches");
+ Assert.state(!isAsyncStarted(request), "Deferred close mode is not supported on async dispatches");
if (SessionFactoryUtils.isDeferredCloseActive(sessionFactory)) {
// Do not modify deferred close: just set the participate flag.
participate = true;
@@ -230,7 +238,7 @@ protected void doFilterInternal(
// single session mode
SessionHolder sessionHolder =
(SessionHolder) TransactionSynchronizationManager.unbindResource(sessionFactory);
- if (!asyncManager.isConcurrentHandlingStarted()) {
+ if (!isAsyncStarted(request)) {
logger.debug("Closing single Hibernate Session in OpenSessionInViewFilter");
closeSession(sessionHolder.getSession(), sessionFactory);
} | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-orm/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java | @@ -102,7 +102,7 @@ protected String getSessionFactoryBeanName() {
}
/**
- * The default value is "false" so that the filter may re-bind the opened
+ * Returns "false" so that the filter may re-bind the opened Hibernate
* {@code Session} to each asynchronously dispatched thread and postpone
* closing it until the very last asynchronous dispatch.
*/
@@ -111,6 +111,15 @@ protected boolean shouldNotFilterAsyncDispatch() {
return false;
}
+ /**
+ * Returns "false" so that the filter may provide a Hibernate
+ * {@code Session} to each error dispatches.
+ */
+ @Override
+ protected boolean shouldNotFilterErrorDispatch() {
+ return false;
+ }
+
@Override
protected void doFilterInternal(
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -120,14 +129,14 @@ protected void doFilterInternal(
boolean participate = false;
WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
- boolean isFirstRequest = !asyncManager.hasConcurrentResult();
String key = getAlreadyFilteredAttributeName();
if (TransactionSynchronizationManager.hasResource(sessionFactory)) {
// Do not modify the Session: just set the participate flag.
participate = true;
}
else {
+ boolean isFirstRequest = !isAsyncDispatch(request);
if (isFirstRequest || !applySessionBindingInterceptor(asyncManager, key)) {
logger.debug("Opening Hibernate Session in OpenSessionInViewFilter");
Session session = openSession(sessionFactory);
@@ -147,7 +156,7 @@ protected void doFilterInternal(
if (!participate) {
SessionHolder sessionHolder =
(SessionHolder) TransactionSynchronizationManager.unbindResource(sessionFactory);
- if (!asyncManager.isConcurrentHandlingStarted()) {
+ if (!isAsyncStarted(request)) {
logger.debug("Closing Hibernate Session in OpenSessionInViewFilter");
SessionFactoryUtils.closeSession(sessionHolder.getSession());
} | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java | @@ -126,7 +126,7 @@ protected String getPersistenceUnitName() {
}
/**
- * The default value is "false" so that the filter may re-bind the opened
+ * Returns "false" so that the filter may re-bind the opened
* {@code EntityManager} to each asynchronously dispatched thread and postpone
* closing it until the very last asynchronous dispatch.
*/
@@ -135,6 +135,15 @@ protected boolean shouldNotFilterAsyncDispatch() {
return false;
}
+ /**
+ * Returns "false" so that the filter may provide an {@code EntityManager}
+ * to each error dispatches.
+ */
+ @Override
+ protected boolean shouldNotFilterErrorDispatch() {
+ return false;
+ }
+
@Override
protected void doFilterInternal(
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -144,14 +153,14 @@ protected void doFilterInternal(
boolean participate = false;
WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
- boolean isFirstRequest = !asyncManager.hasConcurrentResult();
String key = getAlreadyFilteredAttributeName();
if (TransactionSynchronizationManager.hasResource(emf)) {
// Do not modify the EntityManager: just set the participate flag.
participate = true;
}
else {
+ boolean isFirstRequest = !isAsyncDispatch(request);
if (isFirstRequest || !applyEntityManagerBindingInterceptor(asyncManager, key)) {
logger.debug("Opening JPA EntityManager in OpenEntityManagerInViewFilter");
try {
@@ -175,7 +184,7 @@ protected void doFilterInternal(
if (!participate) {
EntityManagerHolder emHolder = (EntityManagerHolder)
TransactionSynchronizationManager.unbindResource(emf);
- if (!asyncManager.isConcurrentHandlingStarted()) {
+ if (!isAsyncStarted(request)) {
logger.debug("Closing JPA EntityManager in OpenEntityManagerInViewFilter");
EntityManagerFactoryUtils.closeEntityManager(emHolder.getEntityManager());
} | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java | @@ -32,8 +32,6 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.async.WebAsyncManager;
-import org.springframework.web.context.request.async.WebAsyncUtils;
import org.springframework.web.util.WebUtils;
/**
@@ -200,8 +198,7 @@ protected boolean shouldNotFilterAsyncDispatch() {
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
- WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
- boolean isFirstRequest = !asyncManager.hasConcurrentResult();
+ boolean isFirstRequest = !isAsyncDispatch(request);
if (isIncludePayload()) {
if (isFirstRequest) {
@@ -216,7 +213,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
filterChain.doFilter(request, response);
}
finally {
- if (!asyncManager.isConcurrentHandlingStarted()) {
+ if (!isAsyncStarted(request)) {
afterRequest(request, getAfterMessage(request));
}
} | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java | @@ -27,21 +27,39 @@
import org.springframework.web.context.request.async.WebAsyncManager;
import org.springframework.web.context.request.async.WebAsyncUtils;
+import org.springframework.web.util.WebUtils;
/**
- * Filter base class that guarantees to be just executed once per request,
- * on any servlet container. It provides a {@link #doFilterInternal}
+ * Filter base class that aims to guarantee a single execution per request
+ * dispatch, on any servlet container. It provides a {@link #doFilterInternal}
* method with HttpServletRequest and HttpServletResponse arguments.
*
- * <p>In an async scenario a filter may be invoked again in additional threads
- * as part of an {@linkplain javax.servlet.DispatcherType.ASYNC ASYNC} dispatch.
- * Sub-classes may decide whether to be invoked once per request or once per
- * request thread for as long as the same request is being processed.
- * See {@link #shouldNotFilterAsyncDispatch()}.
+ * <p>As of Servlet 3.0, a filter may be invoked as part of a
+ * {@link javax.servlet.DispatcherType.REQUEST REQUEST} or
+ * {@link javax.servlet.DispatcherType.ASYNC ASYNC} dispatches that occur in
+ * separate threads. A filter can be configured in {@code web.xml} whether it
+ * should be involved in async dispatches. However, in some cases servlet
+ * containers assume different default configuration. Therefore sub-classes can
+ * override the method {@link #shouldNotFilterAsyncDispatch()} to declare
+ * statically if they shouuld indeed be invoked, <em>once</em>, during both types
+ * of dispatches in order to provide thread initialization, logging, security,
+ * and so on. This mechanism complements and does not replace the need to
+ * configure a filter in {@code web.xml} with dispatcher types.
*
- * <p>The {@link #getAlreadyFilteredAttributeName} method determines how
- * to identify that a request is already filtered. The default implementation
- * is based on the configured name of the concrete filter instance.
+ * <p>Sub-classes may use {@link #isAsyncDispatch(HttpServletRequest)} to
+ * determine when a filter is invoked as part of an async dispatch, and
+ * use {@link #isAsyncStarted(HttpServletRequest)} to determine when the
+ * request has been placed in async mode and therefore the current dispatch
+ * won't be the last one.
+ *
+ * <p>Yet another dispatch type that also occurs in its own thread is
+ * {@link javax.servlet.DispatcherType.ERROR ERROR}. Sub-classes can override
+ * {@link #shouldNotFilterErrorDispatch()} if they wish to declare statically
+ * if they should be invoked <em>once</em> during error dispatches.
+ *
+ * <p>The {@link #getAlreadyFilteredAttributeName} method determines how to
+ * identify that a request is already filtered. The default implementation is
+ * based on the configured name of the concrete filter instance.
*
* @author Juergen Hoeller
* @author Rossen Stoyanchev
@@ -74,13 +92,10 @@ public final void doFilter(ServletRequest request, ServletResponse response, Fil
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletResponse httpResponse = (HttpServletResponse) response;
- WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
- boolean processAsyncDispatch = asyncManager.hasConcurrentResult() && !shouldNotFilterAsyncDispatch();
-
String alreadyFilteredAttributeName = getAlreadyFilteredAttributeName();
boolean hasAlreadyFilteredAttribute = request.getAttribute(alreadyFilteredAttributeName) != null;
- if ((hasAlreadyFilteredAttribute && (!processAsyncDispatch)) || shouldNotFilter(httpRequest)) {
+ if (hasAlreadyFilteredAttribute || skipDispatch(httpRequest) || shouldNotFilter(httpRequest)) {
// Proceed without invoking this filter...
filterChain.doFilter(request, response);
@@ -92,14 +107,46 @@ public final void doFilter(ServletRequest request, ServletResponse response, Fil
doFilterInternal(httpRequest, httpResponse, filterChain);
}
finally {
- if (!asyncManager.isConcurrentHandlingStarted()) {
- // Remove the "already filtered" request attribute for this request.
- request.removeAttribute(alreadyFilteredAttributeName);
- }
+ // Remove the "already filtered" request attribute for this request.
+ request.removeAttribute(alreadyFilteredAttributeName);
}
}
}
+ private boolean skipDispatch(HttpServletRequest request) {
+ if (isAsyncDispatch(request) && shouldNotFilterAsyncDispatch()) {
+ return true;
+ }
+ if ((request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE) != null) && shouldNotFilterErrorDispatch()) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * The dispatcher type {@code javax.servlet.DispatcherType.ASYNC} introduced
+ * in Servlet 3.0 means a filter can be invoked in more than one thread over
+ * the course of a single request. This method returns {@code true} if the
+ * filter is currently executing within an asynchronous dispatch.
+ *
+ * @param request the current request
+ * @see WebAsyncManager#hasConcurrentResult()
+ */
+ protected boolean isAsyncDispatch(HttpServletRequest request) {
+ return WebAsyncUtils.getAsyncManager(request).hasConcurrentResult();
+ }
+
+ /**
+ * Whether request processing is in asynchronous mode meaning that the
+ * response will not be committed after the current thread is exited.
+ *
+ * @param request the current request
+ * @see WebAsyncManager#isConcurrentHandlingStarted()
+ */
+ protected boolean isAsyncStarted(HttpServletRequest request) {
+ return WebAsyncUtils.getAsyncManager(request).isConcurrentHandlingStarted();
+ }
+
/**
* Return the name of the request attribute that identifies that a request
* is already filtered.
@@ -130,18 +177,18 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
}
/**
- * Whether to filter async dispatches, which occur in a different thread.
* The dispatcher type {@code javax.servlet.DispatcherType.ASYNC} introduced
- * in Servlet 3.0 means a filter can be invoked in more than one thread (and
- * exited) over the course of a single request. Some filters only need to
- * filter the initial thread (e.g. request wrapping) while others may need
+ * in Servlet 3.0 means a filter can be invoked in more than one thread
+ * over the course of a single request. Some filters only need to filter
+ * the initial thread (e.g. request wrapping) while others may need
* to be invoked at least once in each additional thread for example for
* setting up thread locals or to perform final processing at the very end.
* <p>Note that although a filter can be mapped to handle specific dispatcher
* types via {@code web.xml} or in Java through the {@code ServletContext},
* servlet containers may enforce different defaults with regards to
* dispatcher types. This flag enforces the design intent of the filter.
- * <p>The default setting is "true", which means the filter will not be
+ *
+ * <p>The default return value is "true", which means the filter will not be
* invoked during subsequent async dispatches. If "false", the filter will
* be invoked during async dispatches with the same guarantees of being
* invoked only once during a request within a single thread.
@@ -150,6 +197,16 @@ protected boolean shouldNotFilterAsyncDispatch() {
return true;
}
+ /**
+ * Whether to filter error dispatches such as when the servlet container
+ * processes and error mapped in {@code web.xml}. The default return value
+ * is "true", which means the filter will not be invoked in case of an error
+ * dispatch.
+ */
+ protected boolean shouldNotFilterErrorDispatch() {
+ return true;
+ }
+
/**
* Same contract as for <code>doFilter</code>, but guaranteed to be
* just invoked once per request within a single request thread. | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java | @@ -69,16 +69,24 @@ public void setThreadContextInheritable(boolean threadContextInheritable) {
this.threadContextInheritable = threadContextInheritable;
}
-
/**
- * The default value is "false" in which case the filter will set up the request
- * context in each asynchronously dispatched thread.
+ * Returns "false" so that the filter may set up the request context in each
+ * asynchronously dispatched thread.
*/
@Override
protected boolean shouldNotFilterAsyncDispatch() {
return false;
}
+ /**
+ * Returns "false" so that the filter may set up the request context in an
+ * error dispatch.
+ */
+ @Override
+ protected boolean shouldNotFilterErrorDispatch() {
+ return false;
+ }
+
@Override
protected void doFilterInternal(
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java | @@ -68,16 +68,13 @@ protected boolean shouldNotFilterAsyncDispatch() {
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
- WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
- boolean isFirstRequest = !asyncManager.hasConcurrentResult();
-
- if (isFirstRequest) {
+ if (!isAsyncDispatch(request)) {
response = new ShallowEtagResponseWrapper(response);
}
filterChain.doFilter(request, response);
- if (!asyncManager.isConcurrentHandlingStarted()) {
+ if (!isAsyncStarted(request)) {
updateResponse(request, response);
}
} | true |
Other | spring-projects | spring-framework | 5d04ef4c4acbd3ce35161ce3c500163ee8729abe.json | Support selective filtering of error dispatches
OncePerRequestFilter now allows sub-classes to choose whether they
should ever get involved in processing an error dispatch.
Issue: SPR-9895 | spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java | @@ -34,6 +34,7 @@
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.request.async.WebAsyncUtils;
+import org.springframework.web.util.WebUtils;
/**
* @author Rick Evans
@@ -50,6 +51,7 @@ public void testForceAlwaysSetsEncoding() throws Exception {
HttpServletRequest request = createMock(HttpServletRequest.class);
addAsyncManagerExpectations(request);
request.setCharacterEncoding(ENCODING);
+ expect(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).andReturn(null);
expect(request.getAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX)).andReturn(null);
request.setAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, Boolean.TRUE);
request.removeAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX);
@@ -79,6 +81,7 @@ public void testEncodingIfEmptyAndNotForced() throws Exception {
addAsyncManagerExpectations(request);
expect(request.getCharacterEncoding()).andReturn(null);
request.setCharacterEncoding(ENCODING);
+ expect(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).andReturn(null);
expect(request.getAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX)).andReturn(null);
request.setAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, Boolean.TRUE);
request.removeAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX);
@@ -104,6 +107,7 @@ public void testDoesNowtIfEncodingIsNotEmptyAndNotForced() throws Exception {
HttpServletRequest request = createMock(HttpServletRequest.class);
addAsyncManagerExpectations(request);
expect(request.getCharacterEncoding()).andReturn(ENCODING);
+ expect(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).andReturn(null);
expect(request.getAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX)).andReturn(null);
request.setAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, Boolean.TRUE);
request.removeAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX);
@@ -129,6 +133,7 @@ public void testWithBeanInitialization() throws Exception {
addAsyncManagerExpectations(request);
expect(request.getCharacterEncoding()).andReturn(null);
request.setCharacterEncoding(ENCODING);
+ expect(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).andReturn(null);
expect(request.getAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX)).andReturn(null);
request.setAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, Boolean.TRUE);
request.removeAttribute(FILTER_NAME + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX);
@@ -155,6 +160,7 @@ public void testWithIncompleteInitialization() throws Exception {
addAsyncManagerExpectations(request);
expect(request.getCharacterEncoding()).andReturn(null);
request.setCharacterEncoding(ENCODING);
+ expect(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).andReturn(null);
expect(request.getAttribute(CharacterEncodingFilter.class.getName() + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX)).andReturn(null);
request.setAttribute(CharacterEncodingFilter.class.getName() + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, Boolean.TRUE);
request.removeAttribute(CharacterEncodingFilter.class.getName() + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX); | true |
Other | spring-projects | spring-framework | c79c4c6e253d97399e118c3f08b2e032df94f3f4.json | Fix typos and suppress warnings in JdbcTemplate | spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -134,8 +134,8 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
/**
* If this variable is set to true then all results from a stored procedure call
* that don't have a corresponding SqlOutParameter declaration will be bypassed.
- * All other results processng will be take place unless the variable
- * <code>skipResultsProcessing</code> is set to <code>true</code>
+ * All other results processing will be take place unless the variable
+ * <code>skipResultsProcessing</code> is set to <code>true</code>.
*/
private boolean skipUndeclaredResults = false;
@@ -274,9 +274,9 @@ public int getQueryTimeout() {
}
/**
- * Set whether results processing should be skipped. Can be used to optimize callable
+ * Set whether results processing should be skipped. Can be used to optimize callable
* statement processing when we know that no results are being passed back - the processing
- * of out parameter will still take place. This can be used to avoid a bug in some older
+ * of out parameter will still take place. This can be used to avoid a bug in some older
* Oracle JDBC drivers like 10.1.0.2.
*/
public void setSkipResultsProcessing(boolean skipResultsProcessing) {
@@ -291,7 +291,7 @@ public boolean isSkipResultsProcessing() {
}
/**
- * Set whether undelared results should be skipped.
+ * Set whether undeclared results should be skipped.
*/
public void setSkipUndeclaredResults(boolean skipUndeclaredResults) {
this.skipUndeclaredResults = skipUndeclaredResults;
@@ -1083,9 +1083,10 @@ public Map<String, Object> doInCallableStatement(CallableStatement cs) throws SQ
* Extract returned ResultSets from the completed stored procedure.
* @param cs JDBC wrapper for the stored procedure
* @param updateCountParameters Parameter list of declared update count parameters for the stored procedure
- * @param resultSetParameters Parameter list of declared resturn resultSet parameters for the stored procedure
+ * @param resultSetParameters Parameter list of declared resultSet parameters for the stored procedure
* @return Map that contains returned results
*/
+ @SuppressWarnings("rawtypes")
protected Map<String, Object> extractReturnedResults(
CallableStatement cs, List updateCountParameters, List resultSetParameters, int updateCount)
throws SQLException {
@@ -1189,7 +1190,7 @@ protected Map<String, Object> extractOutputParameters(CallableStatement cs, List
* @param param the corresponding stored procedure parameter
* @return Map that contains returned results
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected Map<String, Object> processResultSet(ResultSet rs, ResultSetSupportingSqlParameter param) throws SQLException {
if (rs == null) {
return Collections.emptyMap();
@@ -1286,7 +1287,7 @@ protected void applyStatementSettings(Statement stmt) throws SQLException {
/**
* Create a new ArgPreparedStatementSetter using the args passed in. This method allows the
* creation to be overridden by sub-classes.
- * @param args object array woth arguments
+ * @param args object array with arguments
* @return the new PreparedStatementSetter
*/
protected PreparedStatementSetter newArgPreparedStatementSetter(Object[] args) {
@@ -1296,7 +1297,7 @@ protected PreparedStatementSetter newArgPreparedStatementSetter(Object[] args) {
/**
* Create a new ArgTypePreparedStatementSetter using the args and argTypes passed in.
* This method allows the creation to be overridden by sub-classes.
- * @param args object array woth arguments
+ * @param args object array with arguments
* @param argTypes int array of SQLTypes for arguments
* @return the new PreparedStatementSetter
*/
@@ -1368,6 +1369,7 @@ public CloseSuppressingInvocationHandler(Connection target) {
this.target = target;
}
+ @SuppressWarnings("rawtypes")
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
// Invocation on ConnectionProxy interface coming in...
| false |
Other | spring-projects | spring-framework | 461d99af29e8c358ff80ff9ff58a8ea63fe7b670.json | Fix package cycles in spring-test
Code introduced in conjunction with SPR-5243 introduced package cycles
between the ~.test.context and ~.test.context.web packages. This was
caused by the fact that ContextLoaderUtils worked directly with the
@WebAppConfiguration and WebMergedContextConfiguration types.
To address this, the following methods have been introduced in
ContextLoaderUtils. These methods use reflection to circumvent hard
dependencies on the @WebAppConfiguration and
WebMergedContextConfiguration types.
- loadWebAppConfigurationClass()
- buildWebMergedContextConfiguration()
Issue: SPR-9924 | spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java | @@ -19,6 +19,8 @@
import static org.springframework.beans.BeanUtils.*;
import static org.springframework.core.annotation.AnnotationUtils.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -27,10 +29,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.context.web.WebMergedContextConfiguration;
+import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
@@ -57,6 +59,9 @@ abstract class ContextLoaderUtils {
private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME = "org.springframework.test.context.support.DelegatingSmartContextLoader";
private static final String DEFAULT_WEB_CONTEXT_LOADER_CLASS_NAME = "org.springframework.test.context.support.WebDelegatingSmartContextLoader";
+ private static final String WEB_APP_CONFIGURATION_CLASS_NAME = "org.springframework.test.context.web.WebAppConfiguration";
+ private static final String WEB_MERGED_CONTEXT_CONFIGURATION_CLASS_NAME = "org.springframework.test.context.web.WebMergedContextConfiguration";
+
private ContextLoaderUtils() {
/* no-op */
@@ -69,7 +74,8 @@ private ContextLoaderUtils() {
*
* <p>If the supplied <code>defaultContextLoaderClassName</code> is
* {@code null} or <em>empty</em>, depending on the absence or presence
- * of @{@link WebAppConfiguration} either {@value #DEFAULT_CONTEXT_LOADER_CLASS_NAME}
+ * of {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}
+ * either {@value #DEFAULT_CONTEXT_LOADER_CLASS_NAME}
* or {@value #DEFAULT_WEB_CONTEXT_LOADER_CLASS_NAME} will be used as the
* default context loader class name. For details on the class resolution
* process, see {@link #resolveContextLoaderClass()}.
@@ -91,7 +97,9 @@ static ContextLoader resolveContextLoader(Class<?> testClass,
Assert.notEmpty(configAttributesList, "ContextConfigurationAttributes list must not be empty");
if (!StringUtils.hasText(defaultContextLoaderClassName)) {
- defaultContextLoaderClassName = testClass.isAnnotationPresent(WebAppConfiguration.class) ? DEFAULT_WEB_CONTEXT_LOADER_CLASS_NAME
+ Class<? extends Annotation> webAppConfigClass = loadWebAppConfigurationClass();
+ defaultContextLoaderClassName = webAppConfigClass != null
+ && testClass.isAnnotationPresent(webAppConfigClass) ? DEFAULT_WEB_CONTEXT_LOADER_CLASS_NAME
: DEFAULT_CONTEXT_LOADER_CLASS_NAME;
}
@@ -385,16 +393,82 @@ static MergedContextConfiguration buildMergedContextConfiguration(Class<?> testC
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses = resolveInitializerClasses(configAttributesList);
String[] activeProfiles = resolveActiveProfiles(testClass);
- if (testClass.isAnnotationPresent(WebAppConfiguration.class)) {
- WebAppConfiguration webAppConfig = testClass.getAnnotation(WebAppConfiguration.class);
- String resourceBasePath = webAppConfig.value();
- return new WebMergedContextConfiguration(testClass, locations, classes, initializerClasses, activeProfiles,
- resourceBasePath, contextLoader);
+ MergedContextConfiguration mergedConfig = buildWebMergedContextConfiguration(testClass, locations, classes,
+ initializerClasses, activeProfiles, contextLoader);
+
+ if (mergedConfig == null) {
+ mergedConfig = new MergedContextConfiguration(testClass, locations, classes, initializerClasses,
+ activeProfiles, contextLoader);
+ }
+
+ return mergedConfig;
+ }
+
+ /**
+ * Load the {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}
+ * class using reflection in order to avoid package cycles.
+ *
+ * @return the {@code @WebAppConfiguration} class or <code>null</code> if it
+ * cannot be loaded
+ */
+ @SuppressWarnings("unchecked")
+ private static Class<? extends Annotation> loadWebAppConfigurationClass() {
+ Class<? extends Annotation> webAppConfigClass = null;
+ try {
+ webAppConfigClass = (Class<? extends Annotation>) ClassUtils.forName(WEB_APP_CONFIGURATION_CLASS_NAME,
+ ContextLoaderUtils.class.getClassLoader());
+ }
+ catch (Throwable t) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Could not load @WebAppConfiguration class [" + WEB_APP_CONFIGURATION_CLASS_NAME + "].", t);
+ }
+ }
+ return webAppConfigClass;
+ }
+
+ /**
+ * Attempt to build a {@link org.springframework.test.context.web.WebMergedContextConfiguration
+ * WebMergedContextConfiguration} from the supplied arguments using reflection
+ * in order to avoid package cycles.
+ *
+ * @return the {@code WebMergedContextConfiguration} or <code>null</code> if
+ * it could not be built
+ */
+ @SuppressWarnings("unchecked")
+ private static MergedContextConfiguration buildWebMergedContextConfiguration(
+ Class<?> testClass,
+ String[] locations,
+ Class<?>[] classes,
+ Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses,
+ String[] activeProfiles, ContextLoader contextLoader) {
+
+ Class<? extends Annotation> webAppConfigClass = loadWebAppConfigurationClass();
+
+ if (webAppConfigClass != null && testClass.isAnnotationPresent(webAppConfigClass)) {
+ Annotation annotation = testClass.getAnnotation(webAppConfigClass);
+ String resourceBasePath = (String) AnnotationUtils.getValue(annotation);
+
+ try {
+ Class<? extends MergedContextConfiguration> webMergedConfigClass = (Class<? extends MergedContextConfiguration>) ClassUtils.forName(
+ WEB_MERGED_CONTEXT_CONFIGURATION_CLASS_NAME, ContextLoaderUtils.class.getClassLoader());
+
+ Constructor<? extends MergedContextConfiguration> constructor = ClassUtils.getConstructorIfAvailable(
+ webMergedConfigClass, Class.class, String[].class, Class[].class, Set.class, String[].class,
+ String.class, ContextLoader.class);
+
+ if (constructor != null) {
+ return instantiateClass(constructor, testClass, locations, classes, initializerClasses,
+ activeProfiles, resourceBasePath, contextLoader);
+ }
+ }
+ catch (Throwable t) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Could not instantiate [" + WEB_MERGED_CONTEXT_CONFIGURATION_CLASS_NAME + "].", t);
+ }
+ }
}
- // else
- return new MergedContextConfiguration(testClass, locations, classes, initializerClasses, activeProfiles,
- contextLoader);
+ return null;
}
} | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.