Fix Checkstyle errors

Author: darrenfoong

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java

@@ -89,8 +89,10 @@ public Decoder feignDecoder() {
 	@ConditionalOnMissingClass("org.springframework.data.domain.Pageable")
 	public Encoder feignEncoder() {
 		if (this.pojoSerializationWriter != null) {
-			return new SpringEncoder(this.pojoSerializationWriter, this.messageConverters);
-		} else {
+			return new SpringEncoder(this.pojoSerializationWriter,
+					this.messageConverters);
+		}
+		else {
 			return new SpringEncoder(this.messageConverters);
 		}
 	}
@@ -102,11 +104,12 @@ public Encoder feignEncoderPageable() {
 		PageableSpringEncoder encoder;
 
 		if (this.pojoSerializationWriter != null) {
+			encoder = new PageableSpringEncoder(new SpringEncoder(
+					this.pojoSerializationWriter, this.messageConverters));
+		}
+		else {
 			encoder = new PageableSpringEncoder(
-				new SpringEncoder(this.pojoSerializationWriter, this.messageConverters));
-		} else {
-			encoder = new PageableSpringEncoder(
-				new SpringEncoder(this.messageConverters));
+					new SpringEncoder(this.messageConverters));
 		}
 
 		if (springDataWebProperties != null) {

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PojoJsonSerializationWriter.java

@@ -1,14 +1,32 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.cloud.openfeign.support;
 
+import java.io.IOException;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
-
 @Component
 public class PojoJsonSerializationWriter extends PojoSerializationWriter {
+
 	@Autowired
 	private ObjectMapper objectMapper;
 
@@ -21,4 +39,5 @@ protected MediaType getContentType() {
 	protected String serialize(Object object) throws IOException {
 		return objectMapper.writeValueAsString(object);
 	}
+
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PojoSerializationWriter.java

@@ -1,39 +1,55 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.cloud.openfeign.support;
 
+import java.io.IOException;
+import java.util.Iterator;
+
 import feign.codec.EncodeException;
 import feign.form.multipart.AbstractWriter;
 import feign.form.multipart.Output;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.util.Iterator;
-
 import static feign.form.ContentProcessor.CRLF;
 import static feign.form.util.PojoUtil.isUserPojo;
 
 public abstract class PojoSerializationWriter extends AbstractWriter {
+
 	@Override
 	public boolean isApplicable(Object object) {
 		return !(object instanceof MultipartFile) && !(object instanceof MultipartFile[])
-			&& (isUserPojoCollection(object) || isUserPojo(object));
+				&& (isUserPojoCollection(object) || isUserPojo(object));
 	}
 
 	@Override
-	public void write (Output output, String key, Object object) throws EncodeException {
+	public void write(Output output, String key, Object object) throws EncodeException {
 		try {
 			String string = new StringBuilder()
-				.append("Content-Disposition: form-data; name=\"").append(key).append('"')
-				.append(CRLF)
-				.append("Content-Type: ").append(getContentType())
-				.append("; charset=").append(output.getCharset().name())
-				.append(CRLF)
-				.append(CRLF)
-				.append(serialize(object))
-				.toString();
+					.append("Content-Disposition: form-data; name=\"").append(key)
+					.append('"').append(CRLF).append("Content-Type: ")
+					.append(getContentType()).append("; charset=")
+					.append(output.getCharset().name()).append(CRLF).append(CRLF)
+					.append(serialize(object)).toString();
 
 			output.write(string);
-		} catch (IOException e) {
+		}
+		catch (IOException e) {
 			throw new EncodeException(e.getMessage());
 		}
 	}
@@ -61,8 +77,10 @@ private boolean isUserPojoCollection(Object object) {
 			Object next = iterator.next();
 
 			return !(next instanceof MultipartFile) && isUserPojo(next);
-		} else {
+		}
+		else {
 			return false;
 		}
 	}
+
 }

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java

@@ -68,7 +68,8 @@ public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
 		this.messageConverters = messageConverters;
 	}
 
-	public SpringEncoder(PojoSerializationWriter writer, ObjectFactory<HttpMessageConverters> messageConverters) {
+	public SpringEncoder(PojoSerializationWriter writer,
+			ObjectFactory<HttpMessageConverters> messageConverters) {
 		this.springFormEncoder = new SpringPojoFormEncoder(writer);
 		this.messageConverters = messageConverters;
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java

@@ -20,7 +20,15 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import feign.Contract;
 import feign.Feign;
@@ -271,11 +279,13 @@ protected boolean processAnnotationsOnParameter(MethodMetadata data,
 			Annotation[] annotations, int paramIndex) {
 		boolean isMultipartFormData = false;
 
-		Collection<String> contentTypes = data.template().headers().get(HttpEncoding.CONTENT_TYPE);
+		Collection<String> contentTypes = data.template().headers()
+				.get(HttpEncoding.CONTENT_TYPE);
 
 		if (contentTypes != null && !contentTypes.isEmpty()) {
 			String type = contentTypes.iterator().next();
-			isMultipartFormData = Objects.equals(MediaType.valueOf(type), MediaType.MULTIPART_FORM_DATA);
+			isMultipartFormData = Objects.equals(MediaType.valueOf(type),
+					MediaType.MULTIPART_FORM_DATA);
 		}
 
 		boolean isHttpAnnotation = false;
@@ -297,7 +307,8 @@ protected boolean processAnnotationsOnParameter(MethodMetadata data,
 			}
 		}
 
-		if (!isMultipartFormData && isHttpAnnotation && data.indexToExpander().get(paramIndex) == null) {
+		if (!isMultipartFormData && isHttpAnnotation
+				&& data.indexToExpander().get(paramIndex) == null) {
 			TypeDescriptor typeDescriptor = createTypeDescriptor(method, paramIndex);
 			if (this.conversionService.canConvert(typeDescriptor,
 					STRING_TYPE_DESCRIPTOR)) {

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringPojoFormEncoder.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.cloud.openfeign.support;
 
 import feign.form.MultipartFormContentProcessor;
@@ -6,10 +22,13 @@
 import static feign.form.ContentType.MULTIPART;
 
 public class SpringPojoFormEncoder extends SpringFormEncoder {
+
 	public SpringPojoFormEncoder(PojoSerializationWriter pojoSerializationWriter) {
 		super();
 
-		MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(MULTIPART);
+		MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(
+				MULTIPART);
 		processor.addFirstWriter(pojoSerializationWriter);
 	}
+
 }