();
+ jp.nextToken();
+ String nextFieldName = jp.getCurrentName();
+ while (!nextFieldName.equals(ROWS_FIELD_NAME)) {
+ jp.nextToken();
+ map.put(nextFieldName, Integer.valueOf(jp.getIntValue()));
+ jp.nextToken();
+ nextFieldName = jp.getCurrentName();
+ }
+ return map;
+ }
+
+ @Override
+ protected void writeInternal(Object o, HttpOutputMessage outputMessage)
+ throws IOException, HttpMessageNotWritableException {
+
+ JsonEncoding encoding = getEncoding(outputMessage.getHeaders()
+ .getContentType());
+ JsonGenerator jsonGenerator = this.objectMapper.getJsonFactory()
+ .createJsonGenerator(outputMessage.getBody(), encoding);
+ try {
+ if (this.prefixJson) {
+ jsonGenerator.writeRaw("{} && ");
+ }
+ this.objectMapper.writeValue(jsonGenerator, o);
+ } catch (JsonGenerationException ex) {
+ throw new HttpMessageNotWritableException("Could not write JSON: "
+ + ex.getMessage(), ex);
+ }
+ }
+
+ private JsonEncoding getEncoding(MediaType contentType) {
+ if (contentType != null && contentType.getCharSet() != null) {
+ Charset charset = contentType.getCharSet();
+ for (JsonEncoding encoding : JsonEncoding.values()) {
+ if (charset.name().equals(encoding.getJavaName())) {
+ return encoding;
+ }
+ }
+ }
+ return JsonEncoding.UTF8;
+ }
+
+ private static class ParseState {
+ boolean inRow;
+ String docFieldName = "";
+ }
}
diff --git a/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/AbstractMonitor.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/AbstractMonitor.java
index fc9d66c90..67e03ae41 100644
--- a/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/AbstractMonitor.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/AbstractMonitor.java
@@ -15,32 +15,27 @@
*/
package org.springframework.data.document.couchdb.monitor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.web.client.RestTemplate;
/**
* Base class to encapsulate common configuration settings when connecting to a CouchDB database
- *
- * @author Mark Pollack
*
+ * @author Mark Pollack
*/
public abstract class AbstractMonitor {
-
- protected RestTemplate restTemplate;
- protected String databaseUrl;
-
- /**
- * Gets the databaseUrl used to connect to CouchDB
- * @return
- */
- public String getDatabaseUrl() {
- return this.databaseUrl;
- }
-
+ protected RestTemplate restTemplate;
+ protected String databaseUrl;
+
+ /**
+ * Gets the databaseUrl used to connect to CouchDB
+ *
+ * @return
+ */
+ public String getDatabaseUrl() {
+ return this.databaseUrl;
+ }
-
}
diff --git a/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/ServerInfo.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/ServerInfo.java
index 80159a669..d45546ab3 100644
--- a/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/ServerInfo.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/monitor/ServerInfo.java
@@ -24,40 +24,39 @@ import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.web.client.RestTemplate;
/**
- * Expose basic server information via JMX
- *
- * @author Mark Pollack
+ * Expose basic server information via JMX
*
+ * @author Mark Pollack
*/
-@ManagedResource(description="Server Information")
+@ManagedResource(description = "Server Information")
public class ServerInfo extends AbstractMonitor {
-
-
- public ServerInfo(String databaseUrl) {
- this.databaseUrl = databaseUrl;
- this.restTemplate = new RestTemplate();
- }
-
-
- @ManagedOperation(description="Server host name")
- public String getHostName() throws UnknownHostException {
- return InetAddress.getLocalHost().getHostName();
- }
- @ManagedOperation(description="CouchDB Server Version")
- public String getVersion() {
- return (String) getRoot().get("version");
- }
-
- @ManagedOperation(description="Message of the day")
- public String getMotd() {
- return (String) getRoot().get("greeting");
- }
-
- public Map getRoot() {
- Map map = restTemplate.getForObject(getDatabaseUrl(),Map.class);
- return map;
- }
+ public ServerInfo(String databaseUrl) {
+ this.databaseUrl = databaseUrl;
+ this.restTemplate = new RestTemplate();
+ }
+
+
+ @ManagedOperation(description = "Server host name")
+ public String getHostName() throws UnknownHostException {
+ return InetAddress.getLocalHost().getHostName();
+ }
+
+
+ @ManagedOperation(description = "CouchDB Server Version")
+ public String getVersion() {
+ return (String) getRoot().get("version");
+ }
+
+ @ManagedOperation(description = "Message of the day")
+ public String getMotd() {
+ return (String) getRoot().get("greeting");
+ }
+
+ public Map getRoot() {
+ Map map = restTemplate.getForObject(getDatabaseUrl(), Map.class);
+ return map;
+ }
}
diff --git a/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/support/CouchUtils.java b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/support/CouchUtils.java
index 823454ca9..fb42d6486 100644
--- a/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/support/CouchUtils.java
+++ b/spring-data-couchdb/src/main/java/org/springframework/data/document/couchdb/support/CouchUtils.java
@@ -17,11 +17,10 @@
package org.springframework.data.document.couchdb.support;
import org.springframework.dao.DataAccessException;
-import org.springframework.data.document.UncategorizedDocumentStoreException;
/**
* Helper class featuring helper methods for internal CouchDB classes.
- *
+ *
* Mainly intended for internal use within the framework.
*
* @author Thomas Risberg
@@ -30,49 +29,53 @@ import org.springframework.data.document.UncategorizedDocumentStoreException;
*/
public abstract class CouchUtils {
- /**
- * Convert the given runtime exception to an appropriate exception from the
- * org.springframework.dao hierarchy.
- * Return null if no translation is appropriate: any other exception may
- * have resulted from user code, and should not be translated.
- * @param ex runtime exception that occurred
- * @return the corresponding DataAccessException instance,
- * or null if the exception should not be translated
- */
- public static DataAccessException translateCouchExceptionIfPossible(RuntimeException ex) {
+ /**
+ * Convert the given runtime exception to an appropriate exception from the
+ * org.springframework.dao hierarchy.
+ * Return null if no translation is appropriate: any other exception may
+ * have resulted from user code, and should not be translated.
+ *
+ * @param ex runtime exception that occurred
+ * @return the corresponding DataAccessException instance,
+ * or null if the exception should not be translated
+ */
+ public static DataAccessException translateCouchExceptionIfPossible(RuntimeException ex) {
- return null;
- }
-
- /**
- * Adds an id variable to a URL
- * @param url the URL to modify
- * @return the modified URL
- */
- public static String addId(String url) {
- return ensureTrailingSlash(url) + "{id}";
- }
-
-
- /**
- * Adds a 'changes since' variable to a URL
- * @param url
- * @return
- */
- public static String addChangesSince(String url) {
- return ensureTrailingSlash(url) + "_changes?since={seq}";
- }
-
- /**
- * Ensures that a URL ends with a slash.
- * @param url the URL to modify
- * @return the modified URL
- */
- public static String ensureTrailingSlash(String url) {
- if (!url.endsWith("/")) {
- url += "/";
- }
- return url;
+ return null;
+ }
+
+ /**
+ * Adds an id variable to a URL
+ *
+ * @param url the URL to modify
+ * @return the modified URL
+ */
+ public static String addId(String url) {
+ return ensureTrailingSlash(url) + "{id}";
+ }
+
+
+ /**
+ * Adds a 'changes since' variable to a URL
+ *
+ * @param url
+ * @return
+ */
+ public static String addChangesSince(String url) {
+ return ensureTrailingSlash(url) + "_changes?since={seq}";
+ }
+
+ /**
+ * Ensures that a URL ends with a slash.
+ *
+ * @param url the URL to modify
+ * @return the modified URL
+ */
+ public static String ensureTrailingSlash(String url) {
+ if (!url.endsWith("/")) {
+ url += "/";
}
+ return url;
+ }
}
diff --git a/spring-data-couchdb/src/main/resources/org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd b/spring-data-couchdb/src/main/resources/org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd
index d4e21345b..ccf257511 100644
--- a/spring-data-couchdb/src/main/resources/org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd
+++ b/spring-data-couchdb/src/main/resources/org/springframework/data/document/couchdb/config/spring-couch-1.0.xsd
@@ -1,33 +1,33 @@
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:tool="http://www.springframework.org/schema/tool"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:repository="http://www.springframework.org/schema/data/repository"
+ targetNamespace="http://www.springframework.org/schema/data/couch"
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/DummyDocument.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/DummyDocument.java
index d43677696..43368f470 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/DummyDocument.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/DummyDocument.java
@@ -16,62 +16,62 @@
package org.springframework.data.document.couchdb;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-
import java.util.Date;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
/**
* @author Tareq Abedrabbo (tareq.abedrabbo@opencredo.com)
* @since 13/01/2011
*/
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
public class DummyDocument {
- private String message;
+ private String message;
- private String timestamp = new Date().toString();
+ private String timestamp = new Date().toString();
- public DummyDocument() {
- }
+ public DummyDocument() {
+ }
- public DummyDocument(String message) {
- this.message = message;
- }
+ public DummyDocument(String message) {
+ this.message = message;
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
- public String getTimestamp() {
- return timestamp;
- }
+ public String getTimestamp() {
+ return timestamp;
+ }
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
- DummyDocument document = (DummyDocument) o;
+ DummyDocument document = (DummyDocument) o;
- if (message != null ? !message.equals(document.message) : document.message != null) return false;
+ if (message != null ? !message.equals(document.message) : document.message != null) return false;
- return true;
- }
+ return true;
+ }
- @Override
- public int hashCode() {
- return message != null ? message.hashCode() : 0;
- }
+ @Override
+ public int hashCode() {
+ return message != null ? message.hashCode() : 0;
+ }
- @Override
- public String toString() {
- return "DummyDocument{" +
- "message='" + message + '\'' +
- ", timestamp=" + timestamp +
- '}';
- }
+ @Override
+ public String toString() {
+ return "DummyDocument{" +
+ "message='" + message + '\'' +
+ ", timestamp=" + timestamp +
+ '}';
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/IsBodyEqual.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/IsBodyEqual.java
index 8f690bcc2..bb43591ab 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/IsBodyEqual.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/IsBodyEqual.java
@@ -24,28 +24,29 @@ import org.springframework.http.HttpEntity;
/**
* Matches the content of the body of an HttpEntity.
+ *
* @author Tareq Abedrabbo
* @since 31/01/2011
*/
public class IsBodyEqual extends TypeSafeMatcher {
- private Object object;
+ private Object object;
- public IsBodyEqual(Object object) {
- this.object = object;
- }
+ public IsBodyEqual(Object object) {
+ this.object = object;
+ }
- @Override
- public boolean matchesSafely(HttpEntity httpEntity) {
- return httpEntity.getBody().equals(object);
- }
+ @Override
+ public boolean matchesSafely(HttpEntity httpEntity) {
+ return httpEntity.getBody().equals(object);
+ }
- public void describeTo(Description description) {
- description.appendText("body equals ").appendValue(object);
- }
+ public void describeTo(Description description) {
+ description.appendText("body equals ").appendValue(object);
+ }
- @Factory
- public static Matcher bodyEqual(Object object) {
- return new IsBodyEqual(object);
- }
+ @Factory
+ public static Matcher bodyEqual(Object object) {
+ return new IsBodyEqual(object);
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/admin/CouchAdminIntegrationTests.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/admin/CouchAdminIntegrationTests.java
index 93c13de54..31d603083 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/admin/CouchAdminIntegrationTests.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/admin/CouchAdminIntegrationTests.java
@@ -18,22 +18,21 @@ package org.springframework.data.document.couchdb.admin;
import java.util.List;
import junit.framework.Assert;
-
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.document.couchdb.core.CouchConstants;
public class CouchAdminIntegrationTests {
- @Test
- @Ignore("until CI has couch server running")
- public void dbLifecycle() {
-
- CouchAdmin admin = new CouchAdmin(CouchConstants.COUCHDB_URL);
- admin.deleteDatabase("foo");
- List dbs = admin.listDatabases();
- admin.createDatabase("foo");
- List newDbs = admin.listDatabases();
- Assert.assertEquals(dbs.size()+1, newDbs.size());
- }
+ @Test
+ @Ignore("until CI has couch server running")
+ public void dbLifecycle() {
+
+ CouchAdmin admin = new CouchAdmin(CouchConstants.COUCHDB_URL);
+ admin.deleteDatabase("foo");
+ List dbs = admin.listDatabases();
+ admin.createDatabase("foo");
+ List newDbs = admin.listDatabases();
+ Assert.assertEquals(dbs.size() + 1, newDbs.size());
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/AbstractCouchTemplateIntegrationTests.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/AbstractCouchTemplateIntegrationTests.java
index 98fa48750..7d114e307 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/AbstractCouchTemplateIntegrationTests.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/AbstractCouchTemplateIntegrationTests.java
@@ -16,28 +16,22 @@
package org.springframework.data.document.couchdb.core;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
+import static org.junit.Assume.assumeNoException;
+import static org.junit.Assume.assumeTrue;
+import static org.springframework.http.HttpStatus.OK;
import java.io.IOException;
import java.util.UUID;
-import static org.junit.Assume.assumeNoException;
-import static org.junit.Assume.assumeTrue;
-import static org.springframework.http.HttpStatus.OK;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.springframework.http.*;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
/**
* Base class for CouchDB integration tests. Checks whether CouchDB is available before running each test,
@@ -50,75 +44,75 @@ import static org.springframework.http.HttpStatus.OK;
public abstract class AbstractCouchTemplateIntegrationTests {
- protected static final Log log = LogFactory.getLog(AbstractCouchTemplateIntegrationTests.class);
+ protected static final Log log = LogFactory.getLog(AbstractCouchTemplateIntegrationTests.class);
- protected static final RestTemplate restTemplate = new RestTemplate();
+ protected static final RestTemplate restTemplate = new RestTemplate();
- /**
- * This methods ensures that the database is running. Otherwise, the test is ignored.
- */
- @BeforeClass
- public static void assumeDatabaseIsUpAndRunning() {
- try {
- ResponseEntity responseEntity = restTemplate.getForEntity(CouchConstants.COUCHDB_URL, String.class);
- assumeTrue(responseEntity.getStatusCode().equals(OK));
- log.debug("CouchDB is running on " + CouchConstants.COUCHDB_URL +
- " with status " + responseEntity.getStatusCode());
- } catch (RestClientException e) {
- log.debug("CouchDB is not running on " + CouchConstants.COUCHDB_URL);
- assumeNoException(e);
- }
+ /**
+ * This methods ensures that the database is running. Otherwise, the test is ignored.
+ */
+ @BeforeClass
+ public static void assumeDatabaseIsUpAndRunning() {
+ try {
+ ResponseEntity responseEntity = restTemplate.getForEntity(CouchConstants.COUCHDB_URL, String.class);
+ assumeTrue(responseEntity.getStatusCode().equals(OK));
+ log.debug("CouchDB is running on " + CouchConstants.COUCHDB_URL +
+ " with status " + responseEntity.getStatusCode());
+ } catch (RestClientException e) {
+ log.debug("CouchDB is not running on " + CouchConstants.COUCHDB_URL);
+ assumeNoException(e);
}
+ }
- @Before
- public void setUpTestDatabase() throws Exception {
- RestTemplate template = new RestTemplate();
- template.setErrorHandler(new DefaultResponseErrorHandler(){
- @Override
- public void handleError(ClientHttpResponse response) throws IOException {
- // do nothing, error status will be handled in the switch statement
- }
- });
- ResponseEntity response = template.getForEntity(CouchConstants.TEST_DATABASE_URL, String.class);
- HttpStatus statusCode = response.getStatusCode();
- switch (statusCode) {
- case NOT_FOUND:
- createNewTestDatabase();
- break;
- case OK:
- deleteExisitingTestDatabase();
- createNewTestDatabase();
- break;
- default:
- throw new IllegalStateException("Unsupported http status [" + statusCode + "]");
- }
+ @Before
+ public void setUpTestDatabase() throws Exception {
+ RestTemplate template = new RestTemplate();
+ template.setErrorHandler(new DefaultResponseErrorHandler() {
+ @Override
+ public void handleError(ClientHttpResponse response) throws IOException {
+ // do nothing, error status will be handled in the switch statement
+ }
+ });
+ ResponseEntity response = template.getForEntity(CouchConstants.TEST_DATABASE_URL, String.class);
+ HttpStatus statusCode = response.getStatusCode();
+ switch (statusCode) {
+ case NOT_FOUND:
+ createNewTestDatabase();
+ break;
+ case OK:
+ deleteExisitingTestDatabase();
+ createNewTestDatabase();
+ break;
+ default:
+ throw new IllegalStateException("Unsupported http status [" + statusCode + "]");
}
+ }
- private void deleteExisitingTestDatabase() {
- restTemplate.delete(CouchConstants.TEST_DATABASE_URL);
- }
+ private void deleteExisitingTestDatabase() {
+ restTemplate.delete(CouchConstants.TEST_DATABASE_URL);
+ }
- private void createNewTestDatabase() {
- restTemplate.put(CouchConstants.TEST_DATABASE_URL, null);
- }
+ private void createNewTestDatabase() {
+ restTemplate.put(CouchConstants.TEST_DATABASE_URL, null);
+ }
- /**
- * Reads a CouchDB document and converts it to the expected type.
- */
- protected T getDocument(String id, Class expectedType) {
- String url = CouchConstants.TEST_DATABASE_URL + "{id}";
- return restTemplate.getForObject(url, expectedType, id);
- }
+ /**
+ * Reads a CouchDB document and converts it to the expected type.
+ */
+ protected T getDocument(String id, Class expectedType) {
+ String url = CouchConstants.TEST_DATABASE_URL + "{id}";
+ return restTemplate.getForObject(url, expectedType, id);
+ }
- /**
- * Writes a CouchDB document
- */
- protected String putDocument(Object document) {
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
- HttpEntity request = new HttpEntity(document, headers);
- String id = UUID.randomUUID().toString();
- restTemplate.put(CouchConstants.TEST_DATABASE_URL + "{id}", request, id);
- return id;
- }
+ /**
+ * Writes a CouchDB document
+ */
+ protected String putDocument(Object document) {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ HttpEntity request = new HttpEntity(document, headers);
+ String id = UUID.randomUUID().toString();
+ restTemplate.put(CouchConstants.TEST_DATABASE_URL + "{id}", request, id);
+ return id;
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchConstants.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchConstants.java
index 14412b947..1ae934684 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchConstants.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchConstants.java
@@ -17,11 +17,11 @@ package org.springframework.data.document.couchdb.core;
public abstract class CouchConstants {
- public static final String COUCHDB_URL = "http://127.0.0.1:5984/";
- public static final String TEST_DATABASE_URL = COUCHDB_URL + "si_couchdb_test/";
+ public static final String COUCHDB_URL = "http://127.0.0.1:5984/";
+ public static final String TEST_DATABASE_URL = COUCHDB_URL + "si_couchdb_test/";
- public CouchConstants() {
- // TODO Auto-generated constructor stub
- }
+ public CouchConstants() {
+ // TODO Auto-generated constructor stub
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateIntegrationTests.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateIntegrationTests.java
index 893f32471..31302ea25 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateIntegrationTests.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateIntegrationTests.java
@@ -19,22 +19,21 @@ package org.springframework.data.document.couchdb.core;
import java.util.UUID;
import junit.framework.Assert;
-
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.document.couchdb.DummyDocument;
public class CouchTemplateIntegrationTests extends AbstractCouchTemplateIntegrationTests {
-
- @Test
- @Ignore("until CI has couch server running")
- public void saveAndFindTest() {
- CouchTemplate template = new CouchTemplate(CouchConstants.TEST_DATABASE_URL);
- DummyDocument document = new DummyDocument("hello");
- String id = UUID.randomUUID().toString();
- template.save(id, document);
- DummyDocument foundDocument = template.findOne(id, DummyDocument.class);
- Assert.assertEquals(document.getMessage(), foundDocument.getMessage());
- }
+
+ @Test
+ @Ignore("until CI has couch server running")
+ public void saveAndFindTest() {
+ CouchTemplate template = new CouchTemplate(CouchConstants.TEST_DATABASE_URL);
+ DummyDocument document = new DummyDocument("hello");
+ String id = UUID.randomUUID().toString();
+ template.save(id, document);
+ DummyDocument foundDocument = template.findOne(id, DummyDocument.class);
+ Assert.assertEquals(document.getMessage(), foundDocument.getMessage());
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateTests.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateTests.java
index b0163aa43..da4afe30c 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateTests.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/core/CouchTemplateTests.java
@@ -20,13 +20,11 @@ import org.junit.Test;
/**
* Unit tests for CouchTemplate with mocks
- *
- *
*/
public class CouchTemplateTests {
- @Test
- public void foo() {
-
- }
+ @Test
+ public void foo() {
+
+ }
}
diff --git a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/monitor/JmxServer.java b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/monitor/JmxServer.java
index 07cf47222..e846ea8d2 100644
--- a/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/monitor/JmxServer.java
+++ b/spring-data-couchdb/src/test/java/org/springframework/data/document/couchdb/monitor/JmxServer.java
@@ -20,17 +20,17 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* Server application to test JMX functionality.
- *
+ *
* @author Mark Pollack
*/
public class JmxServer {
- public static void main(String[] args) {
- new JmxServer().run();
- }
+ public static void main(String[] args) {
+ new JmxServer().run();
+ }
- public void run() {
- new ClassPathXmlApplicationContext(new String[] {"server-jmx.xml"} );
- }
+ public void run() {
+ new ClassPathXmlApplicationContext(new String[]{"server-jmx.xml"});
+ }
}
diff --git a/spring-data-couchdb/src/test/resources/server-jmx.xml b/spring-data-couchdb/src/test/resources/server-jmx.xml
index 30c1933fe..d5c9028d5 100644
--- a/spring-data-couchdb/src/test/resources/server-jmx.xml
+++ b/spring-data-couchdb/src/test/resources/server-jmx.xml
@@ -1,25 +1,24 @@
-
-
+
-
+
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/spring-data-document-core/.classpath b/spring-data-document-core/.classpath
deleted file mode 100644
index 6019b8317..000000000
--- a/spring-data-document-core/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/spring-data-document-core/.project b/spring-data-document-core/.project
deleted file mode 100644
index 903baba7a..000000000
--- a/spring-data-document-core/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- spring-data-document-core
-
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.maven.ide.eclipse.maven2Builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.maven.ide.eclipse.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
-
-
diff --git a/spring-data-document-core/.settings/org.eclipse.jdt.core.prefs b/spring-data-document-core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aa62685f0..000000000
--- a/spring-data-document-core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Wed Mar 09 13:51:17 EST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spring-data-document-core/.settings/org.eclipse.wst.common.component b/spring-data-document-core/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8eb900276..000000000
--- a/spring-data-document-core/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5c9bd7532..000000000
--- a/spring-data-document-core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/spring-data-document-core/.settings/org.maven.ide.eclipse.prefs b/spring-data-document-core/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5545b44b1..000000000
--- a/spring-data-document-core/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Wed Oct 06 14:49:46 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java b/spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java
index 97439420b..dfea53c99 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/AbstractDocumentStoreTemplate.java
@@ -18,16 +18,15 @@ package org.springframework.data.document;
public abstract class AbstractDocumentStoreTemplate {
-
- public abstract C getConnection();
- public T execute(DocumentStoreConnectionCallback action) {
- try {
- return action.doInConnection(getConnection());
- }
- catch (Exception e) {
- throw new UncategorizedDocumentStoreException("Failure executing using datastore connection", e);
- }
- }
-
+ public abstract C getConnection();
+
+ public T execute(DocumentStoreConnectionCallback action) {
+ try {
+ return action.doInConnection(getConnection());
+ } catch (Exception e) {
+ throw new UncategorizedDocumentStoreException("Failure executing using datastore connection", e);
+ }
+ }
+
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java
index 48cf9919b..dc50394a5 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentMapper.java
@@ -23,7 +23,7 @@ package org.springframework.data.document;
* @since 1.0
*/
public interface DocumentMapper {
-
- T mapDocument(D document);
+
+ T mapDocument(D document);
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java
index 5711adaa6..d6cb0e232 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/DocumentStoreConnectionCallback.java
@@ -18,5 +18,5 @@ package org.springframework.data.document;
public interface DocumentStoreConnectionCallback {
- T doInConnection(C con) throws Exception;
+ T doInConnection(C con) throws Exception;
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUsageException.java b/spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUsageException.java
index 205d93ef4..19eacb1c7 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUsageException.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/InvalidDocumentStoreApiUsageException.java
@@ -20,12 +20,12 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
public class InvalidDocumentStoreApiUsageException extends InvalidDataAccessApiUsageException {
- public InvalidDocumentStoreApiUsageException(String msg) {
- super(msg);
- }
+ public InvalidDocumentStoreApiUsageException(String msg) {
+ super(msg);
+ }
- public InvalidDocumentStoreApiUsageException(String msg, Throwable cause) {
- super(msg, cause);
- }
+ public InvalidDocumentStoreApiUsageException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java b/spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java
index 44ee8b879..f7fe00595 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/UncategorizedDocumentStoreException.java
@@ -20,8 +20,8 @@ import org.springframework.dao.UncategorizedDataAccessException;
public class UncategorizedDocumentStoreException extends UncategorizedDataAccessException {
- public UncategorizedDocumentStoreException(String msg, Throwable cause) {
- super(msg, cause);
- }
+ public UncategorizedDocumentStoreException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java
index 459feeaed..77c2696b8 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/ControllerCounter.java
@@ -1,45 +1,43 @@
package org.springframework.data.document.analytics;
-import java.util.Date;
import java.util.Map;
public class ControllerCounter {
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
+ public String getName() {
+ return name;
+ }
- public double getCount() {
- return count;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setCount(double count) {
- this.count = count;
- }
+ public double getCount() {
+ return count;
+ }
- public Map getMethods() {
- return methods;
- }
-
-
+ public void setCount(double count) {
+ this.count = count;
+ }
- public void setMethods(Map methods) {
- this.methods = methods;
- }
+ public Map getMethods() {
+ return methods;
+ }
- private String name;
-
- private double count;
-
- private Map methods;
-
- @Override
- public String toString() {
- return "ControllerCounter [name=" + name + ", count=" + count
- + ", methods=" + methods + "]";
- }
+
+ public void setMethods(Map methods) {
+ this.methods = methods;
+ }
+
+ private String name;
+
+ private double count;
+
+ private Map methods;
+
+ @Override
+ public String toString() {
+ return "ControllerCounter [name=" + name + ", count=" + count
+ + ", methods=" + methods + "]";
+ }
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java
index a63fe2ee6..fea3bc4e5 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/MvcEvent.java
@@ -4,81 +4,80 @@ import java.util.Date;
public class MvcEvent {
- private String controller;
-
- private String action;
-
- private Parameters parameters;
-
- private Date date;
-
- private String requestUri;
-
- private String requestAddress;
-
- private String remoteUser;
-
- private String view;
+ private String controller;
- public String getController() {
- return controller;
- }
+ private String action;
- public void setController(String controller) {
- this.controller = controller;
- }
+ private Parameters parameters;
- public String getAction() {
- return action;
- }
+ private Date date;
- public void setAction(String action) {
- this.action = action;
- }
+ private String requestUri;
- public Parameters getParameters() {
- return parameters;
- }
+ private String requestAddress;
- public void setParameters(Parameters parameters) {
- this.parameters = parameters;
- }
+ private String remoteUser;
- public Date getDate() {
- return date;
- }
+ private String view;
- public void setDate(Date date) {
- this.date = date;
- }
+ public String getController() {
+ return controller;
+ }
- public String getRequestUri() {
- return requestUri;
- }
+ public void setController(String controller) {
+ this.controller = controller;
+ }
- public void setRequestUri(String requestUri) {
- this.requestUri = requestUri;
- }
+ public String getAction() {
+ return action;
+ }
- public String getRequestAddress() {
- return requestAddress;
- }
+ public void setAction(String action) {
+ this.action = action;
+ }
- public void setRequestAddress(String requestAddress) {
- this.requestAddress = requestAddress;
- }
+ public Parameters getParameters() {
+ return parameters;
+ }
+
+ public void setParameters(Parameters parameters) {
+ this.parameters = parameters;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public String getRequestUri() {
+ return requestUri;
+ }
+
+ public void setRequestUri(String requestUri) {
+ this.requestUri = requestUri;
+ }
+
+ public String getRequestAddress() {
+ return requestAddress;
+ }
+
+ public void setRequestAddress(String requestAddress) {
+ this.requestAddress = requestAddress;
+ }
+
+ public String getRemoteUser() {
+ return remoteUser;
+ }
+
+ public void setRemoteUser(String remoteUser) {
+ this.remoteUser = remoteUser;
+ }
+
+ //TODO
+ //Map sessionAttributes
- public String getRemoteUser() {
- return remoteUser;
- }
- public void setRemoteUser(String remoteUser) {
- this.remoteUser = remoteUser;
- }
-
- //TODO
- //Map sessionAttributes
-
-
-
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java
index a8c9eaef0..0fe1a4f71 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/analytics/Parameters.java
@@ -2,34 +2,34 @@ package org.springframework.data.document.analytics;
public class Parameters {
- private String p1;
-
- private String p2;
-
- private String p3;
+ private String p1;
- public String getP1() {
- return p1;
- }
+ private String p2;
- public void setP1(String p1) {
- this.p1 = p1;
- }
+ private String p3;
- public String getP2() {
- return p2;
- }
+ public String getP1() {
+ return p1;
+ }
- public void setP2(String p2) {
- this.p2 = p2;
- }
+ public void setP1(String p1) {
+ this.p1 = p1;
+ }
- public String getP3() {
- return p3;
- }
+ public String getP2() {
+ return p2;
+ }
+
+ public void setP2(String p2) {
+ this.p2 = p2;
+ }
+
+ public String getP3() {
+ return p3;
+ }
+
+ public void setP3(String p3) {
+ this.p3 = p3;
+ }
- public void setP3(String p3) {
- this.p3 = p3;
- }
-
}
diff --git a/spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java
index a5d7c4416..0e6e4119a 100644
--- a/spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java
+++ b/spring-data-document-core/src/main/java/org/springframework/data/document/web/bind/annotation/support/HandlerMethodInvoker.java
@@ -18,67 +18,29 @@
package org.springframework.data.document.web.bind.annotation.support;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.lang.reflect.*;
+import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.BridgeMethodResolver;
-import org.springframework.core.Conventions;
-import org.springframework.core.GenericTypeResolver;
-import org.springframework.core.MethodParameter;
-import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.core.*;
import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
+import org.springframework.http.*;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.ui.ExtendedModelMap;
import org.springframework.ui.Model;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.ReflectionUtils;
+import org.springframework.util.*;
import org.springframework.validation.BindException;
import org.springframework.validation.BindingResult;
import org.springframework.validation.Errors;
import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ValueConstants;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.support.HandlerMethodInvocationException;
import org.springframework.web.bind.annotation.support.HandlerMethodResolver;
-import org.springframework.web.bind.support.DefaultSessionAttributeStore;
-import org.springframework.web.bind.support.SessionAttributeStore;
-import org.springframework.web.bind.support.SessionStatus;
-import org.springframework.web.bind.support.SimpleSessionStatus;
-import org.springframework.web.bind.support.WebArgumentResolver;
-import org.springframework.web.bind.support.WebBindingInitializer;
-import org.springframework.web.bind.support.WebRequestDataBinder;
+import org.springframework.web.bind.support.*;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.multipart.MultipartFile;
@@ -87,812 +49,773 @@ import org.springframework.web.multipart.MultipartRequest;
/**
* Support class for invoking an annotated handler method. Operates on the introspection results of a {@link
* HandlerMethodResolver} for a specific handler type.
- *
+ *
* Used by {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter} and {@link
* org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter}.
*
* @author Juergen Hoeller
* @author Arjen Poutsma
- * @since 2.5.2
* @see #invokeHandlerMethod
+ * @since 2.5.2
*/
public class HandlerMethodInvoker {
- private static final String MODEL_KEY_PREFIX_STALE = SessionAttributeStore.class.getName() + ".STALE.";
-
- /** We'll create a lot of these objects, so we don't want a new logger every time. */
- private static final Log logger = LogFactory.getLog(HandlerMethodInvoker.class);
-
- private final HandlerMethodResolver methodResolver;
-
- private final WebBindingInitializer bindingInitializer;
-
- private final SessionAttributeStore sessionAttributeStore;
-
- private final ParameterNameDiscoverer parameterNameDiscoverer;
-
- private final WebArgumentResolver[] customArgumentResolvers;
-
- private final HttpMessageConverter[] messageConverters;
-
- private final SimpleSessionStatus sessionStatus = new SimpleSessionStatus();
-
-
- public HandlerMethodInvoker(HandlerMethodResolver methodResolver) {
- this(methodResolver, null);
- }
-
- public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer) {
- this(methodResolver, bindingInitializer, new DefaultSessionAttributeStore(), null, null, null);
- }
-
- public HandlerMethodInvoker(HandlerMethodResolver methodResolver, WebBindingInitializer bindingInitializer,
- SessionAttributeStore sessionAttributeStore, ParameterNameDiscoverer parameterNameDiscoverer,
- WebArgumentResolver[] customArgumentResolvers, HttpMessageConverter[] messageConverters) {
-
- this.methodResolver = methodResolver;
- this.bindingInitializer = bindingInitializer;
- this.sessionAttributeStore = sessionAttributeStore;
- this.parameterNameDiscoverer = parameterNameDiscoverer;
- this.customArgumentResolvers = customArgumentResolvers;
- this.messageConverters = messageConverters;
- }
-
-
- public final Object invokeHandlerMethod(Method handlerMethod, Object handler,
- NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
- Method handlerMethodToInvoke = BridgeMethodResolver.findBridgedMethod(handlerMethod);
- try {
- boolean debug = logger.isDebugEnabled();
- for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
- Object attrValue = this.sessionAttributeStore.retrieveAttribute(webRequest, attrName);
- if (attrValue != null) {
- implicitModel.addAttribute(attrName, attrValue);
- }
- }
- for (Method attributeMethod : this.methodResolver.getModelAttributeMethods()) {
- Method attributeMethodToInvoke = BridgeMethodResolver.findBridgedMethod(attributeMethod);
- Object[] args = resolveHandlerArguments(attributeMethodToInvoke, handler, webRequest, implicitModel);
- if (debug) {
- logger.debug("Invoking model attribute method: " + attributeMethodToInvoke);
- }
- String attrName = AnnotationUtils.findAnnotation(attributeMethod, ModelAttribute.class).value();
- if (!"".equals(attrName) && implicitModel.containsAttribute(attrName)) {
- continue;
- }
- ReflectionUtils.makeAccessible(attributeMethodToInvoke);
- Object attrValue = attributeMethodToInvoke.invoke(handler, args);
- if ("".equals(attrName)) {
- Class resolvedType = GenericTypeResolver.resolveReturnType(attributeMethodToInvoke, handler.getClass());
- attrName = Conventions.getVariableNameForReturnType(attributeMethodToInvoke, resolvedType, attrValue);
- }
- if (!implicitModel.containsAttribute(attrName)) {
- implicitModel.addAttribute(attrName, attrValue);
- }
- }
- Object[] args = resolveHandlerArguments(handlerMethodToInvoke, handler, webRequest, implicitModel);
- if (debug) {
- logger.debug("Invoking request handler method: " + handlerMethodToInvoke);
- }
- ReflectionUtils.makeAccessible(handlerMethodToInvoke);
- return handlerMethodToInvoke.invoke(handler, args);
- }
- catch (IllegalStateException ex) {
- // Internal assertion failed (e.g. invalid signature):
- // throw exception with full handler method context...
- throw new HandlerMethodInvocationException(handlerMethodToInvoke, ex);
- }
- catch (InvocationTargetException ex) {
- // User-defined @ModelAttribute/@InitBinder/@RequestMapping method threw an exception...
- ReflectionUtils.rethrowException(ex.getTargetException());
- return null;
- }
- }
-
- public final void updateModelAttributes(Object handler, Map mavModel,
- ExtendedModelMap implicitModel, NativeWebRequest webRequest) throws Exception {
-
- if (this.methodResolver.hasSessionAttributes() && this.sessionStatus.isComplete()) {
- for (String attrName : this.methodResolver.getActualSessionAttributeNames()) {
- this.sessionAttributeStore.cleanupAttribute(webRequest, attrName);
- }
- }
-
- // Expose model attributes as session attributes, if required.
- // Expose BindingResults for all attributes, making custom editors available.
- Map model = (mavModel != null ? mavModel : implicitModel);
- if (model != null) {
- try {
- String[] originalAttrNames = model.keySet().toArray(new String[model.size()]);
- for (String attrName : originalAttrNames) {
- Object attrValue = model.get(attrName);
- boolean isSessionAttr = this.methodResolver.isSessionAttribute(
- attrName, (attrValue != null ? attrValue.getClass() : null));
- if (isSessionAttr) {
- if (this.sessionStatus.isComplete()) {
- implicitModel.put(MODEL_KEY_PREFIX_STALE + attrName, Boolean.TRUE);
- }
- else if (!implicitModel.containsKey(MODEL_KEY_PREFIX_STALE + attrName)) {
- this.sessionAttributeStore.storeAttribute(webRequest, attrName, attrValue);
- }
- }
- if (!attrName.startsWith(BindingResult.MODEL_KEY_PREFIX) &&
- (isSessionAttr || isBindingCandidate(attrValue))) {
- String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + attrName;
- if (mavModel != null && !model.containsKey(bindingResultKey)) {
- WebDataBinder binder = createBinder(webRequest, attrValue, attrName);
- initBinder(handler, attrName, binder, webRequest);
- mavModel.put(bindingResultKey, binder.getBindingResult());
- }
- }
- }
- }
- catch (InvocationTargetException ex) {
- // User-defined @InitBinder method threw an exception...
- ReflectionUtils.rethrowException(ex.getTargetException());
- }
- }
- }
-
-
- private Object[] resolveHandlerArguments(Method handlerMethod, Object handler,
- NativeWebRequest webRequest, ExtendedModelMap implicitModel) throws Exception {
-
- Class[] paramTypes = handlerMethod.getParameterTypes();
- Object[] args = new Object[paramTypes.length];
-
- for (int i = 0; i < args.length; i++) {
- MethodParameter methodParam = new MethodParameter(handlerMethod, i);
- methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
- GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
- String paramName = null;
- String headerName = null;
- boolean requestBodyFound = false;
- String cookieName = null;
- String pathVarName = null;
- String attrName = null;
- boolean required = false;
- String defaultValue = null;
- boolean validate = false;
- int annotationsFound = 0;
- Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
- for (Annotation paramAnn : paramAnns) {
- if (RequestParam.class.isInstance(paramAnn)) {
- RequestParam requestParam = (RequestParam) paramAnn;
- paramName = requestParam.value();
- required = requestParam.required();
- defaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
- annotationsFound++;
- }
- else if (RequestHeader.class.isInstance(paramAnn)) {
- RequestHeader requestHeader = (RequestHeader) paramAnn;
- headerName = requestHeader.value();
- required = requestHeader.required();
- defaultValue = parseDefaultValueAttribute(requestHeader.defaultValue());
- annotationsFound++;
- }
- else if (RequestBody.class.isInstance(paramAnn)) {
- requestBodyFound = true;
- annotationsFound++;
- }
- else if (CookieValue.class.isInstance(paramAnn)) {
- CookieValue cookieValue = (CookieValue) paramAnn;
- cookieName = cookieValue.value();
- required = cookieValue.required();
- defaultValue = parseDefaultValueAttribute(cookieValue.defaultValue());
- annotationsFound++;
- }
- else if (PathVariable.class.isInstance(paramAnn)) {
- PathVariable pathVar = (PathVariable) paramAnn;
- pathVarName = pathVar.value();
- annotationsFound++;
- }
- else if (ModelAttribute.class.isInstance(paramAnn)) {
- ModelAttribute attr = (ModelAttribute) paramAnn;
- attrName = attr.value();
- annotationsFound++;
- }
- else if (Value.class.isInstance(paramAnn)) {
- defaultValue = ((Value) paramAnn).value();
- }
- else if ("Valid".equals(paramAnn.annotationType().getSimpleName())) {
- validate = true;
- }
- }
-
- if (annotationsFound > 1) {
- throw new IllegalStateException("Handler parameter annotations are exclusive choices - " +
- "do not specify more than one such annotation on the same parameter: " + handlerMethod);
- }
-
- if (annotationsFound == 0) {
- Object argValue = resolveCommonArgument(methodParam, webRequest);
- if (argValue != WebArgumentResolver.UNRESOLVED) {
- args[i] = argValue;
- }
- else if (defaultValue != null) {
- args[i] = resolveDefaultValue(defaultValue);
- }
- else {
- Class paramType = methodParam.getParameterType();
- if (Model.class.isAssignableFrom(paramType) || Map.class.isAssignableFrom(paramType)) {
- args[i] = implicitModel;
- }
- else if (SessionStatus.class.isAssignableFrom(paramType)) {
- args[i] = this.sessionStatus;
- }
- else if (HttpEntity.class.isAssignableFrom(paramType)) {
- args[i] = resolveHttpEntityRequest(methodParam, webRequest);
- }
- else if (Errors.class.isAssignableFrom(paramType)) {
- throw new IllegalStateException("Errors/BindingResult argument declared " +
- "without preceding model attribute. Check your handler method signature!");
- }
- else if (BeanUtils.isSimpleProperty(paramType)) {
- paramName = "";
- }
- else {
- attrName = "";
- }
- }
- }
-
- if (paramName != null) {
- args[i] = resolveRequestParam(paramName, required, defaultValue, methodParam, webRequest, handler);
- }
- else if (headerName != null) {
- args[i] = resolveRequestHeader(headerName, required, defaultValue, methodParam, webRequest, handler);
- }
- else if (requestBodyFound) {
- args[i] = resolveRequestBody(methodParam, webRequest, handler);
- }
- else if (cookieName != null) {
- args[i] = resolveCookieValue(cookieName, required, defaultValue, methodParam, webRequest, handler);
- }
- else if (pathVarName != null) {
- args[i] = resolvePathVariable(pathVarName, methodParam, webRequest, handler);
- }
- else if (attrName != null) {
- WebDataBinder binder =
- resolveModelAttribute(attrName, methodParam, implicitModel, webRequest, handler);
- boolean assignBindingResult = (args.length > i + 1 && Errors.class.isAssignableFrom(paramTypes[i + 1]));
- if (binder.getTarget() != null) {
- doBind(binder, webRequest, validate, !assignBindingResult);
- }
- args[i] = binder.getTarget();
- if (assignBindingResult) {
- args[i + 1] = binder.getBindingResult();
- i++;
- }
- implicitModel.putAll(binder.getBindingResult().getModel());
- }
- }
-
- return args;
- }
-
- protected void initBinder(Object handler, String attrName, WebDataBinder binder, NativeWebRequest webRequest)
- throws Exception {
-
- if (this.bindingInitializer != null) {
- this.bindingInitializer.initBinder(binder, webRequest);
- }
- if (handler != null) {
- Set initBinderMethods = this.methodResolver.getInitBinderMethods();
- if (!initBinderMethods.isEmpty()) {
- boolean debug = logger.isDebugEnabled();
- for (Method initBinderMethod : initBinderMethods) {
- Method methodToInvoke = BridgeMethodResolver.findBridgedMethod(initBinderMethod);
- String[] targetNames = AnnotationUtils.findAnnotation(initBinderMethod, InitBinder.class).value();
- if (targetNames.length == 0 || Arrays.asList(targetNames).contains(attrName)) {
- Object[] initBinderArgs =
- resolveInitBinderArguments(handler, methodToInvoke, binder, webRequest);
- if (debug) {
- logger.debug("Invoking init-binder method: " + methodToInvoke);
- }
- ReflectionUtils.makeAccessible(methodToInvoke);
- Object returnValue = methodToInvoke.invoke(handler, initBinderArgs);
- if (returnValue != null) {
- throw new IllegalStateException(
- "InitBinder methods must not have a return value: " + methodToInvoke);
- }
- }
- }
- }
- }
- }
-
- private Object[] resolveInitBinderArguments(Object handler, Method initBinderMethod,
- WebDataBinder binder, NativeWebRequest webRequest) throws Exception {
-
- Class[] initBinderParams = initBinderMethod.getParameterTypes();
- Object[] initBinderArgs = new Object[initBinderParams.length];
-
- for (int i = 0; i < initBinderArgs.length; i++) {
- MethodParameter methodParam = new MethodParameter(initBinderMethod, i);
- methodParam.initParameterNameDiscovery(this.parameterNameDiscoverer);
- GenericTypeResolver.resolveParameterType(methodParam, handler.getClass());
- String paramName = null;
- boolean paramRequired = false;
- String paramDefaultValue = null;
- String pathVarName = null;
- Annotation[] paramAnns = methodParam.getParameterAnnotations();
-
- for (Annotation paramAnn : paramAnns) {
- if (RequestParam.class.isInstance(paramAnn)) {
- RequestParam requestParam = (RequestParam) paramAnn;
- paramName = requestParam.value();
- paramRequired = requestParam.required();
- paramDefaultValue = parseDefaultValueAttribute(requestParam.defaultValue());
- break;
- }
- else if (ModelAttribute.class.isInstance(paramAnn)) {
- throw new IllegalStateException(
- "@ModelAttribute is not supported on @InitBinder methods: " + initBinderMethod);
- }
- else if (PathVariable.class.isInstance(paramAnn)) {
- PathVariable pathVar = (PathVariable) paramAnn;
- pathVarName = pathVar.value();
- }
- }
-
- if (paramName == null && pathVarName == null) {
- Object argValue = resolveCommonArgument(methodParam, webRequest);
- if (argValue != WebArgumentResolver.UNRESOLVED) {
- initBinderArgs[i] = argValue;
- }
- else {
- Class paramType = initBinderParams[i];
- if (paramType.isInstance(binder)) {
- initBinderArgs[i] = binder;
- }
- else if (BeanUtils.isSimpleProperty(paramType)) {
- paramName = "";
- }
- else {
- throw new IllegalStateException("Unsupported argument [" + paramType.getName() +
- "] for @InitBinder method: " + initBinderMethod);
- }
- }
- }
-
- if (paramName != null) {
- initBinderArgs[i] =
- resolveRequestParam(paramName, paramRequired, paramDefaultValue, methodParam, webRequest, null);
- }
- else if (pathVarName != null) {
- initBinderArgs[i] = resolvePathVariable(pathVarName, methodParam, webRequest, null);
- }
- }
-
- return initBinderArgs;
- }
-
- @SuppressWarnings("unchecked")
- private Object resolveRequestParam(String paramName, boolean required, String defaultValue,
- MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
- throws Exception {
-
- Class paramType = methodParam.getParameterType();
- if (Map.class.isAssignableFrom(paramType) && paramName.length() == 0) {
- return resolveRequestParamMap((Class) paramType, webRequest);
- }
- if (paramName.length() == 0) {
- paramName = getRequiredParameterName(methodParam);
- }
- Object paramValue = null;
- MultipartRequest multipartRequest = webRequest.getNativeRequest(MultipartRequest.class);
- if (multipartRequest != null) {
- List files = multipartRequest.getFiles(paramName);
- if (!files.isEmpty()) {
- if (files.size() == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
- paramValue = files.get(0);
- }
- else {
- paramValue = files;
- }
- }
- }
- if (paramValue == null) {
- String[] paramValues = webRequest.getParameterValues(paramName);
- if (paramValues != null) {
- if (paramValues.length == 1 && !paramType.isArray() && !Collection.class.isAssignableFrom(paramType)) {
- paramValue = paramValues[0];
- }
- else {
- paramValue = paramValues;
- }
- }
- }
- if (paramValue == null) {
- if (defaultValue != null) {
- paramValue = resolveDefaultValue(defaultValue);
- }
- else if (required) {
- raiseMissingParameterException(paramName, paramType);
- }
- paramValue = checkValue(paramName, paramValue, paramType);
- }
- WebDataBinder binder = createBinder(webRequest, null, paramName);
- initBinder(handlerForInitBinderCall, paramName, binder, webRequest);
- return binder.convertIfNecessary(paramValue, paramType, methodParam);
- }
-
- private Map resolveRequestParamMap(Class mapType, NativeWebRequest webRequest) {
- Map parameterMap = webRequest.getParameterMap();
- if (MultiValueMap.class.isAssignableFrom(mapType)) {
- MultiValueMap result = new LinkedMultiValueMap(parameterMap.size());
- for (Map.Entry entry : parameterMap.entrySet()) {
- for (String value : entry.getValue()) {
- result.add(entry.getKey(), value);
- }
- }
- return result;
- }
- else {
- Map result = new LinkedHashMap(parameterMap.size());
- for (Map.Entry entry : parameterMap.entrySet()) {
- if (entry.getValue().length > 0) {
- result.put(entry.getKey(), entry.getValue()[0]);
- }
- }
- return result;
- }
- }
-
- @SuppressWarnings("unchecked")
- private Object resolveRequestHeader(String headerName, boolean required, String defaultValue,
- MethodParameter methodParam, NativeWebRequest webRequest, Object handlerForInitBinderCall)
- throws Exception {
-
- Class paramType = methodParam.getParameterType();
- if (Map.class.isAssignableFrom(paramType)) {
- return resolveRequestHeaderMap((Class) paramType, webRequest);
- }
- if (headerName.length() == 0) {
- headerName = getRequiredParameterName(methodParam);
- }
- Object headerValue = null;
- String[] headerValues = webRequest.getHeaderValues(headerName);
- if (headerValues != null) {
- headerValue = (headerValues.length == 1 ? headerValues[0] : headerValues);
- }
- if (headerValue == null) {
- if (defaultValue != null) {
- headerValue = resolveDefaultValue(defaultValue);
- }
- else if (required) {
- raiseMissingHeaderException(headerName, paramType);
- }
- headerValue = checkValue(headerName, headerValue, paramType);
- }
- WebDataBinder binder = createBinder(webRequest, null, headerName);
- initBinder(handlerForInitBinderCall, headerName, binder, webRequest);
- return binder.convertIfNecessary(headerValue, paramType, methodParam);
- }
-
- private Map resolveRequestHeaderMap(Class mapType, NativeWebRequest webRequest) {
- if (MultiValueMap.class.isAssignableFrom(mapType)) {
- MultiValueMap result;
- if (HttpHeaders.class.isAssignableFrom(mapType)) {
- result = new HttpHeaders();
- }
- else {
- result = new LinkedMultiValueMap();
- }
- for (Iterator iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
- String headerName = iterator.next();
- for (String headerValue : webRequest.getHeaderValues(headerName)) {
- result.add(headerName, headerValue);
- }
- }
- return result;
- }
- else {
- Map result = new LinkedHashMap();
- for (Iterator iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
- String headerName = iterator.next();
- String headerValue = webRequest.getHeader(headerName);
- result.put(headerName, headerValue);
- }
- return result;
- }
- }
-
- /**
- * Resolves the given {@link RequestBody @RequestBody} annotation.
- */
- protected Object resolveRequestBody(MethodParameter methodParam, NativeWebRequest webRequest, Object handler)
- throws Exception {
-
- return readWithMessageConverters(methodParam, createHttpInputMessage(webRequest), methodParam.getParameterType());
- }
-
- private HttpEntity resolveHttpEntityRequest(MethodParameter methodParam, NativeWebRequest webRequest)
- throws Exception {
-
- HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
- Class paramType = getHttpEntityType(methodParam);
- Object body = readWithMessageConverters(methodParam, inputMessage, paramType);
- return new HttpEntity