Skip to content

Commit 6211f69

Browse files
atkawa7atkawa7
committed
Clean code
1 parent cb5c6d2 commit 6211f69

File tree

11 files changed

+76
-80
lines changed

11 files changed

+76
-80
lines changed

‎httpsnippet-demo/src/main/java/io/github/atkawa7/httpsnippet/demo/console/ConsoleApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.*;
44

5-
import io.github.atkawa7.httpsnippet.utils.HarUtils;
65
import lombok.Data;
76

87
import org.reflections.Reflections;
@@ -23,6 +22,7 @@
2322
import io.github.atkawa7.httpsnippet.http.MediaType;
2423
import io.github.atkawa7.httpsnippet.models.HttpSnippet;
2524
import io.github.atkawa7.httpsnippet.models.Language;
25+
import io.github.atkawa7.httpsnippet.utils.HarUtils;
2626

2727
public class ConsoleApp {
2828

‎httpsnippet-demo/src/main/java/io/github/atkawa7/httpsnippet/demo/swagger/plugins/CodeSampleOperationBuilderPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.*;
44
import java.util.stream.Collectors;
55

6-
import io.github.atkawa7.httpsnippet.utils.HarUtils;
76
import lombok.extern.slf4j.Slf4j;
87

98
import org.apache.commons.lang3.ObjectUtils;
@@ -38,6 +37,7 @@
3837
import io.github.atkawa7.httpsnippet.generators.HttpSnippetCodeGenerator;
3938
import io.github.atkawa7.httpsnippet.http.HttpVersion;
4039
import io.github.atkawa7.httpsnippet.http.MediaType;
40+
import io.github.atkawa7.httpsnippet.utils.HarUtils;
4141

4242
@Slf4j
4343
@Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER + 100)

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/generators/CodeGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
import java.util.Objects;
66

7-
import io.github.atkawa7.httpsnippet.utils.HarUtils;
87
import lombok.Getter;
98

109
import com.smartbear.har.model.HarRequest;
1110

1211
import io.github.atkawa7.httpsnippet.models.Client;
1312
import io.github.atkawa7.httpsnippet.models.Language;
1413
import io.github.atkawa7.httpsnippet.models.internal.CodeRequest;
14+
import io.github.atkawa7.httpsnippet.utils.HarUtils;
1515

1616
@Getter
1717
public abstract class CodeGenerator {

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/generators/c/LibCurl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ protected String generateCode(final CodeRequest codeRequest) throws Exception {
3434
codeRequest
3535
.getHeaders()
3636
.forEach(
37-
harHeader -> code.push(
38-
"headers = curl_slist_append(headers, \"%s: %s\");",
39-
harHeader.getName(), harHeader.getValue()));
37+
harHeader ->
38+
code.push(
39+
"headers = curl_slist_append(headers, \"%s: %s\");",
40+
harHeader.getName(), harHeader.getValue()));
4041

4142
code.push("curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers);");
4243
}

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/generators/clojure/CljHttp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.*;
44

5-
import io.github.atkawa7.httpsnippet.utils.HarUtils;
65
import lombok.AllArgsConstructor;
76
import lombok.Getter;
87

@@ -19,6 +18,7 @@
1918
import io.github.atkawa7.httpsnippet.models.Client;
2019
import io.github.atkawa7.httpsnippet.models.Language;
2120
import io.github.atkawa7.httpsnippet.models.internal.CodeRequest;
21+
import io.github.atkawa7.httpsnippet.utils.HarUtils;
2222

2323
public class CljHttp extends CodeGenerator {
2424
private static final List<String> SUPPORTED_METHODS =

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/generators/objc/ObjNSURLSession.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import java.util.Map;
77
import java.util.Objects;
88

9+
import org.apache.commons.lang3.ObjectUtils;
10+
911
import com.smartbear.har.model.HarParam;
1012

1113
import io.github.atkawa7.httpsnippet.builder.CodeBuilder;
@@ -15,7 +17,6 @@
1517
import io.github.atkawa7.httpsnippet.models.Language;
1618
import io.github.atkawa7.httpsnippet.models.internal.CodeRequest;
1719
import io.github.atkawa7.httpsnippet.utils.HarUtils;
18-
import org.apache.commons.lang3.ObjectUtils;
1920

2021
public class ObjNSURLSession extends CodeGenerator {
2122
private int timeout;

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/models/internal/CodeRequest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,7 @@ public String headersToJsonString() throws JsonProcessingException {
277277
}
278278

279279
public String allHeadersToJsonString(boolean pretty) throws JsonProcessingException {
280-
return (pretty)
281-
? HarUtils.toPrettyJsonString(_allHeaders)
282-
: HarUtils.toJsonString(_allHeaders);
280+
return (pretty) ? HarUtils.toPrettyJsonString(_allHeaders) : HarUtils.toJsonString(_allHeaders);
283281
}
284282

285283
public String allHeadersToJsonString() throws JsonProcessingException {

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/models/internal/URLWrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.*;
77
import java.util.stream.Collectors;
88

9-
import io.github.atkawa7.httpsnippet.utils.HarUtils;
109
import lombok.NonNull;
1110

1211
import org.apache.commons.lang3.ObjectUtils;
@@ -16,6 +15,7 @@
1615
import com.smartbear.har.model.HarRequest;
1716

1817
import io.github.atkawa7.httpsnippet.http.HttpScheme;
18+
import io.github.atkawa7.httpsnippet.utils.HarUtils;
1919

2020
final class URLWrapper {
2121
public static final int HTTP_PORT = 80;

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/models/internal/Validation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.github.atkawa7.httpsnippet.models.internal;
22

3-
import org.apache.commons.lang3.ObjectUtils;
4-
53
import java.util.ArrayList;
64
import java.util.List;
75
import java.util.Objects;
86

7+
import org.apache.commons.lang3.ObjectUtils;
8+
99
public interface Validation<T> {
1010
static <T> List<T> validate(List<T> validationList, Validation<T> validation) throws Exception {
1111
List<T> result = new ArrayList<>();

‎httpsnippet/src/main/java/io/github/atkawa7/httpsnippet/utils/HarUtils.java‎

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import java.io.IOException;
44
import java.util.*;
55

6+
import lombok.experimental.UtilityClass;
7+
8+
import org.apache.commons.lang3.StringUtils;
9+
610
import com.fasterxml.jackson.core.JsonGenerator;
711
import com.fasterxml.jackson.core.JsonProcessingException;
812
import com.fasterxml.jackson.core.util.DefaultIndenter;
913
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
1014
import com.fasterxml.jackson.databind.ObjectMapper;
1115
import com.fasterxml.jackson.databind.SerializationFeature;
12-
import lombok.experimental.UtilityClass;
13-
14-
import org.apache.commons.lang3.StringUtils;
15-
1616
import com.smartbear.har.model.*;
1717

1818
import io.github.atkawa7.httpsnippet.http.MediaType;
@@ -21,56 +21,55 @@
2121
@UtilityClass
2222
public class HarUtils {
2323

24+
private static final ObjectMapper prettyObjectMapper = new ObjectMapper();
2425

25-
private static final ObjectMapper prettyObjectMapper = new ObjectMapper();
26+
private static final ObjectMapper objectMapper = new ObjectMapper();
2627

27-
private static final ObjectMapper objectMapper = new ObjectMapper();
28-
29-
static {
30-
prettyObjectMapper.setDefaultPrettyPrinter(new HttpSnippetPrettyPrinter());
31-
prettyObjectMapper.enable(SerializationFeature.INDENT_OUTPUT);
32-
objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
33-
}
28+
static {
29+
prettyObjectMapper.setDefaultPrettyPrinter(new HttpSnippetPrettyPrinter());
30+
prettyObjectMapper.enable(SerializationFeature.INDENT_OUTPUT);
31+
objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
32+
}
3433

35-
public static String toPrettyJsonString(Object value) throws JsonProcessingException {
36-
return prettyObjectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(value);
37-
}
34+
public static String toPrettyJsonString(Object value) throws JsonProcessingException {
35+
return prettyObjectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(value);
36+
}
3837

39-
public static String toJsonString(Object value) throws JsonProcessingException {
40-
return objectMapper.writeValueAsString(value);
41-
}
38+
public static String toJsonString(Object value) throws JsonProcessingException {
39+
return objectMapper.writeValueAsString(value);
40+
}
4241

43-
public static Map<String, Object> fromJsonString(String json) throws IOException {
44-
return objectMapper.readValue(json, Map.class);
45-
}
42+
public static Map<String, Object> fromJsonString(String json) throws IOException {
43+
return objectMapper.readValue(json, Map.class);
44+
}
4645

47-
public static <T> boolean isNotNull(T object) {
48-
return Objects.nonNull(object);
49-
}
46+
public static <T> boolean isNotNull(T object) {
47+
return Objects.nonNull(object);
48+
}
5049

51-
public static <T> boolean isNull(T object) {
52-
return Objects.isNull(object);
53-
}
50+
public static <T> boolean isNull(T object) {
51+
return Objects.isNull(object);
52+
}
5453

55-
public static <T> String defaultIfNull(T obj, String str) {
56-
return isNull(obj) ? str : obj.toString();
57-
}
54+
public static <T> String defaultIfNull(T obj, String str) {
55+
return isNull(obj) ? str : obj.toString();
56+
}
5857

59-
public static <T> List<T> defaultIfNull(List<T> obj) {
60-
return isNull(obj) ? new ArrayList<>() : obj;
61-
}
58+
public static <T> List<T> defaultIfNull(List<T> obj) {
59+
return isNull(obj) ? new ArrayList<>() : obj;
60+
}
6261

63-
public static void validateJSON(String jsonInString) throws Exception {
64-
if (StringUtils.isNotBlank(jsonInString)) {
65-
try {
66-
objectMapper.readTree(jsonInString);
67-
} catch (Exception ex) {
68-
throw new Exception("JSON validation failed");
69-
}
70-
} else {
71-
throw new Exception("JSON validation failed");
72-
}
62+
public static void validateJSON(String jsonInString) throws Exception {
63+
if (StringUtils.isNotBlank(jsonInString)) {
64+
try {
65+
objectMapper.readTree(jsonInString);
66+
} catch (Exception ex) {
67+
throw new Exception("JSON validation failed");
68+
}
69+
} else {
70+
throw new Exception("JSON validation failed");
7371
}
72+
}
7473

7574
public List<HarQueryString> processQueryStrings(List<HarQueryString> harQueryStrings)
7675
throws Exception {
@@ -140,25 +139,25 @@ public String defaultMimeType(final String mimeType) {
140139
}
141140
}
142141

143-
static class HttpSnippetPrettyPrinter extends DefaultPrettyPrinter {
142+
static class HttpSnippetPrettyPrinter extends DefaultPrettyPrinter {
144143

145-
public HttpSnippetPrettyPrinter(DefaultPrettyPrinter base) {
146-
super(base);
147-
}
144+
public HttpSnippetPrettyPrinter(DefaultPrettyPrinter base) {
145+
super(base);
146+
}
148147

149-
public HttpSnippetPrettyPrinter() {
150-
super();
151-
_arrayIndenter = DefaultIndenter.SYSTEM_LINEFEED_INSTANCE;
152-
}
148+
public HttpSnippetPrettyPrinter() {
149+
super();
150+
_arrayIndenter = DefaultIndenter.SYSTEM_LINEFEED_INSTANCE;
151+
}
153152

154-
@Override
155-
public DefaultPrettyPrinter createInstance() {
156-
return new HttpSnippetPrettyPrinter(this);
157-
}
153+
@Override
154+
public DefaultPrettyPrinter createInstance() {
155+
return new HttpSnippetPrettyPrinter(this);
156+
}
158157

159-
@Override
160-
public void writeObjectFieldValueSeparator(JsonGenerator g) throws IOException {
161-
g.writeRaw(": ");
162-
}
158+
@Override
159+
public void writeObjectFieldValueSeparator(JsonGenerator g) throws IOException {
160+
g.writeRaw(": ");
163161
}
162+
}
164163
}

0 commit comments

Comments
 (0)