Skip to content

Commit 7817789

Browse files
Spring Operatorgregturn
Spring Operator
authored andcommitted
#910 - URL Cleanup.
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://alps.io (200) with 1 occurrences could not be migrated: ([https](https://alps.io) result AnnotatedConnectException). * [ ] http://alps.io/spec/ (200) with 6 occurrences could not be migrated: ([https](https://alps.io/spec/) result AnnotatedConnectException). * [ ] http://stateless.co/hal_specification.html (200) with 2 occurrences could not be migrated: ([https](https://stateless.co/hal_specification.html) result SSLHandshakeException). * [ ] http://foo.com/bar (301) with 4 occurrences could not be migrated: ([https](https://foo.com/bar) result SSLHandshakeException). * [ ] http://www.csse.monash.edu.au/~damian/papers/HTML/Plurals.html (302) with 1 occurrences could not be migrated: ([https](https://www.csse.monash.edu.au/~damian/papers/HTML/Plurals.html) result SSLHandshakeException). * [ ] http://alps.io/ext/range (404) with 2 occurrences could not be migrated: ([https](https://alps.io/ext/range) result AnnotatedConnectException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://tools.ietf.org/html/draft-kelly-json-hal (301) with 2 occurrences migrated to: https://tools.ietf.org/html/draft-kelly-json-hal ([https](https://tools.ietf.org/html/draft-kelly-json-hal) result ReadTimeoutException). * [ ] http://acme.com/rels/foo-bar (404) with 2 occurrences migrated to: https://acme.com/rels/foo-bar ([https](https://acme.com/rels/foo-bar) result 404). * [ ] http://docs.spring.io/spring-hateoas/docs/current-SNAPSHOT/api/ (301) with 1 occurrences migrated to: https://docs.spring.io/spring-hateoas/docs/current-SNAPSHOT/api/ ([https](https://docs.spring.io/spring-hateoas/docs/current-SNAPSHOT/api/) result 404). * [ ] http://example.com/custom/deprecated (404) with 1 occurrences migrated to: https://example.com/custom/deprecated ([https](https://example.com/custom/deprecated) result 404). * [ ] http://example.com/customers/deprecated (404) with 2 occurrences migrated to: https://example.com/customers/deprecated ([https](https://example.com/customers/deprecated) result 404). * [ ] http://example.com/rels/ (404) with 2 occurrences migrated to: https://example.com/rels/ ([https](https://example.com/rels/) result 404). * [ ] http://example.com/rels/persons (404) with 1 occurrences migrated to: https://example.com/rels/persons ([https](https://example.com/rels/persons) result 404). * [ ] http://example.org/samples/full/doc.html (404) with 3 occurrences migrated to: https://example.org/samples/full/doc.html ([https](https://example.org/samples/full/doc.html) result 404). * [ ] http://www.example.com/rels/ (404) with 1 occurrences migrated to: https://www.example.com/rels/ ([https](https://www.example.com/rels/) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://docs.spring.io/spring-hateoas/docs/current/reference/html/ with 1 occurrences migrated to: https://docs.spring.io/spring-hateoas/docs/current/reference/html/ ([https](https://docs.spring.io/spring-hateoas/docs/current/reference/html/) result 200). * [ ] http://docs.spring.io/spring-hateoas/docs/current/reference/pdf/spring-hateoas-reference.pdf with 1 occurrences migrated to: https://docs.spring.io/spring-hateoas/docs/current/reference/pdf/spring-hateoas-reference.pdf ([https](https://docs.spring.io/spring-hateoas/docs/current/reference/pdf/spring-hateoas-reference.pdf) result 200). * [ ] http://en.wikipedia.org/wiki/HATEOAS with 2 occurrences migrated to: https://en.wikipedia.org/wiki/HATEOAS ([https](https://en.wikipedia.org/wiki/HATEOAS) result 200). * [ ] http://projects.spring.io/spring-hateoas/ with 2 occurrences migrated to: https://projects.spring.io/spring-hateoas/ ([https](https://projects.spring.io/spring-hateoas/) result 200). * [ ] http://tools.ietf.org/html/draft-kelly-json-hal-05 with 1 occurrences migrated to: https://tools.ietf.org/html/draft-kelly-json-hal-05 ([https](https://tools.ietf.org/html/draft-kelly-json-hal-05) result 200). * [ ] http://tools.ietf.org/html/rfc6570 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc6570 ([https](https://tools.ietf.org/html/rfc6570) result 200). * [ ] http://tools.ietf.org/html/rfc7239 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc7239 ([https](https://tools.ietf.org/html/rfc7239) result 200). * [ ] http://www.example.com with 2 occurrences migrated to: https://www.example.com ([https](https://www.example.com) result 200). * [ ] http://www.iana.org/assignments/link-relations/link-relations.xhtml with 2 occurrences migrated to: https://www.iana.org/assignments/link-relations/link-relations.xhtml ([https](https://www.iana.org/assignments/link-relations/link-relations.xhtml) result 200). * [ ] http://amazon.com with 4 occurrences migrated to: https://amazon.com ([https](https://amazon.com) result 301). * [ ] http://contributor-covenant.org with 1 occurrences migrated to: https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301). * [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to: https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301). * [ ] http://www.w3.org/TR/curie with 1 occurrences migrated to: https://www.w3.org/TR/curie ([https](https://www.w3.org/TR/curie) result 301). * [ ] http://tools.ietf.org/html/rfc5988=section-4 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc5988=section-4 ([https](https://tools.ietf.org/html/rfc5988=section-4) result 302). * [ ] http://www.springsource.org/download with 1 occurrences migrated to: https://www.springsource.org/download ([https](https://www.springsource.org/download) result 302). # Ignored These URLs were intentionally ignored. * http://barfoo:8888 with 1 occurrences * http://foobar with 1 occurrences * http://foobar:8088 with 1 occurrences * http://foobarhost/ with 1 occurrences * http://foobarhost:9090/ with 1 occurrences * http://localhost with 7 occurrences * http://localhost/ with 1 occurrences * http://localhost/sample/1/foo with 1 occurrences * http://localhost/sample/2/bar with 1 occurrences * http://localhost/something/bar/foo with 1 occurrences * http://localhost:8080/api/ with 1 occurrences * http://localhost:8080/foo with 2 occurrences * http://localhost:8080/rels with 1 occurrences * http://localhost:8080/rels/ with 4 occurrences * http://localhost:8080/something with 4 occurrences * http://localhost:8080/test?page=0&filter=foo,bar with 2 occurrences * http://localhost:8080/your-app with 1 occurrences * http://localhost:8080/your-app/people with 1 occurrences * http://myhost/people with 4 occurrences * http://myhost/person/1 with 1 occurrences * http://myhost/person/1/orders with 1 occurrences * http://proxy1:1443 with 1 occurrences * http://somethingDifferent with 1 occurrences * http://www.w3.org/2005/Atom with 3 occurrences
1 parent 66f833e commit 7817789

18 files changed

+36
-36
lines changed

CODE_OF_CONDUCT.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
2424
All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
2525
Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
2626

27-
This Code of Conduct is adapted from the http://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/].
27+
This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].

readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
[![Spring Hateoas](https://spring.io/badges/spring-hateoas/ga.svg)](http://projects.spring.io/spring-hateoas/#quick-start)
2-
[![Spring Hateoas](https://spring.io/badges/spring-hateoas/snapshot.svg)](http://projects.spring.io/spring-hateoas/#quick-start)
1+
[![Spring Hateoas](https://spring.io/badges/spring-hateoas/ga.svg)](https://projects.spring.io/spring-hateoas/#quick-start)
2+
[![Spring Hateoas](https://spring.io/badges/spring-hateoas/snapshot.svg)](https://projects.spring.io/spring-hateoas/#quick-start)
33

44
# Spring Hateoas
5-
This project provides some APIs to ease creating REST representations that follow the [HATEOAS](http://en.wikipedia.org/wiki/HATEOAS) principle when working with Spring and especially Spring MVC. The core problem it tries to address is link creation and representation assembly.
5+
This project provides some APIs to ease creating REST representations that follow the [HATEOAS](https://en.wikipedia.org/wiki/HATEOAS) principle when working with Spring and especially Spring MVC. The core problem it tries to address is link creation and representation assembly.
66

77
## Resources
88

9-
- Reference documentation - [html](http://docs.spring.io/spring-hateoas/docs/current/reference/html/), [pdf](http://docs.spring.io/spring-hateoas/docs/current/reference/pdf/spring-hateoas-reference.pdf)
10-
- [JavaDoc](http://docs.spring.io/spring-hateoas/docs/current-SNAPSHOT/api/)
9+
- Reference documentation - [html](https://docs.spring.io/spring-hateoas/docs/current/reference/html/), [pdf](https://docs.spring.io/spring-hateoas/docs/current/reference/pdf/spring-hateoas-reference.pdf)
10+
- [JavaDoc](https://docs.spring.io/spring-hateoas/docs/current-SNAPSHOT/api/)
1111
- [Getting started guide](https://spring.io/guides/gs/rest-hateoas/)

src/main/asciidoc/index.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Oliver Gierke; Greg Turnquist; Jay Bryant
55
:toc: left
66
:hide-uri-scheme:
77

8-
This project provides some APIs to ease creating REST representations that follow the http://en.wikipedia.org/wiki/HATEOAS[HATEOAS] principle when working with Spring and especially Spring MVC. The core problem it tries to address is link creation and representation assembly.
8+
This project provides some APIs to ease creating REST representations that follow the https://en.wikipedia.org/wiki/HATEOAS[HATEOAS] principle when working with Spring and especially Spring MVC. The core problem it tries to address is link creation and representation assembly.
99

1010
(C) 2012-2019 The original authors.
1111

@@ -287,7 +287,7 @@ List<PersonResource> resources = assembler.toResources(people);
287287

288288
[[configuration.at-enable]]
289289
=== @EnableHypermediaSupport
290-
To enable the `ResourceSupport` subtypes be rendered according to the specification of various hypermedia representations types, the support for a particular hypermedia representation format can be activated through `@EnableHypermediaSupport`. The annotation takes a `HypermediaType` enumeration as argument. Currently we support http://tools.ietf.org/html/draft-kelly-json-hal[HAL] as well as a default rendering. Using the annotation triggers the following:
290+
To enable the `ResourceSupport` subtypes be rendered according to the specification of various hypermedia representations types, the support for a particular hypermedia representation format can be activated through `@EnableHypermediaSupport`. The annotation takes a `HypermediaType` enumeration as argument. Currently we support https://tools.ietf.org/html/draft-kelly-json-hal[HAL] as well as a default rendering. Using the annotation triggers the following:
291291

292292
* registers necessary Jackson modules to render `Resource`/`Resources` in the hypermedia specific format.
293293
* if JSONPath is on the classpath, it automatically registers a `LinkDiscoverer` instance to lookup links by their `rel` in plain JSON representations (see <<client.link-discoverer>>).
@@ -313,7 +313,7 @@ A `RelProvider` is exposed as Spring bean when using `@EnableHypermediaSupport`
313313
[[spis.curie-provider]]
314314
=== CurieProvider API
315315

316-
The http://tools.ietf.org/html/rfc5988=section-4[Web Linking RFC] describes registered and extension link relation types. Registered rels are well-known strings registered with the http://www.iana.org/assignments/link-relations/link-relations.xhtml[IANA registry of link relation types]. Extension rels can be used by applications that do not wish to register a relation type. They are a URI that uniquely identifies the relation type. The rel URI can be serialized as a compact URI or http://www.w3.org/TR/curie[Curie]. E.g. a curie `ex:persons` stands for the link relation type `http://example.com/rels/persons` if `ex` is defined as `http://example.com/rels/{rels}`. If curies are used, the base URI must be present in the response scope.
316+
The https://tools.ietf.org/html/rfc5988=section-4[Web Linking RFC] describes registered and extension link relation types. Registered rels are well-known strings registered with the https://www.iana.org/assignments/link-relations/link-relations.xhtml[IANA registry of link relation types]. Extension rels can be used by applications that do not wish to register a relation type. They are a URI that uniquely identifies the relation type. The rel URI can be serialized as a compact URI or https://www.w3.org/TR/curie[Curie]. E.g. a curie `ex:persons` stands for the link relation type `https://example.com/rels/persons` if `ex` is defined as `https://example.com/rels/{rels}`. If curies are used, the base URI must be present in the response scope.
317317

318318
The rels created by the default `RelProvider` are extension relation types and as such must be URIs, which can cause a lot of overhead. The `CurieProvider` API takes care of that: it allows to define a base URI as URI template and a prefix which stands for that base URI. If a `CurieProvider` is present, the `RelProvider` prepends all rels with the curie prefix. Furthermore a `curies` link is automatically added to the HAL resource.
319319

@@ -328,7 +328,7 @@ public class Config {
328328
329329
@Bean
330330
public CurieProvider curieProvider() {
331-
return new DefaultCurieProvider("ex", new UriTemplate("http://www.example.com/rels/{rel}"));
331+
return new DefaultCurieProvider("ex", new UriTemplate("https://www.example.com/rels/{rel}"));
332332
}
333333
}
334334
----
@@ -342,7 +342,7 @@ Note that now the prefix `ex:` automatically appears before all rels which are n
342342
"self" : { href: "http://myhost/person/1" },
343343
"curies" : {
344344
"name" : "ex",
345-
"href" : "http://example.com/rels/{rel}",
345+
"href" : "https://example.com/rels/{rel}",
346346
"templated" : true
347347
},
348348
"ex:orders" : { href : "http://myhost/person/1/orders" }

src/main/java/org/springframework/hateoas/IanaRels.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Static class to find out whether a relation type is defined by the IANA.
2727
*
28-
* @see http://www.iana.org/assignments/link-relations/link-relations.xhtml
28+
* @see https://www.iana.org/assignments/link-relations/link-relations.xhtml
2929
* @author Oliver Gierke
3030
* @author Roland Kulcsár
3131
*/

src/main/java/org/springframework/hateoas/UriTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* Custom URI template to support qualified URI template variables.
3636
*
3737
* @author Oliver Gierke
38-
* @see http://tools.ietf.org/html/rfc6570
38+
* @see https://tools.ietf.org/html/rfc6570
3939
* @since 0.9
4040
*/
4141
public class UriTemplate implements Iterable<TemplateVariable>, Serializable {

src/main/java/org/springframework/hateoas/config/EnableHypermediaSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ enum HypermediaType {
6969
* HAL - Hypermedia Application Language.
7070
*
7171
* @see http://stateless.co/hal_specification.html
72-
* @see http://tools.ietf.org/html/draft-kelly-json-hal-05
72+
* @see https://tools.ietf.org/html/draft-kelly-json-hal-05
7373
*/
7474
HAL;
7575
}

src/main/java/org/springframework/hateoas/core/EvoInflectorRelProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* {@link RelProvider} implementation using the Evo Inflector implementation of an algorithmic approach to English
2323
* plurals.
2424
*
25-
* @see http://www.csse.monash.edu.au/~damian/papers/HTML/Plurals.html
25+
* @see http://users.monash.edu/~damian/papers/HTML/Plurals.html
2626
* @author Oliver Gierke
2727
*/
2828
public class EvoInflectorRelProvider extends DefaultRelProvider {

src/main/java/org/springframework/hateoas/hal/CurieProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* API to provide HAL curie information for links.
2525
*
26-
* @see http://tools.ietf.org/html/draft-kelly-json-hal#section-8.2
26+
* @see https://tools.ietf.org/html/draft-kelly-json-hal#section-8.2
2727
* @author Oliver Gierke
2828
* @author Jeff Stano
2929
* @since 0.9

src/main/java/org/springframework/hateoas/mvc/ForwardedHeader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Value object to partially implement the {@literal Forwarded} header defined in RFC 7239.
3232
*
3333
* @author Oliver Gierke
34-
* @see http://tools.ietf.org/html/rfc7239
34+
* @see https://tools.ietf.org/html/rfc7239
3535
* @deprecated In Spring 5.1, all Forwarded headers will by handled by Spring MVC.
3636
*/
3737
@Deprecated

src/main/resources/license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ similar licenses that require the source code and/or modifications to
207207
source code to be made available (as would be noted above), you may obtain a
208208
copy of the source code corresponding to the binaries for such open source
209209
components and modifications thereto, if any, (the "Source Files"), by
210-
downloading the Source Files from http://www.springsource.org/download,
210+
downloading the Source Files from https://www.springsource.org/download,
211211
or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview
212212
Avenue, Palo Alto, CA 94304, United States of America or email [email protected]. All
213213
such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General

src/test/java/org/springframework/hateoas/LinkUnitTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ public void parsesRFC5988HeaderIntoLink() {
113113

114114
assertThat(Link.valueOf("</something>;rel=\"foo\""), is(new Link("/something", "foo")));
115115
assertThat(Link.valueOf("</something>;rel=\"foo\";title=\"Some title\""), is(new Link("/something", "foo")));
116-
assertThat(Link.valueOf("</customer/1>;rel=\"self\";hreflang=\"en\";media=\"pdf\";title=\"pdf customer copy\";type=\"portable document\";deprecation=\"http://example.com/customers/deprecated\""),
116+
assertThat(Link.valueOf("</customer/1>;rel=\"self\";hreflang=\"en\";media=\"pdf\";title=\"pdf customer copy\";type=\"portable document\";deprecation=\"https://example.com/customers/deprecated\""),
117117
is(new Link("/customer/1")
118118
.withHreflang("en")
119119
.withMedia("pdf")
120120
.withTitle("pdf customer copy")
121121
.withType("portable document")
122-
.withDeprecation("http://example.com/customers/deprecated")));
122+
.withDeprecation("https://example.com/customers/deprecated")));
123123
}
124124

125125
/**
@@ -214,7 +214,7 @@ public void parsesLinkRelationWithDotAndMinus() {
214214
@Test
215215
public void parsesUriLinkRelations() {
216216

217-
assertThat(Link.valueOf("<http://localhost>; rel=\"http://acme.com/rels/foo-bar\"").getRel(),
218-
is("http://acme.com/rels/foo-bar"));
217+
assertThat(Link.valueOf("<http://localhost>; rel=\"https://acme.com/rels/foo-bar\"").getRel(),
218+
is("https://acme.com/rels/foo-bar"));
219219
}
220220
}

src/test/java/org/springframework/hateoas/alps/AlpsLinkDiscoverUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class AlpsLinkDiscoverUnitTest extends AbstractLinkDiscovererUnitTest {
4141
@Test
4242
public void discoversFullyQualifiedRel() {
4343

44-
Link link = getDiscoverer().findLinkWithRel("http://foo.com/bar", getInputString());
44+
Link link = getDiscoverer().findLinkWithRel("http://www.foo.com/bar", getInputString());
4545

4646
assertThat(link, is(notNullValue()));
4747
assertThat(link.getHref(), is("fullRelHref"));

src/test/java/org/springframework/hateoas/alps/JacksonSerializationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setUp() {
5757
public void writesSampleDocument() throws Exception {
5858

5959
Alps alps = alps().//
60-
doc(doc().href("http://example.org/samples/full/doc.html").build()). //
60+
doc(doc().href("https://example.org/samples/full/doc.html").build()). //
6161
descriptors(Arrays.asList(//
6262
descriptor().id("search").type(Type.SAFE).//
6363
doc(new Doc("A search form with two inputs.", Format.TEXT)).//

src/test/java/org/springframework/hateoas/client/TraversonTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void readsTraversalIntoResourceInstance() {
145145
@Test
146146
public void sendsConfiguredHeadersForJsonPathExpression() {
147147

148-
String expectedHeader = "<http://www.example.com>;rel=\"home\"";
148+
String expectedHeader = "<https://www.example.com>;rel=\"home\"";
149149

150150
HttpHeaders headers = new HttpHeaders();
151151
headers.add("Link", expectedHeader);
@@ -164,7 +164,7 @@ public void sendsConfiguredHeadersForJsonPathExpression() {
164164
@Test
165165
public void sendsConfiguredHeadersForToEntity() {
166166

167-
String expectedHeader = "<http://www.example.com>;rel=\"home\"";
167+
String expectedHeader = "<https://www.example.com>;rel=\"home\"";
168168

169169
HttpHeaders headers = new HttpHeaders();
170170
headers.add("Link", expectedHeader);

src/test/java/org/springframework/hateoas/hal/DefaultCurieProviderUnitTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,30 @@ public void preventsUriTemplateWithMoreThanOneVariable() {
7070

7171
@Test
7272
public void doesNotPrefixIanaRels() {
73-
assertThat(provider.getNamespacedRelFrom(new Link("http://amazon.com")), is("self"));
73+
assertThat(provider.getNamespacedRelFrom(new Link("https://amazon.com")), is("self"));
7474
}
7575

7676
@Test
7777
public void prefixesNormalRels() {
78-
assertThat(provider.getNamespacedRelFrom(new Link("http://amazon.com", "book")), is("acme:book"));
78+
assertThat(provider.getNamespacedRelFrom(new Link("https://amazon.com", "book")), is("acme:book"));
7979
}
8080

8181
@Test
8282
public void doesNotPrefixQualifiedRels() {
83-
assertThat(provider.getNamespacedRelFrom(new Link("http://amazon.com", "custom:rel")), is("custom:rel"));
83+
assertThat(provider.getNamespacedRelFrom(new Link("https://amazon.com", "custom:rel")), is("custom:rel"));
8484
}
8585

8686
/**
8787
* @see #100
8888
*/
8989
@Test
9090
public void prefixesNormalRelsThatHaveExtraRFC5988Attributes() {
91-
assertThat(provider.getNamespacedRelFrom(new Link("http://amazon.com", "custom:rel")
91+
assertThat(provider.getNamespacedRelFrom(new Link("https://amazon.com", "custom:rel")
9292
.withHreflang("en")
9393
.withTitle("the title")
9494
.withMedia("the media")
9595
.withType("the type")
96-
.withDeprecation("http://example.com/custom/deprecated")), is("custom:rel"));
96+
.withDeprecation("https://example.com/custom/deprecated")), is("custom:rel"));
9797
}
9898

9999
/**

src/test/java/org/springframework/hateoas/hal/HalLinkDiscovererUnitTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public class HalLinkDiscovererUnitTest extends AbstractLinkDiscovererUnitTest {
3535
static final LinkDiscoverer discoverer = new HalLinkDiscoverer();
3636
static final String SAMPLE = "{ _links : { self : { href : 'selfHref' }, " + //
3737
"relation : [ { href : 'firstHref' }, { href : 'secondHref' }], " + //
38-
"'http://foo.com/bar' : { href : 'fullRelHref' }, " + "}}";
38+
"'http://www.foo.com/bar' : { href : 'fullRelHref' }, " + "}}";
3939

4040
/**
4141
* @see #314
4242
*/
4343
@Test
4444
public void discoversFullyQualifiedRel() {
4545

46-
Link link = getDiscoverer().findLinkWithRel("http://foo.com/bar", SAMPLE);
46+
Link link = getDiscoverer().findLinkWithRel("http://www.foo.com/bar", SAMPLE);
4747

4848
assertThat(link, is(notNullValue()));
4949
assertThat(link.getHref(), is("fullRelHref"));

src/test/resources/org/springframework/hateoas/alps/link-discoverer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version" : "1.0",
33
"doc" : {
4-
"href" : "http://example.org/samples/full/doc.html"
4+
"href" : "https://example.org/samples/full/doc.html"
55
},
66
"descriptors" : [ {
77
"id" : "sfirst descriptor",
@@ -17,7 +17,7 @@
1717
"href" : "selfHref"
1818
}, {
1919
"id" : "fully qualified descriptor",
20-
"name" : "http://foo.com/bar",
20+
"name" : "http://www.foo.com/bar",
2121
"href" : "fullRelHref"
2222
} ]
2323
}

src/test/resources/org/springframework/hateoas/alps/reference.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version" : "1.0",
33
"doc" : {
4-
"href" : "http://example.org/samples/full/doc.html"
4+
"href" : "https://example.org/samples/full/doc.html"
55
},
66
"descriptor" : [ {
77
"id" : "search",

0 commit comments

Comments
 (0)