Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
189eeefb
Commit
189eeefb
authored
Mar 26, 2019
by
Spring Operator
Committed by
Andy Wilkinson
Mar 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use HTTPS for external links wherever possible
See gh-16317
parent
8059dcee
Changes
33
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
130 additions
and
130 deletions
+130
-130
CODE_OF_CONDUCT.adoc
CODE_OF_CONDUCT.adoc
+2
-2
ResourceServerTokenServicesConfigurationTests.java
...source/ResourceServerTokenServicesConfigurationTests.java
+1
-1
CustomRestTemplateBasicOAuth2SsoConfigurationTests.java
...o/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java
+2
-2
open_source_licenses.txt
...-boot-cli/src/main/content/legal/open_source_licenses.txt
+3
-3
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+11
-11
error.ftl
...sample-actuator-ui/src/main/resources/templates/error.ftl
+1
-1
home.ftl
...-sample-actuator-ui/src/main/resources/templates/home.ftl
+1
-1
README.adoc
spring-boot-samples/spring-boot-sample-cache/README.adoc
+1
-1
Author.java
...mple-jooq/gensrc/main/java/sample/jooq/domain/Author.java
+1
-1
Book.java
...sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java
+1
-1
BookStore.java
...e-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java
+1
-1
BookToBookStore.java
.../gensrc/main/java/sample/jooq/domain/BookToBookStore.java
+1
-1
DefaultCatalog.java
...q/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java
+1
-1
Language.java
...le-jooq/gensrc/main/java/sample/jooq/domain/Language.java
+1
-1
VehicleIdentificationNumberTests.java
.../sample/test/domain/VehicleIdentificationNumberTests.java
+2
-2
jquery-1.7.2.js
...b-thymeleaf3/src/main/resources/static/js/jquery-1.7.2.js
+13
-13
jquery.validate.js
...hymeleaf3/src/main/resources/static/js/jquery.validate.js
+34
-34
layout.html
...e-web-thymeleaf3/src/main/resources/templates/layout.html
+2
-2
form.html
...hymeleaf3/src/main/resources/templates/messages/form.html
+2
-2
list.html
...hymeleaf3/src/main/resources/templates/messages/list.html
+2
-2
view.html
...hymeleaf3/src/main/resources/templates/messages/view.html
+2
-2
README.adoc
spring-boot-starters/README.adoc
+9
-9
AnotherExampleRestClient.java
...st/autoconfigure/web/client/AnotherExampleRestClient.java
+1
-1
ExampleRestClient.java
...boot/test/autoconfigure/web/client/ExampleRestClient.java
+1
-1
HateoasController.java
...oot/test/autoconfigure/web/servlet/HateoasController.java
+1
-1
RootUriRequestExpectationManager.java
...oot/test/web/client/RootUriRequestExpectationManager.java
+1
-1
TestRestTemplate.java
...pringframework/boot/test/web/client/TestRestTemplate.java
+5
-5
MockServerRestTemplateCustomizerTests.java
...est/web/client/MockServerRestTemplateCustomizerTests.java
+2
-2
RootUriRequestExpectationManagerTests.java
...est/web/client/RootUriRequestExpectationManagerTests.java
+8
-8
CentralDirectoryFileHeader.java
...framework/boot/loader/jar/CentralDirectoryFileHeader.java
+1
-1
AnsiColors.java
...c/main/java/org/springframework/boot/ansi/AnsiColors.java
+1
-1
RestTemplateBuilderTests.java
...ngframework/boot/web/client/RestTemplateBuilderTests.java
+4
-4
RootUriTemplateHandlerTests.java
...ramework/boot/web/client/RootUriTemplateHandlerTests.java
+11
-11
No files found.
CODE_OF_CONDUCT.adoc
View file @
189eeefb
...
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
...
@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
with regard to the reporter of an incident.
with regard to the reporter of an incident.
This Code of Conduct is adapted from the
This Code of Conduct is adapted from the
http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
http
s
://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
http
s
://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
View file @
189eeefb
...
@@ -128,7 +128,7 @@ public class ResourceServerTokenServicesConfigurationTests {
...
@@ -128,7 +128,7 @@ public class ResourceServerTokenServicesConfigurationTests {
@Test
@Test
public
void
userInfoWithPrincipal
()
{
public
void
userInfoWithPrincipal
()
{
EnvironmentTestUtils
.
addEnvironment
(
this
.
environment
,
EnvironmentTestUtils
.
addEnvironment
(
this
.
environment
,
"security.oauth2.resource.userInfoUri:http://example.com"
);
"security.oauth2.resource.userInfoUri:http
s
://example.com"
);
this
.
context
=
new
SpringApplicationBuilder
(
PrincipalConfiguration
.
class
)
this
.
context
=
new
SpringApplicationBuilder
(
PrincipalConfiguration
.
class
)
.
environment
(
this
.
environment
).
web
(
false
).
run
();
.
environment
(
this
.
environment
).
web
(
false
).
run
();
UserInfoTokenServices
services
=
this
.
context
UserInfoTokenServices
services
=
this
.
context
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java
View file @
189eeefb
...
@@ -48,8 +48,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
...
@@ -48,8 +48,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
@SpringBootTest
@SpringBootTest
@TestPropertySource
(
properties
=
{
"security.oauth2.client.clientId=client"
,
@TestPropertySource
(
properties
=
{
"security.oauth2.client.clientId=client"
,
"security.oauth2.client.clientSecret=secret"
,
"security.oauth2.client.clientSecret=secret"
,
"security.oauth2.client.userAuthorizationUri=http://example.com/oauth/authorize"
,
"security.oauth2.client.userAuthorizationUri=http
s
://example.com/oauth/authorize"
,
"security.oauth2.client.accessTokenUri=http://example.com/oauth/token"
,
"security.oauth2.client.accessTokenUri=http
s
://example.com/oauth/token"
,
"security.oauth2.resource.jwt.keyValue=SSSSHHH"
})
"security.oauth2.resource.jwt.keyValue=SSSSHHH"
})
public
class
CustomRestTemplateBasicOAuth2SsoConfigurationTests
{
public
class
CustomRestTemplateBasicOAuth2SsoConfigurationTests
{
...
...
spring-boot-cli/src/main/content/legal/open_source_licenses.txt
View file @
189eeefb
...
@@ -230,7 +230,7 @@ limitations under the License
...
@@ -230,7 +230,7 @@ limitations under the License
>>> CGLIB 3.0 (cglib:cglib:3.0):
>>> CGLIB 3.0 (cglib:cglib:3.0):
Per the LICENSE file in the CGLIB JAR distribution downloaded from
Per the LICENSE file in the CGLIB JAR distribution downloaded from
http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
http
s
://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
is included above.
is included above.
...
@@ -250,7 +250,7 @@ Eclipse Public License, Version 1.0 is applicable to the following component(s).
...
@@ -250,7 +250,7 @@ Eclipse Public License, Version 1.0 is applicable to the following component(s).
The Eclipse Foundation makes available all content in this plug-in ("Content").
The Eclipse Foundation makes available all content in this plug-in ("Content").
Unless otherwise indicated below, the Content is provided to you under the terms
Unless otherwise indicated below, the Content is provided to you under the terms
and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the
and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the
EPL is available at http://www.eclipse.org/legal/epl-v10.html.
EPL is available at http
s
://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
For purposes of the EPL, "Program" will mean the Content.
...
@@ -260,7 +260,7 @@ terms and conditions may apply to your use of any object code in the Content.
...
@@ -260,7 +260,7 @@ terms and conditions may apply to your use of any object code in the Content.
Check the Redistributor's license that was provided with the Content. If no such
Check the Redistributor's license that was provided with the Content. If no such
license exists, contact the Redistributor. Unless otherwise indicated below, the
license exists, contact the Redistributor. Unless otherwise indicated below, the
terms and conditions of the EPL still apply to any source code in the Content and
terms and conditions of the EPL still apply to any source code in the Content and
such source code may be obtained at http://www.eclipse.org/
such source code may be obtained at http
s
://www.eclipse.org/
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
189eeefb
...
@@ -1587,7 +1587,7 @@ it's loaded too early. You need to either use `logback-spring.xml` or define a
...
@@ -1587,7 +1587,7 @@ it's loaded too early. You need to either use `logback-spring.xml` or define a
`logging.config` property.
`logging.config` property.
WARNING: The extensions cannot be used with Logback's
WARNING: The extensions cannot be used with Logback's
http://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you
http
s
://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you
attempt to do so, making changes to the configuration file will result in an error similar
attempt to do so, making changes to the configuration file will result in an error similar
to once of the following being logged:
to once of the following being logged:
...
@@ -1766,7 +1766,7 @@ of converters. You can also override default converters that way.
...
@@ -1766,7 +1766,7 @@ of converters. You can also override default converters that way.
==== Custom JSON Serializers and Deserializers
==== Custom JSON Serializers and Deserializers
If you're using Jackson to serialize and deserialize JSON data, you might want to write
If you're using Jackson to serialize and deserialize JSON data, you might want to write
your own `JsonSerializer` and `JsonDeserializer` classes. Custom serializers are usually
your own `JsonSerializer` and `JsonDeserializer` classes. Custom serializers are usually
http://wiki.fasterxml.com/JacksonHowToCustomDeserializers[registered with Jackson via a Module],
http
s
://wiki.fasterxml.com/JacksonHowToCustomDeserializers[registered with Jackson via a Module],
but Spring Boot provides an alternative `@JsonComponent` annotation which makes it easier
but Spring Boot provides an alternative `@JsonComponent` annotation which makes it easier
to directly register Spring Beans.
to directly register Spring Beans.
...
@@ -3449,7 +3449,7 @@ Mongo instance's configuration and logging routing.
...
@@ -3449,7 +3449,7 @@ Mongo instance's configuration and logging routing.
[[boot-features-neo4j]]
[[boot-features-neo4j]]
=== Neo4j
=== Neo4j
http://neo4j.com/[Neo4j] is an open-source NoSQL graph database that uses a rich data
http
s
://neo4j.com/[Neo4j] is an open-source NoSQL graph database that uses a rich data
model of nodes related by first class relationships which is better suited for connected
model of nodes related by first class relationships which is better suited for connected
big data than traditional rdbms approaches. Spring Boot offers several conveniences for
big data than traditional rdbms approaches. Spring Boot offers several conveniences for
working with Neo4j, including the `spring-boot-starter-data-neo4j` '`Starter`'.
working with Neo4j, including the `spring-boot-starter-data-neo4j` '`Starter`'.
...
@@ -3560,7 +3560,7 @@ following two annotations to your Spring configuration:
...
@@ -3560,7 +3560,7 @@ following two annotations to your Spring configuration:
----
----
TIP: For complete details of Spring Data Neo4j, including its rich object mapping
TIP: For complete details of Spring Data Neo4j, including its rich object mapping
technologies, refer to their http://projects.spring.io/spring-data-neo4j/[reference
technologies, refer to their http
s
://projects.spring.io/spring-data-neo4j/[reference
documentation].
documentation].
...
@@ -3648,7 +3648,7 @@ configured:
...
@@ -3648,7 +3648,7 @@ configured:
[source,properties,indent=0]
[source,properties,indent=0]
----
----
spring.elasticsearch.jest.uris=http://search.example.com:9200
spring.elasticsearch.jest.uris=http
s
://search.example.com:9200
spring.elasticsearch.jest.read-timeout=10000
spring.elasticsearch.jest.read-timeout=10000
spring.elasticsearch.jest.username=user
spring.elasticsearch.jest.username=user
spring.elasticsearch.jest.password=secret
spring.elasticsearch.jest.password=secret
...
@@ -3775,7 +3775,7 @@ https://docs.spring.io/spring-data/cassandra/docs/[reference documentation].
...
@@ -3775,7 +3775,7 @@ https://docs.spring.io/spring-data/cassandra/docs/[reference documentation].
[[boot-features-couchbase]]
[[boot-features-couchbase]]
=== Couchbase
=== Couchbase
http://www.couchbase.com/[Couchbase] is an open-source, distributed multi-model NoSQL
http
s
://www.couchbase.com/[Couchbase] is an open-source, distributed multi-model NoSQL
document-oriented database that is optimized for interactive applications. Spring Boot
document-oriented database that is optimized for interactive applications. Spring Boot
offers auto-configuration for Couchbase and abstractions on top of it provided by
offers auto-configuration for Couchbase and abstractions on top of it provided by
https://github.com/spring-projects/spring-data-couchbase[Spring Data Couchbase].
https://github.com/spring-projects/spring-data-couchbase[Spring Data Couchbase].
...
@@ -3824,7 +3824,7 @@ Check the `spring.couchbase.env.*` properties for more details.
...
@@ -3824,7 +3824,7 @@ Check the `spring.couchbase.env.*` properties for more details.
==== Spring Data Couchbase repositories
==== Spring Data Couchbase repositories
Spring Data includes repository support for Couchbase. For complete details of Spring
Spring Data includes repository support for Couchbase. For complete details of Spring
Data Couchbase, refer to their
Data Couchbase, refer to their
http://docs.spring.io/spring-data/couchbase/docs/current/reference/html/[reference documentation].
http
s
://docs.spring.io/spring-data/couchbase/docs/current/reference/html/[reference documentation].
You can inject an auto-configured `CouchbaseTemplate` instance as you would with any
You can inject an auto-configured `CouchbaseTemplate` instance as you would with any
other Spring Bean as long as a _default_ `CouchbaseConfigurer` is available (that
other Spring Bean as long as a _default_ `CouchbaseConfigurer` is available (that
...
@@ -5023,13 +5023,13 @@ If you use the
...
@@ -5023,13 +5023,13 @@ If you use the
`spring-boot-starter-test` '`Starter`' (in the `test` `scope`), you will find
`spring-boot-starter-test` '`Starter`' (in the `test` `scope`), you will find
the following provided libraries:
the following provided libraries:
* http://junit.org[JUnit] -- The de-facto standard for unit testing Java applications.
* http
s
://junit.org[JUnit] -- The de-facto standard for unit testing Java applications.
* {spring-reference}/#integration-testing[Spring Test] & Spring Boot Test --
* {spring-reference}/#integration-testing[Spring Test] & Spring Boot Test --
Utilities and integration test support for Spring Boot applications.
Utilities and integration test support for Spring Boot applications.
* http://joel-costigliola.github.io/assertj/[AssertJ] -- A fluent assertion library.
* http
s
://joel-costigliola.github.io/assertj/[AssertJ] -- A fluent assertion library.
* http://hamcrest.org/JavaHamcrest/[Hamcrest] -- A library of matcher objects (also known
* http://hamcrest.org/JavaHamcrest/[Hamcrest] -- A library of matcher objects (also known
as constraints or predicates).
as constraints or predicates).
* http
://mockito.org/
[Mockito] -- A Java mocking framework.
* http
s://mockito.github.io
[Mockito] -- A Java mocking framework.
* https://github.com/skyscreamer/JSONassert[JSONassert] -- An assertion library for JSON.
* https://github.com/skyscreamer/JSONassert[JSONassert] -- An assertion library for JSON.
* https://github.com/jayway/JsonPath[JsonPath] -- XPath for JSON.
* https://github.com/jayway/JsonPath[JsonPath] -- XPath for JSON.
...
@@ -5763,7 +5763,7 @@ public class MyTest {
...
@@ -5763,7 +5763,7 @@ public class MyTest {
@Test
@Test
public void testRequest() throws Exception {
public void testRequest() throws Exception {
HttpHeaders headers = template.getForEntity("http://myhost.com", String.class).getHeaders();
HttpHeaders headers = template.getForEntity("http
s
://myhost.com", String.class).getHeaders();
assertThat(headers.getLocation().toString(), containsString("myotherhost"));
assertThat(headers.getLocation().toString(), containsString("myotherhost"));
}
}
...
...
spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl
View file @
189eeefb
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"navbar"
>
<div
class=
"navbar"
>
<div
class=
"navbar-inner"
>
<div
class=
"navbar-inner"
>
<a
class=
"brand"
href=
"https://freemarker.apache.org"
>
FreeMarker -
<a
class=
"brand"
href=
"https://freemarker.apache.org
/
"
>
FreeMarker -
Plain
</a>
Plain
</a>
<ul
class=
"nav"
>
<ul
class=
"nav"
>
<li><a
href=
"${home}"
>
Home
</a></li>
<li><a
href=
"${home}"
>
Home
</a></li>
...
...
spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl
View file @
189eeefb
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"navbar"
>
<div
class=
"navbar"
>
<div
class=
"navbar-inner"
>
<div
class=
"navbar-inner"
>
<a
class=
"brand"
href=
"https://freemarker.apache.org"
>
FreeMarker -
<a
class=
"brand"
href=
"https://freemarker.apache.org
/
"
>
FreeMarker -
Plain
</a>
Plain
</a>
<ul
class=
"nav"
>
<ul
class=
"nav"
>
<li><a
href=
"${home}"
>
Home
</a></li>
<li><a
href=
"${home}"
>
Home
</a></li>
...
...
spring-boot-samples/spring-boot-sample-cache/README.adoc
View file @
189eeefb
...
@@ -62,7 +62,7 @@ Simply add the `net.sf.ehcache:ehcache` dependency to the project. Since there i
...
@@ -62,7 +62,7 @@ Simply add the `net.sf.ehcache:ehcache` dependency to the project. Since there i
default `ehcache.xml` configuration file at the root of the classpath, it is automatically
default `ehcache.xml` configuration file at the root of the classpath, it is automatically
used to configure the underlying `CacheManager`. Note that EhCache 3 uses a different
used to configure the underlying `CacheManager`. Note that EhCache 3 uses a different
format and doesn't default to `ehcache.xml` anymore. Check
format and doesn't default to `ehcache.xml` anymore. Check
http://www.ehcache.org/documentation/3.0/xml.html[the documentation] for more details.
http
s
://www.ehcache.org/documentation/3.0/xml.html[the documentation] for more details.
...
...
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java
View file @
189eeefb
...
@@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl;
...
@@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl;
*/
*/
@Generated
(
@Generated
(
value
=
{
value
=
{
"http://www.jooq.org"
,
"http
s
://www.jooq.org"
,
"jOOQ version:3.8.2"
"jOOQ version:3.8.2"
},
},
comments
=
"This class is generated by jOOQ"
comments
=
"This class is generated by jOOQ"
...
...
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java
View file @
189eeefb
...
@@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl;
...
@@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl;
*/
*/
@Generated
(
@Generated
(
value
=
{
value
=
{
"http://www.jooq.org"
,
"http
s
://www.jooq.org"
,
"jOOQ version:3.8.2"
"jOOQ version:3.8.2"
},
},
comments
=
"This class is generated by jOOQ"
comments
=
"This class is generated by jOOQ"
...
...
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java
View file @
189eeefb
...
@@ -23,7 +23,7 @@ import org.jooq.impl.TableImpl;
...
@@ -23,7 +23,7 @@ import org.jooq.impl.TableImpl;
*/
*/
@Generated
(
@Generated
(
value
=
{
value
=
{
"http://www.jooq.org"
,
"http
s
://www.jooq.org"
,
"jOOQ version:3.8.2"
"jOOQ version:3.8.2"
},
},
comments
=
"This class is generated by jOOQ"
comments
=
"This class is generated by jOOQ"
...
...
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java
View file @
189eeefb
...
@@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl;
...
@@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl;
*/
*/
@Generated
(
@Generated
(
value
=
{
value
=
{
"http://www.jooq.org"
,
"http
s
://www.jooq.org"
,
"jOOQ version:3.8.2"
"jOOQ version:3.8.2"
},
},
comments
=
"This class is generated by jOOQ"
comments
=
"This class is generated by jOOQ"
...
...
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java
View file @
189eeefb
...
@@ -19,7 +19,7 @@ import org.jooq.impl.CatalogImpl;
...
@@ -19,7 +19,7 @@ import org.jooq.impl.CatalogImpl;
*/
*/
@Generated
(
@Generated
(
value
=
{
value
=
{
"http://www.jooq.org"
,
"http
s
://www.jooq.org"
,
"jOOQ version:3.8.2"
"jOOQ version:3.8.2"
},
},
comments
=
"This class is generated by jOOQ"
comments
=
"This class is generated by jOOQ"
...
...
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java
View file @
189eeefb
...
@@ -23,7 +23,7 @@ import org.jooq.impl.TableImpl;
...
@@ -23,7 +23,7 @@ import org.jooq.impl.TableImpl;
*/
*/
@Generated
(
@Generated
(
value
=
{
value
=
{
"http://www.jooq.org"
,
"http
s
://www.jooq.org"
,
"jOOQ version:3.8.2"
"jOOQ version:3.8.2"
},
},
comments
=
"This class is generated by jOOQ"
comments
=
"This class is generated by jOOQ"
...
...
spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/VehicleIdentificationNumberTests.java
View file @
189eeefb
...
@@ -26,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -26,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link VehicleIdentificationNumber}.
* Tests for {@link VehicleIdentificationNumber}.
*
*
* @author Phillip Webb
* @author Phillip Webb
* @see <a href="http://osherove.com/blog/2005/4/3/naming-standards-for-unit-tests.html">
* @see <a href="http
s
://osherove.com/blog/2005/4/3/naming-standards-for-unit-tests.html">
* Naming standards for unit tests</a>
* Naming standards for unit tests</a>
* @see <a href="http://joel-costigliola.github.io/assertj/">AssertJ</a>
* @see <a href="http
s
://joel-costigliola.github.io/assertj/">AssertJ</a>
*/
*/
public
class
VehicleIdentificationNumberTests
{
public
class
VehicleIdentificationNumberTests
{
...
...
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery-1.7.2.js
View file @
189eeefb
/*!
/*!
* jQuery JavaScript Library v1.7.2
* jQuery JavaScript Library v1.7.2
* http://jquery.com/
* http
s
://jquery.com/
*
*
* Copyright 2011, John Resig
* Copyright 2011, John Resig
* Dual licensed under the MIT or GPL Version 2 licenses.
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
* http
s
://jquery.org/license
*
*
* Includes Sizzle.js
* Includes Sizzle.js
* http://sizzlejs.com/
* http
s
://sizzlejs.com/
* Copyright 2011, The Dojo Foundation
* Copyright 2011, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
* Released under the MIT, BSD, and GPL Licenses.
*
*
...
@@ -565,7 +565,7 @@ jQuery.extend({
...
@@ -565,7 +565,7 @@ jQuery.extend({
}
}
// Make sure the incoming data is actual JSON
// Make sure the incoming data is actual JSON
// Logic borrowed from http://json.org/json2.js
// Logic borrowed from http
s
://json.org/json2.js
if
(
rvalidchars
.
test
(
data
.
replace
(
rvalidescape
,
"@"
)
if
(
rvalidchars
.
test
(
data
.
replace
(
rvalidescape
,
"@"
)
.
replace
(
rvalidtokens
,
"]"
)
.
replace
(
rvalidtokens
,
"]"
)
.
replace
(
rvalidbraces
,
""
))
)
{
.
replace
(
rvalidbraces
,
""
))
)
{
...
@@ -604,7 +604,7 @@ jQuery.extend({
...
@@ -604,7 +604,7 @@ jQuery.extend({
// Evaluates a script in a global context
// Evaluates a script in a global context
// Workarounds based on findings by Jim Driscoll
// Workarounds based on findings by Jim Driscoll
// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
// http
s
://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
globalEval
:
function
(
data
)
{
globalEval
:
function
(
data
)
{
if
(
data
&&
rnotwhite
.
test
(
data
)
)
{
if
(
data
&&
rnotwhite
.
test
(
data
)
)
{
// We use execScript on Internet Explorer
// We use execScript on Internet Explorer
...
@@ -880,7 +880,7 @@ jQuery.extend({
...
@@ -880,7 +880,7 @@ jQuery.extend({
},
},
// Use of jQuery.browser is frowned upon.
// Use of jQuery.browser is frowned upon.
// More details: http://docs.jquery.com/Utilities/jQuery.browser
// More details: http
s
://docs.jquery.com/Utilities/jQuery.browser
uaMatch
:
function
(
ua
)
{
uaMatch
:
function
(
ua
)
{
ua
=
ua
.
toLowerCase
();
ua
=
ua
.
toLowerCase
();
...
@@ -2159,7 +2159,7 @@ jQuery.fn.extend({
...
@@ -2159,7 +2159,7 @@ jQuery.fn.extend({
});
});
},
},
// Based off of the plugin by Clint Helfers, with permission.
// Based off of the plugin by Clint Helfers, with permission.
// http://blindsignals.com
/index.php/2009/07/jquery-delay/
// http://blindsignals.com
delay
:
function
(
time
,
type
)
{
delay
:
function
(
time
,
type
)
{
time
=
jQuery
.
fx
?
jQuery
.
fx
.
speeds
[
time
]
||
time
:
time
;
time
=
jQuery
.
fx
?
jQuery
.
fx
.
speeds
[
time
]
||
time
:
time
;
type
=
type
||
"fx"
;
type
=
type
||
"fx"
;
...
@@ -2688,7 +2688,7 @@ jQuery.extend({
...
@@ -2688,7 +2688,7 @@ jQuery.extend({
tabIndex
:
{
tabIndex
:
{
get
:
function
(
elem
)
{
get
:
function
(
elem
)
{
// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
// http
s
://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
var
attributeNode
=
elem
.
getAttributeNode
(
"tabindex"
);
var
attributeNode
=
elem
.
getAttributeNode
(
"tabindex"
);
return
attributeNode
&&
attributeNode
.
specified
?
return
attributeNode
&&
attributeNode
.
specified
?
...
@@ -3551,7 +3551,7 @@ function returnTrue() {
...
@@ -3551,7 +3551,7 @@ function returnTrue() {
}
}
// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
// http
s
://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
jQuery
.
Event
.
prototype
=
{
jQuery
.
Event
.
prototype
=
{
preventDefault
:
function
()
{
preventDefault
:
function
()
{
this
.
isDefaultPrevented
=
returnTrue
;
this
.
isDefaultPrevented
=
returnTrue
;
...
@@ -3941,7 +3941,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
...
@@ -3941,7 +3941,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
* Sizzle CSS Selector Engine
* Sizzle CSS Selector Engine
* Copyright 2011, The Dojo Foundation
* Copyright 2011, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
* Released under the MIT, BSD, and GPL Licenses.
* More information: http://sizzlejs.com/
* More information: http
s
://sizzlejs.com/
*/
*/
(
function
(){
(
function
(){
...
@@ -6298,7 +6298,7 @@ function findInputs( elem ) {
...
@@ -6298,7 +6298,7 @@ function findInputs( elem ) {
}
}
}
}
// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
// Derived From: http
s
://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
function
shimCloneNode
(
elem
)
{
function
shimCloneNode
(
elem
)
{
var
div
=
document
.
createElement
(
"div"
);
var
div
=
document
.
createElement
(
"div"
);
safeFragment
.
appendChild
(
div
);
safeFragment
.
appendChild
(
div
);
...
@@ -6735,7 +6735,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
...
@@ -6735,7 +6735,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
// A tribute to the "awesome hack by Dean Edwards"
// A tribute to the "awesome hack by Dean Edwards"
// WebKit uses "computed value (percentage if specified)" instead of "used value" for margins
// WebKit uses "computed value (percentage if specified)" instead of "used value" for margins
// which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
// which is against the CSSOM draft spec: http
s
://dev.w3.org/csswg/cssom/#resolved-values
if
(
!
jQuery
.
support
.
pixelMargin
&&
computedStyle
&&
rmargin
.
test
(
name
)
&&
rnumnonpx
.
test
(
ret
)
)
{
if
(
!
jQuery
.
support
.
pixelMargin
&&
computedStyle
&&
rmargin
.
test
(
name
)
&&
rnumnonpx
.
test
(
ret
)
)
{
width
=
style
.
width
;
width
=
style
.
width
;
style
.
width
=
ret
;
style
.
width
=
ret
;
...
@@ -8250,7 +8250,7 @@ if ( jQuery.support.ajax ) {
...
@@ -8250,7 +8250,7 @@ if ( jQuery.support.ajax ) {
// Firefox throws exceptions when accessing properties
// Firefox throws exceptions when accessing properties
// of an xhr when a network error occured
// of an xhr when a network error occured
// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
// http
s
://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
try
{
try
{
// Was never called and is aborted or complete
// Was never called and is aborted or complete
...
...
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery.validate.js
View file @
189eeefb
This diff is collapsed.
Click to expand it.
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html
View file @
189eeefb
<!DOCTYPE html>
<!DOCTYPE html>
<html
xmlns:th=
"http://www.thymeleaf.org"
<html
xmlns:th=
"http
s
://www.thymeleaf.org"
xmlns:layout=
"http
://www.ultraq.net.nz/thymeleaf/layou
t"
>
xmlns:layout=
"http
s://github.com/ultraq/thymeleaf-layout-dialec
t"
>
<head>
<head>
<title>
Layout
</title>
<title>
Layout
</title>
<link
rel=
"stylesheet"
th:href=
"@{/css/bootstrap.min.css}"
<link
rel=
"stylesheet"
th:href=
"@{/css/bootstrap.min.css}"
...
...
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/form.html
View file @
189eeefb
<!DOCTYPE html>
<!DOCTYPE html>
<html
xmlns:th=
"http://www.thymeleaf.org"
<html
xmlns:th=
"http
s
://www.thymeleaf.org"
xmlns:layout=
"http
://www.ultraq.net.nz/thymeleaf/layou
t"
xmlns:layout=
"http
s://github.com/ultraq/thymeleaf-layout-dialec
t"
layout:decorate=
"layout"
>
layout:decorate=
"layout"
>
<head>
<head>
<title>
Messages : Create
</title>
<title>
Messages : Create
</title>
...
...
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html
View file @
189eeefb
<!DOCTYPE html>
<!DOCTYPE html>
<html
xmlns:th=
"http://www.thymeleaf.org"
<html
xmlns:th=
"http
s
://www.thymeleaf.org"
xmlns:layout=
"http
://www.ultraq.net.nz/thymeleaf/layou
t"
xmlns:layout=
"http
s://github.com/ultraq/thymeleaf-layout-dialec
t"
layout:decorate=
"layout"
>
layout:decorate=
"layout"
>
<head>
<head>
<title>
Messages : View all
</title>
<title>
Messages : View all
</title>
...
...
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html
View file @
189eeefb
<html
xmlns:th=
"http://www.thymeleaf.org"
<html
xmlns:th=
"http
s
://www.thymeleaf.org"
xmlns:layout=
"http
://www.ultraq.net.nz/thymeleaf/layou
t"
xmlns:layout=
"http
s://github.com/ultraq/thymeleaf-layout-dialec
t"
layout:decorate=
"layout"
>
layout:decorate=
"layout"
>
<head>
<head>
<title>
Messages : View
</title>
<title>
Messages : View
</title>
...
...
spring-boot-starters/README.adoc
View file @
189eeefb
...
@@ -46,7 +46,7 @@ do as they were designed before this was clarified.
...
@@ -46,7 +46,7 @@ do as they were designed before this was clarified.
| https://code.google.com/p/wro4j/[WRO4J]
| https://code.google.com/p/wro4j/[WRO4J]
| https://github.com/sbuettner/spring-boot-autoconfigure-wro4j
| https://github.com/sbuettner/spring-boot-autoconfigure-wro4j
| http://alexo.github.io/wro4j/[Wro4j] (Advanced usage)
| http
s
://alexo.github.io/wro4j/[Wro4j] (Advanced usage)
| https://github.com/michael-simons/wro4j-spring-boot-starter
| https://github.com/michael-simons/wro4j-spring-boot-starter
| https://projects.spring.io/spring-batch/[Spring Batch] (Advanced usage)
| https://projects.spring.io/spring-batch/[Spring Batch] (Advanced usage)
...
@@ -70,13 +70,13 @@ do as they were designed before this was clarified.
...
@@ -70,13 +70,13 @@ do as they were designed before this was clarified.
| https://cloudant.com/[Cloudant]
| https://cloudant.com/[Cloudant]
| https://github.com/icha024/cloudant-spring-boot-starter
| https://github.com/icha024/cloudant-spring-boot-starter
| http://www.grpc.io/[gRPC]
| http
s
://www.grpc.io/[gRPC]
| https://github.com/LogNet/grpc-spring-boot-starter
| https://github.com/LogNet/grpc-spring-boot-starter
| https://github.com/facebook/nifty[Nifty] (Thrift on Netty)
| https://github.com/facebook/nifty[Nifty] (Thrift on Netty)
| https://github.com/bigdullrock/nifty-spring-boot-starter
| https://github.com/bigdullrock/nifty-spring-boot-starter
| http://www.couchbase.com/[Couchbase] HTTP session
| http
s
://www.couchbase.com/[Couchbase] HTTP session
| https://github.com/mkopylec/session-couchbase-spring-boot-starter
| https://github.com/mkopylec/session-couchbase-spring-boot-starter
| https://github.com/oembedler/spring-graphql-common[Spring GraphQL] (GraphQL and GraphiQL)
| https://github.com/oembedler/spring-graphql-common[Spring GraphQL] (GraphQL and GraphiQL)
...
@@ -91,16 +91,16 @@ do as they were designed before this was clarified.
...
@@ -91,16 +91,16 @@ do as they were designed before this was clarified.
| http://ff4j.org/[Feature Flipping For Java (FF4J)]
| http://ff4j.org/[Feature Flipping For Java (FF4J)]
| https://github.com/clun/ff4j/
| https://github.com/clun/ff4j/
| http://resteasy.jboss.org/[RESTEasy]
| http
s
://resteasy.jboss.org/[RESTEasy]
| https://github.com/paypal/resteasy-spring-boot
| https://github.com/paypal/resteasy-spring-boot
| JSF (http
://primefaces.org/[PrimeFaces], http://primefaces-extensions.github.io/[PrimeFaces Extensions], http://bootsfaces.net/[BootsFaces], http://butterfaces.org/[ButterFaces], http://omnifaces.org/[OmniFaces], http://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and http
://myfaces.apache.org[MyFaces])
| JSF (http
s://primefaces.org/[PrimeFaces], https://primefaces-extensions.github.io/[PrimeFaces Extensions], https://bootsfaces.net/[BootsFaces], http://butterfaces.org/[ButterFaces], https://omnifaces.org/[OmniFaces], https://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and https
://myfaces.apache.org[MyFaces])
| http://joinfaces.org
| http://joinfaces.org
| Charon reverse proxy
| Charon reverse proxy
| https://github.com/mkopylec/charon-spring-boot-starter
| https://github.com/mkopylec/charon-spring-boot-starter
| http://w
ww.wiremock.org
[WireMock] and Spring REST Docs
| http://w
iremock.org/
[WireMock] and Spring REST Docs
| https://github.com/ePages-de/restdocs-wiremock
| https://github.com/ePages-de/restdocs-wiremock
| https://cxf.apache.org/docs/springboot.html[Apache CXF]
| https://cxf.apache.org/docs/springboot.html[Apache CXF]
...
@@ -109,13 +109,13 @@ do as they were designed before this was clarified.
...
@@ -109,13 +109,13 @@ do as they were designed before this was clarified.
| LDAP
| LDAP
| https://github.com/eddumelendez/ldap-spring-boot
| https://github.com/eddumelendez/ldap-spring-boot
| http://infinispan.org/[Infinispan]
| http
s
://infinispan.org/[Infinispan]
| https://github.com/infinispan/infinispan-spring-boot
| https://github.com/infinispan/infinispan-spring-boot
| http://restfb.com/[RestFB] Messenger
| http
s
://restfb.com/[RestFB] Messenger
| https://github.com/marsbits/restfbmessenger
| https://github.com/marsbits/restfbmessenger
| http://square.github.io/okhttp/[OkHttp]
| http
s
://square.github.io/okhttp/[OkHttp]
| https://github.com/freefair/okhttp-spring-boot
| https://github.com/freefair/okhttp-spring-boot
|===
|===
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AnotherExampleRestClient.java
View file @
189eeefb
...
@@ -31,7 +31,7 @@ public class AnotherExampleRestClient {
...
@@ -31,7 +31,7 @@ public class AnotherExampleRestClient {
private
RestTemplate
restTemplate
;
private
RestTemplate
restTemplate
;
public
AnotherExampleRestClient
(
RestTemplateBuilder
builder
)
{
public
AnotherExampleRestClient
(
RestTemplateBuilder
builder
)
{
this
.
restTemplate
=
builder
.
rootUri
(
"http://example.com"
).
build
();
this
.
restTemplate
=
builder
.
rootUri
(
"http
s
://example.com"
).
build
();
}
}
protected
RestTemplate
getRestTemplate
()
{
protected
RestTemplate
getRestTemplate
()
{
...
...
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleRestClient.java
View file @
189eeefb
...
@@ -31,7 +31,7 @@ public class ExampleRestClient {
...
@@ -31,7 +31,7 @@ public class ExampleRestClient {
private
RestTemplate
restTemplate
;
private
RestTemplate
restTemplate
;
public
ExampleRestClient
(
RestTemplateBuilder
builder
)
{
public
ExampleRestClient
(
RestTemplateBuilder
builder
)
{
this
.
restTemplate
=
builder
.
rootUri
(
"http://example.com"
).
build
();
this
.
restTemplate
=
builder
.
rootUri
(
"http
s
://example.com"
).
build
();
}
}
protected
RestTemplate
getRestTemplate
()
{
protected
RestTemplate
getRestTemplate
()
{
...
...
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java
View file @
189eeefb
...
@@ -36,7 +36,7 @@ class HateoasController {
...
@@ -36,7 +36,7 @@ class HateoasController {
@RequestMapping
(
"/resource"
)
@RequestMapping
(
"/resource"
)
public
Resource
<
Map
<
String
,
String
>>
resource
()
{
public
Resource
<
Map
<
String
,
String
>>
resource
()
{
return
new
Resource
<
Map
<
String
,
String
>>(
new
HashMap
<
String
,
String
>(),
return
new
Resource
<
Map
<
String
,
String
>>(
new
HashMap
<
String
,
String
>(),
new
Link
(
"self"
,
"http://api.example.com"
));
new
Link
(
"self"
,
"http
s
://api.example.com"
));
}
}
@RequestMapping
(
"/plain"
)
@RequestMapping
(
"/plain"
)
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java
View file @
189eeefb
...
@@ -41,7 +41,7 @@ import org.springframework.web.util.UriTemplateHandler;
...
@@ -41,7 +41,7 @@ import org.springframework.web.util.UriTemplateHandler;
* {@link RequestExpectationManager} that strips the specified root URI from the request
* {@link RequestExpectationManager} that strips the specified root URI from the request
* before verification. Can be used to simply test declarations when all REST calls start
* before verification. Can be used to simply test declarations when all REST calls start
* the same way. For example: <pre class="code">
* the same way. For example: <pre class="code">
* RestTemplate restTemplate = new RestTemplateBuilder().rootUri("http://example.com").build();
* RestTemplate restTemplate = new RestTemplateBuilder().rootUri("http
s
://example.com").build();
* MockRestServiceServer server = RootUriRequestExpectationManager.bindTo(restTemplate);
* MockRestServiceServer server = RootUriRequestExpectationManager.bindTo(restTemplate);
* server.expect(requestTo("/hello")).andRespond(withSuccess());
* server.expect(requestTo("/hello")).andRespond(withSuccess());
* restTemplate.getForEntity("/hello", String.class);
* restTemplate.getForEntity("/hello", String.class);
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View file @
189eeefb
...
@@ -791,7 +791,7 @@ public class TestRestTemplate {
...
@@ -791,7 +791,7 @@ public class TestRestTemplate {
* {@link ParameterizedTypeReference} is used to pass generic type information:
* {@link ParameterizedTypeReference} is used to pass generic type information:
* <pre class="code">
* <pre class="code">
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
* ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
* ResponseEntity<List<MyBean>> response = template.exchange("http
s
://example.com",HttpMethod.GET, null, myBean);
* </pre>
* </pre>
* @param url the URL
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
* @param method the HTTP method (GET, POST, etc)
...
@@ -819,7 +819,7 @@ public class TestRestTemplate {
...
@@ -819,7 +819,7 @@ public class TestRestTemplate {
* {@link ParameterizedTypeReference} is used to pass generic type information:
* {@link ParameterizedTypeReference} is used to pass generic type information:
* <pre class="code">
* <pre class="code">
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
* ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
* ResponseEntity<List<MyBean>> response = template.exchange("http
s
://example.com",HttpMethod.GET, null, myBean);
* </pre>
* </pre>
* @param url the URL
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
* @param method the HTTP method (GET, POST, etc)
...
@@ -847,7 +847,7 @@ public class TestRestTemplate {
...
@@ -847,7 +847,7 @@ public class TestRestTemplate {
* {@link ParameterizedTypeReference} is used to pass generic type information:
* {@link ParameterizedTypeReference} is used to pass generic type information:
* <pre class="code">
* <pre class="code">
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
* ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
* ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
* ResponseEntity<List<MyBean>> response = template.exchange("http
s
://example.com",HttpMethod.GET, null, myBean);
* </pre>
* </pre>
* @param url the URL
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
* @param method the HTTP method (GET, POST, etc)
...
@@ -873,7 +873,7 @@ public class TestRestTemplate {
...
@@ -873,7 +873,7 @@ public class TestRestTemplate {
* response as {@link ResponseEntity}. Typically used in combination with the static
* response as {@link ResponseEntity}. Typically used in combination with the static
* builder methods on {@code RequestEntity}, for instance: <pre class="code">
* builder methods on {@code RequestEntity}, for instance: <pre class="code">
* MyRequest body = ...
* MyRequest body = ...
* RequestEntity request = RequestEntity.post(new URI("http://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
* RequestEntity request = RequestEntity.post(new URI("http
s
://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
* ResponseEntity<MyResponse> response = template.exchange(request, MyResponse.class);
* ResponseEntity<MyResponse> response = template.exchange(request, MyResponse.class);
* </pre>
* </pre>
* @param requestEntity the entity to write to the request
* @param requestEntity the entity to write to the request
...
@@ -894,7 +894,7 @@ public class TestRestTemplate {
...
@@ -894,7 +894,7 @@ public class TestRestTemplate {
* response as {@link ResponseEntity}. The given {@link ParameterizedTypeReference} is
* response as {@link ResponseEntity}. The given {@link ParameterizedTypeReference} is
* used to pass generic type information: <pre class="code">
* used to pass generic type information: <pre class="code">
* MyRequest body = ...
* MyRequest body = ...
* RequestEntity request = RequestEntity.post(new URI("http://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
* RequestEntity request = RequestEntity.post(new URI("http
s
://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
* ParameterizedTypeReference<List<MyResponse>> myBean = new ParameterizedTypeReference<List<MyResponse>>() {};
* ParameterizedTypeReference<List<MyResponse>> myBean = new ParameterizedTypeReference<List<MyResponse>>() {};
* ResponseEntity<List<MyResponse>> response = template.exchange(request, myBean);
* ResponseEntity<List<MyResponse>> response = template.exchange(request, myBean);
* </pre>
* </pre>
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
View file @
189eeefb
...
@@ -78,7 +78,7 @@ public class MockServerRestTemplateCustomizerTests {
...
@@ -78,7 +78,7 @@ public class MockServerRestTemplateCustomizerTests {
MockServerRestTemplateCustomizer
customizer
=
new
MockServerRestTemplateCustomizer
(
MockServerRestTemplateCustomizer
customizer
=
new
MockServerRestTemplateCustomizer
(
UnorderedRequestExpectationManager
.
class
);
UnorderedRequestExpectationManager
.
class
);
customizer
.
customize
(
customizer
.
customize
(
new
RestTemplateBuilder
().
rootUri
(
"http://example.com"
).
build
());
new
RestTemplateBuilder
().
rootUri
(
"http
s
://example.com"
).
build
());
assertThat
(
customizer
.
getServer
()).
extracting
(
"expectationManager"
)
assertThat
(
customizer
.
getServer
()).
extracting
(
"expectationManager"
)
.
hasAtLeastOneElementOfType
(
RootUriRequestExpectationManager
.
class
);
.
hasAtLeastOneElementOfType
(
RootUriRequestExpectationManager
.
class
);
}
}
...
@@ -87,7 +87,7 @@ public class MockServerRestTemplateCustomizerTests {
...
@@ -87,7 +87,7 @@ public class MockServerRestTemplateCustomizerTests {
public
void
setDetectRootUriShouldDisableRootUriDetection
()
throws
Exception
{
public
void
setDetectRootUriShouldDisableRootUriDetection
()
throws
Exception
{
this
.
customizer
.
setDetectRootUri
(
false
);
this
.
customizer
.
setDetectRootUri
(
false
);
this
.
customizer
.
customize
(
this
.
customizer
.
customize
(
new
RestTemplateBuilder
().
rootUri
(
"http://example.com"
).
build
());
new
RestTemplateBuilder
().
rootUri
(
"http
s
://example.com"
).
build
());
assertThat
(
this
.
customizer
.
getServer
()).
extracting
(
"expectationManager"
)
assertThat
(
this
.
customizer
.
getServer
()).
extracting
(
"expectationManager"
)
.
hasAtLeastOneElementOfType
(
SimpleRequestExpectationManager
.
class
);
.
hasAtLeastOneElementOfType
(
SimpleRequestExpectationManager
.
class
);
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
View file @
189eeefb
...
@@ -54,7 +54,7 @@ public class RootUriRequestExpectationManagerTests {
...
@@ -54,7 +54,7 @@ public class RootUriRequestExpectationManagerTests {
@Rule
@Rule
public
ExpectedException
thrown
=
ExpectedException
.
none
();
public
ExpectedException
thrown
=
ExpectedException
.
none
();
private
String
uri
=
"http://example.com"
;
private
String
uri
=
"http
s
://example.com"
;
@Mock
@Mock
private
RequestExpectationManager
delegate
;
private
RequestExpectationManager
delegate
;
...
@@ -97,7 +97,7 @@ public class RootUriRequestExpectationManagerTests {
...
@@ -97,7 +97,7 @@ public class RootUriRequestExpectationManagerTests {
public
void
validateRequestWhenUriDoesNotStartWithRootUriShouldDelegateToExpectationManager
()
public
void
validateRequestWhenUriDoesNotStartWithRootUriShouldDelegateToExpectationManager
()
throws
Exception
{
throws
Exception
{
ClientHttpRequest
request
=
mock
(
ClientHttpRequest
.
class
);
ClientHttpRequest
request
=
mock
(
ClientHttpRequest
.
class
);
given
(
request
.
getURI
()).
willReturn
(
new
URI
(
"http://spring.io/test"
));
given
(
request
.
getURI
()).
willReturn
(
new
URI
(
"http
s
://spring.io/test"
));
this
.
manager
.
validateRequest
(
request
);
this
.
manager
.
validateRequest
(
request
);
verify
(
this
.
delegate
).
validateRequest
(
request
);
verify
(
this
.
delegate
).
validateRequest
(
request
);
}
}
...
@@ -121,9 +121,9 @@ public class RootUriRequestExpectationManagerTests {
...
@@ -121,9 +121,9 @@ public class RootUriRequestExpectationManagerTests {
given
(
request
.
getURI
()).
willReturn
(
new
URI
(
this
.
uri
+
"/hello"
));
given
(
request
.
getURI
()).
willReturn
(
new
URI
(
this
.
uri
+
"/hello"
));
given
(
this
.
delegate
.
validateRequest
((
ClientHttpRequest
)
any
()))
given
(
this
.
delegate
.
validateRequest
((
ClientHttpRequest
)
any
()))
.
willThrow
(
new
AssertionError
(
.
willThrow
(
new
AssertionError
(
"Request URI expected:</hello> was:<http://example.com/bad>"
));
"Request URI expected:</hello> was:<http
s
://example.com/bad>"
));
this
.
thrown
.
expect
(
AssertionError
.
class
);
this
.
thrown
.
expect
(
AssertionError
.
class
);
this
.
thrown
.
expectMessage
(
"Request URI expected:<http://example.com/hello>"
);
this
.
thrown
.
expectMessage
(
"Request URI expected:<http
s
://example.com/hello>"
);
this
.
manager
.
validateRequest
(
request
);
this
.
manager
.
validateRequest
(
request
);
}
}
...
@@ -172,7 +172,7 @@ public class RootUriRequestExpectationManagerTests {
...
@@ -172,7 +172,7 @@ public class RootUriRequestExpectationManagerTests {
@Test
@Test
public
void
boundRestTemplateShouldPrefixRootUri
()
{
public
void
boundRestTemplateShouldPrefixRootUri
()
{
RestTemplate
restTemplate
=
new
RestTemplateBuilder
()
RestTemplate
restTemplate
=
new
RestTemplateBuilder
()
.
rootUri
(
"http://example.com"
).
build
();
.
rootUri
(
"http
s
://example.com"
).
build
();
MockRestServiceServer
server
=
RootUriRequestExpectationManager
MockRestServiceServer
server
=
RootUriRequestExpectationManager
.
bindTo
(
restTemplate
);
.
bindTo
(
restTemplate
);
server
.
expect
(
requestTo
(
"/hello"
)).
andRespond
(
withSuccess
());
server
.
expect
(
requestTo
(
"/hello"
)).
andRespond
(
withSuccess
());
...
@@ -182,14 +182,14 @@ public class RootUriRequestExpectationManagerTests {
...
@@ -182,14 +182,14 @@ public class RootUriRequestExpectationManagerTests {
@Test
@Test
public
void
boundRestTemplateWhenUrlIncludesDomainShouldNotPrefixRootUri
()
{
public
void
boundRestTemplateWhenUrlIncludesDomainShouldNotPrefixRootUri
()
{
RestTemplate
restTemplate
=
new
RestTemplateBuilder
()
RestTemplate
restTemplate
=
new
RestTemplateBuilder
()
.
rootUri
(
"http://example.com"
).
build
();
.
rootUri
(
"http
s
://example.com"
).
build
();
MockRestServiceServer
server
=
RootUriRequestExpectationManager
MockRestServiceServer
server
=
RootUriRequestExpectationManager
.
bindTo
(
restTemplate
);
.
bindTo
(
restTemplate
);
server
.
expect
(
requestTo
(
"/hello"
)).
andRespond
(
withSuccess
());
server
.
expect
(
requestTo
(
"/hello"
)).
andRespond
(
withSuccess
());
this
.
thrown
.
expect
(
AssertionError
.
class
);
this
.
thrown
.
expect
(
AssertionError
.
class
);
this
.
thrown
.
expectMessage
(
this
.
thrown
.
expectMessage
(
"expected:<http
://example.com/hello> but was:<http
://spring.io/hello>"
);
"expected:<http
s://example.com/hello> but was:<https
://spring.io/hello>"
);
restTemplate
.
getForEntity
(
"http://spring.io/hello"
,
String
.
class
);
restTemplate
.
getForEntity
(
"http
s
://spring.io/hello"
,
String
.
class
);
}
}
}
}
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
View file @
189eeefb
...
@@ -27,7 +27,7 @@ import org.springframework.boot.loader.data.RandomAccessData;
...
@@ -27,7 +27,7 @@ import org.springframework.boot.loader.data.RandomAccessData;
*
*
* @author Phillip Webb
* @author Phillip Webb
* @author Andy Wilkinson
* @author Andy Wilkinson
* @see <a href="http
://en.wikipedia.org/wiki/Zip_%28file_format%
29">Zip File Format</a>
* @see <a href="http
s://en.wikipedia.org/wiki/Zip_%2528file_format%25
29">Zip File Format</a>
*/
*/
final
class
CentralDirectoryFileHeader
implements
FileHeader
{
final
class
CentralDirectoryFileHeader
implements
FileHeader
{
...
...
spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
View file @
189eeefb
...
@@ -121,7 +121,7 @@ public final class AnsiColors {
...
@@ -121,7 +121,7 @@ public final class AnsiColors {
:
(
1.0
/
3.0
)
*
Math
.
pow
(
29.0
/
6.0
,
2
)
*
t
+
(
4.0
/
29.0
));
:
(
1.0
/
3.0
)
*
Math
.
pow
(
29.0
/
6.0
,
2
)
*
t
+
(
4.0
/
29.0
));
}
}
// See http://en.wikipedia.org/wiki/Color_difference#CIE94
// See http
s
://en.wikipedia.org/wiki/Color_difference#CIE94
public
double
getDistance
(
LabColor
other
)
{
public
double
getDistance
(
LabColor
other
)
{
double
c1
=
Math
.
sqrt
(
this
.
a
*
this
.
a
+
this
.
b
*
this
.
b
);
double
c1
=
Math
.
sqrt
(
this
.
a
*
this
.
a
+
this
.
b
*
this
.
b
);
double
deltaC
=
c1
-
Math
.
sqrt
(
other
.
a
*
other
.
a
+
other
.
b
*
other
.
b
);
double
deltaC
=
c1
-
Math
.
sqrt
(
other
.
a
*
other
.
a
+
other
.
b
*
other
.
b
);
...
...
spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
View file @
189eeefb
...
@@ -111,9 +111,9 @@ public class RestTemplateBuilderTests {
...
@@ -111,9 +111,9 @@ public class RestTemplateBuilderTests {
@Test
@Test
public
void
rootUriShouldApply
()
throws
Exception
{
public
void
rootUriShouldApply
()
throws
Exception
{
RestTemplate
restTemplate
=
this
.
builder
.
rootUri
(
"http://example.com"
).
build
();
RestTemplate
restTemplate
=
this
.
builder
.
rootUri
(
"http
s
://example.com"
).
build
();
MockRestServiceServer
server
=
MockRestServiceServer
.
bindTo
(
restTemplate
).
build
();
MockRestServiceServer
server
=
MockRestServiceServer
.
bindTo
(
restTemplate
).
build
();
server
.
expect
(
requestTo
(
"http://example.com/hello"
)).
andRespond
(
withSuccess
());
server
.
expect
(
requestTo
(
"http
s
://example.com/hello"
)).
andRespond
(
withSuccess
());
restTemplate
.
getForEntity
(
"/hello"
,
String
.
class
);
restTemplate
.
getForEntity
(
"/hello"
,
String
.
class
);
server
.
verify
();
server
.
verify
();
}
}
...
@@ -122,11 +122,11 @@ public class RestTemplateBuilderTests {
...
@@ -122,11 +122,11 @@ public class RestTemplateBuilderTests {
public
void
rootUriShouldApplyAfterUriTemplateHandler
()
throws
Exception
{
public
void
rootUriShouldApplyAfterUriTemplateHandler
()
throws
Exception
{
UriTemplateHandler
uriTemplateHandler
=
mock
(
UriTemplateHandler
.
class
);
UriTemplateHandler
uriTemplateHandler
=
mock
(
UriTemplateHandler
.
class
);
RestTemplate
template
=
this
.
builder
.
uriTemplateHandler
(
uriTemplateHandler
)
RestTemplate
template
=
this
.
builder
.
uriTemplateHandler
(
uriTemplateHandler
)
.
rootUri
(
"http://example.com"
).
build
();
.
rootUri
(
"http
s
://example.com"
).
build
();
UriTemplateHandler
handler
=
template
.
getUriTemplateHandler
();
UriTemplateHandler
handler
=
template
.
getUriTemplateHandler
();
handler
.
expand
(
"/hello"
);
handler
.
expand
(
"/hello"
);
assertThat
(
handler
).
isInstanceOf
(
RootUriTemplateHandler
.
class
);
assertThat
(
handler
).
isInstanceOf
(
RootUriTemplateHandler
.
class
);
verify
(
uriTemplateHandler
).
expand
(
"http://example.com/hello"
);
verify
(
uriTemplateHandler
).
expand
(
"http
s
://example.com/hello"
);
}
}
@Test
@Test
...
...
spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
View file @
189eeefb
...
@@ -58,8 +58,8 @@ public class RootUriTemplateHandlerTests {
...
@@ -58,8 +58,8 @@ public class RootUriTemplateHandlerTests {
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
public
void
setup
()
throws
URISyntaxException
{
public
void
setup
()
throws
URISyntaxException
{
MockitoAnnotations
.
initMocks
(
this
);
MockitoAnnotations
.
initMocks
(
this
);
this
.
uri
=
new
URI
(
"http://example.com/hello"
);
this
.
uri
=
new
URI
(
"http
s
://example.com/hello"
);
this
.
handler
=
new
RootUriTemplateHandler
(
"http://example.com"
,
this
.
delegate
);
this
.
handler
=
new
RootUriTemplateHandler
(
"http
s
://example.com"
,
this
.
delegate
);
given
(
this
.
delegate
.
expand
(
anyString
(),
anyMap
())).
willReturn
(
this
.
uri
);
given
(
this
.
delegate
.
expand
(
anyString
(),
anyMap
())).
willReturn
(
this
.
uri
);
given
(
this
.
delegate
.
expand
(
anyString
(),
(
Object
[])
anyVararg
()))
given
(
this
.
delegate
.
expand
(
anyString
(),
(
Object
[])
anyVararg
()))
.
willReturn
(
this
.
uri
);
.
willReturn
(
this
.
uri
);
...
@@ -76,14 +76,14 @@ public class RootUriTemplateHandlerTests {
...
@@ -76,14 +76,14 @@ public class RootUriTemplateHandlerTests {
public
void
createWithNullHandlerShouldThrowException
()
throws
Exception
{
public
void
createWithNullHandlerShouldThrowException
()
throws
Exception
{
this
.
thrown
.
expect
(
IllegalArgumentException
.
class
);
this
.
thrown
.
expect
(
IllegalArgumentException
.
class
);
this
.
thrown
.
expectMessage
(
"Handler must not be null"
);
this
.
thrown
.
expectMessage
(
"Handler must not be null"
);
new
RootUriTemplateHandler
(
"http://example.com"
,
null
);
new
RootUriTemplateHandler
(
"http
s
://example.com"
,
null
);
}
}
@Test
@Test
public
void
expandMapVariablesShouldPrefixRoot
()
throws
Exception
{
public
void
expandMapVariablesShouldPrefixRoot
()
throws
Exception
{
HashMap
<
String
,
Object
>
uriVariables
=
new
HashMap
<
String
,
Object
>();
HashMap
<
String
,
Object
>
uriVariables
=
new
HashMap
<
String
,
Object
>();
URI
expanded
=
this
.
handler
.
expand
(
"/hello"
,
uriVariables
);
URI
expanded
=
this
.
handler
.
expand
(
"/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http://example.com/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http
s
://example.com/hello"
,
uriVariables
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
}
}
...
@@ -91,8 +91,8 @@ public class RootUriTemplateHandlerTests {
...
@@ -91,8 +91,8 @@ public class RootUriTemplateHandlerTests {
public
void
expandMapVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot
()
public
void
expandMapVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot
()
throws
Exception
{
throws
Exception
{
HashMap
<
String
,
Object
>
uriVariables
=
new
HashMap
<
String
,
Object
>();
HashMap
<
String
,
Object
>
uriVariables
=
new
HashMap
<
String
,
Object
>();
URI
expanded
=
this
.
handler
.
expand
(
"http://spring.io/hello"
,
uriVariables
);
URI
expanded
=
this
.
handler
.
expand
(
"http
s
://spring.io/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http://spring.io/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http
s
://spring.io/hello"
,
uriVariables
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
}
}
...
@@ -100,7 +100,7 @@ public class RootUriTemplateHandlerTests {
...
@@ -100,7 +100,7 @@ public class RootUriTemplateHandlerTests {
public
void
expandArrayVariablesShouldPrefixRoot
()
throws
Exception
{
public
void
expandArrayVariablesShouldPrefixRoot
()
throws
Exception
{
Object
[]
uriVariables
=
new
Object
[
0
];
Object
[]
uriVariables
=
new
Object
[
0
];
URI
expanded
=
this
.
handler
.
expand
(
"/hello"
,
uriVariables
);
URI
expanded
=
this
.
handler
.
expand
(
"/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http://example.com/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http
s
://example.com/hello"
,
uriVariables
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
}
}
...
@@ -108,8 +108,8 @@ public class RootUriTemplateHandlerTests {
...
@@ -108,8 +108,8 @@ public class RootUriTemplateHandlerTests {
public
void
expandArrayVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot
()
public
void
expandArrayVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot
()
throws
Exception
{
throws
Exception
{
Object
[]
uriVariables
=
new
Object
[
0
];
Object
[]
uriVariables
=
new
Object
[
0
];
URI
expanded
=
this
.
handler
.
expand
(
"http://spring.io/hello"
,
uriVariables
);
URI
expanded
=
this
.
handler
.
expand
(
"http
s
://spring.io/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http://spring.io/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http
s
://spring.io/hello"
,
uriVariables
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
}
}
...
@@ -117,10 +117,10 @@ public class RootUriTemplateHandlerTests {
...
@@ -117,10 +117,10 @@ public class RootUriTemplateHandlerTests {
public
void
applyShouldWrapExistingTemplate
()
throws
Exception
{
public
void
applyShouldWrapExistingTemplate
()
throws
Exception
{
RestTemplate
restTemplate
=
new
RestTemplate
();
RestTemplate
restTemplate
=
new
RestTemplate
();
restTemplate
.
setUriTemplateHandler
(
this
.
delegate
);
restTemplate
.
setUriTemplateHandler
(
this
.
delegate
);
this
.
handler
=
RootUriTemplateHandler
.
addTo
(
restTemplate
,
"http://example.com"
);
this
.
handler
=
RootUriTemplateHandler
.
addTo
(
restTemplate
,
"http
s
://example.com"
);
Object
[]
uriVariables
=
new
Object
[
0
];
Object
[]
uriVariables
=
new
Object
[
0
];
URI
expanded
=
this
.
handler
.
expand
(
"/hello"
,
uriVariables
);
URI
expanded
=
this
.
handler
.
expand
(
"/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http://example.com/hello"
,
uriVariables
);
verify
(
this
.
delegate
).
expand
(
"http
s
://example.com/hello"
,
uriVariables
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
assertThat
(
expanded
).
isEqualTo
(
this
.
uri
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment