Use consistent equality check for TemplateFormats constants

izeye · izeye · commit 62b1348c1b91 · 2018-07-20T10:49:03.000+09:00
diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/config/RestDocumentationConfigurer.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/config/RestDocumentationConfigurer.java
@@ -119,8 +119,7 @@ public void apply(Map<String, Object> configuration,
 				SnippetConfiguration snippetConfiguration = (SnippetConfiguration) configuration
 						.get(SnippetConfiguration.class.getName());
 				Map<String, Object> templateContext = new HashMap<>();
-				if (snippetConfiguration.getTemplateFormat().getId()
-						.equals(TemplateFormats.asciidoctor().getId())) {
+				if (snippetConfiguration.getTemplateFormat() == TemplateFormats.asciidoctor()) {
 					templateContext.put("tableCellContent",
 							new AsciidoctorTableCellContentLambda());
 				}
diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/templates/TemplateFormats.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/templates/TemplateFormats.java
@@ -17,7 +17,7 @@
 package org.springframework.restdocs.templates;
 
 /**
- * An enumeration of the built-in formats for which templates are provuded.
+ * An enumeration of the built-in formats for which templates are provided.
  *
  * @author Andy Wilkinson
  * @since 1.1.0
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/config/RestDocumentationConfigurerTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/config/RestDocumentationConfigurerTests.java
@@ -58,6 +58,7 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.junit.Assert.assertThat;
@@ -101,7 +102,7 @@ public void defaultConfiguration() {
 				.get(SnippetConfiguration.class.getName());
 		assertThat(snippetConfiguration.getEncoding(), is(equalTo("UTF-8")));
 		assertThat(snippetConfiguration.getTemplateFormat(),
-				is(equalTo(TemplateFormats.asciidoctor())));
+				is(sameInstance(TemplateFormats.asciidoctor())));
 
 		OperationRequestPreprocessor defaultOperationRequestPreprocessor = (OperationRequestPreprocessor) configuration
 				.get(RestDocumentationGenerator.ATTRIBUTE_NAME_DEFAULT_OPERATION_REQUEST_PREPROCESSOR);
@@ -191,7 +192,7 @@ public void customTemplateFormat() {
 		SnippetConfiguration snippetConfiguration = (SnippetConfiguration) configuration
 				.get(SnippetConfiguration.class.getName());
 		assertThat(snippetConfiguration.getTemplateFormat(),
-				is(equalTo(TemplateFormats.markdown())));
+				is(sameInstance(TemplateFormats.markdown())));
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/headers/RequestHeadersSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/headers/RequestHeadersSnippetTests.java
@@ -173,7 +173,7 @@ public void tableCellContentIsEscapedWhenNecessary() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/headers/ResponseHeadersSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/headers/ResponseHeadersSnippetTests.java
@@ -164,7 +164,7 @@ public void tableCellContentIsEscapedWhenNecessary() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinksSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinksSnippetTests.java
@@ -178,7 +178,7 @@ public void tableCellContentIsEscapedWhenNecessary() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/RequestFieldsSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/RequestFieldsSnippetTests.java
@@ -461,7 +461,7 @@ public void typeDeterminationDoesNotSetTypeOnDescriptor() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/ResponseFieldsSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/ResponseFieldsSnippetTests.java
@@ -472,7 +472,7 @@ public void typeDeterminationDoesNotSetTypeOnDescriptor() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/request/PathParametersSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/request/PathParametersSnippetTests.java
@@ -208,7 +208,7 @@ public void pathParametersWithEscapedContent() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
@@ -219,7 +219,7 @@ private String getTitle() {
 	}
 
 	private String getTitle(String title) {
-		if (this.templateFormat.equals(TemplateFormats.asciidoctor())) {
+		if (this.templateFormat == TemplateFormats.asciidoctor()) {
 			return "+" + title + "+";
 		}
 		return "`" + title + "`";
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestParametersSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestParametersSnippetTests.java
@@ -200,7 +200,7 @@ public void requestParametersWithEscapedContent() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestPartsSnippetTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestPartsSnippetTests.java
@@ -191,7 +191,7 @@ public void requestPartsWithEscapedContent() throws IOException {
 	}
 
 	private String escapeIfNecessary(String input) {
-		if (this.templateFormat.equals(TemplateFormats.markdown())) {
+		if (this.templateFormat == TemplateFormats.markdown()) {
 			return input;
 		}
 		return input.replace("|", "\\|");

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`package org.springframework.restdocs.templates;`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * An enumeration of the built-in formats for which templates are provuded.`
	`20`	`+ * An enumeration of the built-in formats for which templates are provided.`
`21`	`21`	`*`
`22`	`22`	`* @author Andy Wilkinson`
`23`	`23`	`* @since 1.1.0`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public void tableCellContentIsEscapedWhenNecessary() throws IOException {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`private String escapeIfNecessary(String input) {`
`176`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`176`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`177`	`177`	`return input;`
`178`	`178`	`}`
`179`	`179`	`return input.replace("\|", "\\\|");`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void tableCellContentIsEscapedWhenNecessary() throws IOException {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`private String escapeIfNecessary(String input) {`
`167`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`167`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`168`	`168`	`return input;`
`169`	`169`	`}`
`170`	`170`	`return input.replace("\|", "\\\|");`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public void tableCellContentIsEscapedWhenNecessary() throws IOException {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`private String escapeIfNecessary(String input) {`
`181`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`181`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`182`	`182`	`return input;`
`183`	`183`	`}`
`184`	`184`	`return input.replace("\|", "\\\|");`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ public void typeDeterminationDoesNotSetTypeOnDescriptor() throws IOException {`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`private String escapeIfNecessary(String input) {`
`464`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`464`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`465`	`465`	`return input;`
`466`	`466`	`}`
`467`	`467`	`return input.replace("\|", "\\\|");`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ public void typeDeterminationDoesNotSetTypeOnDescriptor() throws IOException {`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`private String escapeIfNecessary(String input) {`
`475`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`475`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`476`	`476`	`return input;`
`477`	`477`	`}`
`478`	`478`	`return input.replace("\|", "\\\|");`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public void pathParametersWithEscapedContent() throws IOException {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`private String escapeIfNecessary(String input) {`
`211`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`211`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`212`	`212`	`return input;`
`213`	`213`	`}`
`214`	`214`	`return input.replace("\|", "\\\|");`
`@@ -219,7 +219,7 @@ private String getTitle() {`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`private String getTitle(String title) {`
`222`		`- if (this.templateFormat.equals(TemplateFormats.asciidoctor())) {`
	`222`	`+ if (this.templateFormat == TemplateFormats.asciidoctor()) {`
`223`	`223`	`return "+" + title + "+";`
`224`	`224`	`}`
`225`	`225`	return "`" + title + "`";
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public void requestParametersWithEscapedContent() throws IOException {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`private String escapeIfNecessary(String input) {`
`203`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`203`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`204`	`204`	`return input;`
`205`	`205`	`}`
`206`	`206`	`return input.replace("\|", "\\\|");`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public void requestPartsWithEscapedContent() throws IOException {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`private String escapeIfNecessary(String input) {`
`194`		`- if (this.templateFormat.equals(TemplateFormats.markdown())) {`
	`194`	`+ if (this.templateFormat == TemplateFormats.markdown()) {`
`195`	`195`	`return input;`
`196`	`196`	`}`
`197`	`197`	`return input.replace("\|", "\\\|");`