Polishing
This commit is contained in:
parent
30c873b4b5
commit
d7be1e0dab
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2020 the original author or authors.
|
* Copyright 2002-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|
@ -60,6 +60,18 @@ public class UrlResource extends AbstractFileResolvingResource {
|
||||||
private volatile URL cleanedUrl;
|
private volatile URL cleanedUrl;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new {@code UrlResource} based on the given URL object.
|
||||||
|
* @param url a URL
|
||||||
|
* @see #UrlResource(URI)
|
||||||
|
* @see #UrlResource(String)
|
||||||
|
*/
|
||||||
|
public UrlResource(URL url) {
|
||||||
|
Assert.notNull(url, "URL must not be null");
|
||||||
|
this.uri = null;
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new {@code UrlResource} based on the given URI object.
|
* Create a new {@code UrlResource} based on the given URI object.
|
||||||
* @param uri a URI
|
* @param uri a URI
|
||||||
|
|
@ -72,16 +84,6 @@ public class UrlResource extends AbstractFileResolvingResource {
|
||||||
this.url = uri.toURL();
|
this.url = uri.toURL();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new {@code UrlResource} based on the given URL object.
|
|
||||||
* @param url a URL
|
|
||||||
*/
|
|
||||||
public UrlResource(URL url) {
|
|
||||||
Assert.notNull(url, "URL must not be null");
|
|
||||||
this.uri = null;
|
|
||||||
this.url = url;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new {@code UrlResource} based on a URL path.
|
* Create a new {@code UrlResource} based on a URL path.
|
||||||
* <p>Note: The given path needs to be pre-encoded if necessary.
|
* <p>Note: The given path needs to be pre-encoded if necessary.
|
||||||
|
|
|
||||||
|
|
@ -955,7 +955,7 @@ public class JdbcTemplateTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSQLErrorCodeTranslationWithSpecifiedDbName() throws Exception {
|
public void testSQLErrorCodeTranslationWithSpecifiedDatabaseName() throws Exception {
|
||||||
final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054);
|
final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054);
|
||||||
final String sql = "SELECT ID FROM CUSTOMER";
|
final String sql = "SELECT ID FROM CUSTOMER";
|
||||||
|
|
||||||
|
|
@ -983,7 +983,7 @@ public class JdbcTemplateTests {
|
||||||
* to get the metadata
|
* to get the metadata
|
||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testUseCustomSQLErrorCodeTranslator() throws Exception {
|
public void testUseCustomExceptionTranslator() throws Exception {
|
||||||
// Bad SQL state
|
// Bad SQL state
|
||||||
final SQLException sqlException = new SQLException("I have a known problem", "07000", 1054);
|
final SQLException sqlException = new SQLException("I have a known problem", "07000", 1054);
|
||||||
final String sql = "SELECT ID FROM CUSTOMER";
|
final String sql = "SELECT ID FROM CUSTOMER";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2018 the original author or authors.
|
* Copyright 2002-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|
@ -174,7 +174,7 @@ public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
|
||||||
}
|
}
|
||||||
catch (UnmarshalException ex) {
|
catch (UnmarshalException ex) {
|
||||||
throw new HttpMessageNotReadableException(
|
throw new HttpMessageNotReadableException(
|
||||||
"Could not unmarshal to [" + elementClass + "]: " + ex.getMessage(), ex, inputMessage);
|
"Could not unmarshal to [" + elementClass + "]: " + ex, ex, inputMessage);
|
||||||
}
|
}
|
||||||
catch (JAXBException ex) {
|
catch (JAXBException ex) {
|
||||||
throw new HttpMessageConversionException("Invalid JAXB setup: " + ex.getMessage(), ex);
|
throw new HttpMessageConversionException("Invalid JAXB setup: " + ex.getMessage(), ex);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2018 the original author or authors.
|
* Copyright 2002-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue