Skip to content

Commit 777e919

Browse files
polysantiagoPablo Santiago
authored andcommitted
Added Jacoco, some refactoring and code styling
1 parent 74fa1ec commit 777e919

File tree

9 files changed

+83
-46
lines changed

9 files changed

+83
-46
lines changed

.gitignore

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,55 @@
1+
.gradle
2+
/build/
3+
!gradle/wrapper/gradle-wrapper.jar
4+
dependency-reduced-pom.xml
5+
6+
### STS ###
7+
.apt_generated
8+
.classpath
9+
.factorypath
10+
.project
11+
.settings
12+
.springBeans
13+
14+
### IntelliJ IDEA ###
15+
.idea
16+
*.iws
17+
*.ipr
118
*.iml
2-
**/target/
319

4-
coverage-error.log
20+
### NetBeans ###
21+
nbproject/private/
22+
nbbuild/
23+
dist/
24+
nbdist/
25+
.nb-gradle/
526

6-
**/build
27+
### Eclipse ###
28+
*.eclipse
29+
*.project
30+
*.classpath
31+
.extract*
32+
.settings*
733

8-
*.log
9-
.gradle
10-
schema
34+
### Plugins ###
35+
*.eclipse-pmd
36+
**.metadata
37+
*.pmd
38+
*.checkstyle
39+
*-result.html
40+
rebel_project.xml
1141

12-
src/test/generated-java
42+
### npm ###
43+
node
44+
node_modules
45+
frontend-dest
46+
data/
1347

14-
.idea/*
15-
## Videocore shared settings:
16-
!/.idea/vcs.xml
17-
!/.idea/codeStyleSettings.xml
18-
!.idea/checkstyle-idea.xml
19-
!.idea/encodings.xml
20-
!.idea/sqldialects.xml
21-
!.idea/compiler.xml
48+
.DS_Store
49+
*.py~
50+
*.swp
51+
*.pyc
52+
*~
53+
target/
54+
*#
55+
*.log

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'java'
33
id 'idea'
4+
id 'jacoco'
45
id "io.spring.dependency-management" version "1.0.2.RELEASE"
56
id 'maven-publish'
67
id 'signing'
@@ -50,6 +51,7 @@ dependencyManagement {
5051
dependencies {
5152
compile("org.springframework.boot:spring-boot-autoconfigure")
5253
compile("org.springframework.boot:spring-boot-starter-logging")
54+
compileOnly('org.springframework.boot:spring-boot-configuration-processor')
5355
compile("org.springframework:spring-webmvc")
5456
compile('org.springframework:spring-aop')
5557
compile('org.aspectj:aspectjweaver')

src/main/java/io/github/polysantiago/spring/rest/RestClientProperties.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package io.github.polysantiago.spring.rest;
22

33
import io.github.polysantiago.spring.rest.retry.RetrySettings;
4-
import lombok.Data;
5-
import org.springframework.boot.context.properties.ConfigurationProperties;
6-
74
import java.util.HashMap;
85
import java.util.Map;
6+
import lombok.Getter;
7+
import lombok.Setter;
8+
import org.springframework.boot.context.properties.ConfigurationProperties;
99

10-
@Data
10+
@Getter
11+
@Setter
1112
@ConfigurationProperties(prefix = RestClientProperties.PREFIX)
1213
public class RestClientProperties {
1314

src/main/java/io/github/polysantiago/spring/rest/retry/BackOffSettings.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.github.polysantiago.spring.rest.retry;
22

3-
import lombok.Data;
3+
import lombok.Getter;
4+
import lombok.Setter;
45

5-
@Data
6+
@Getter
7+
@Setter
68
public class BackOffSettings {
79

810
private long delay = 1000;

src/main/java/io/github/polysantiago/spring/rest/retry/RetrySettings.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.github.polysantiago.spring.rest.retry;
22

3-
import lombok.Data;
3+
import lombok.Getter;
4+
import lombok.Setter;
45

5-
@Data
6+
@Getter
7+
@Setter
68
public class RetrySettings {
79

810
private int maxAttempts = 3;

src/main/java/io/github/polysantiago/spring/rest/support/SyntheticParametrizedType.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package io.github.polysantiago.spring.rest.support;
22

3-
import lombok.Getter;
4-
import org.springframework.core.ResolvableType;
3+
import static java.util.stream.Collectors.joining;
54

65
import java.io.Serializable;
76
import java.lang.reflect.ParameterizedType;
87
import java.lang.reflect.Type;
98
import java.util.Arrays;
10-
import java.util.stream.Collectors;
9+
import lombok.Getter;
10+
import org.springframework.core.ResolvableType;
1111

1212
@Getter
1313
public final class SyntheticParametrizedType implements ParameterizedType, Serializable {
@@ -39,6 +39,7 @@ public Type getOwnerType() {
3939
@Override
4040
public String toString() {
4141
return String.format("%s<%s<%s>>", SyntheticParametrizedType.class.getName(), rawType.getTypeName(),
42-
Arrays.stream(actualTypeArguments).map(Type::getTypeName).collect(Collectors.joining(",")));
42+
Arrays.stream(actualTypeArguments).map(Type::getTypeName).collect(joining(",")));
4343
}
44+
4445
}

src/main/java/io/github/polysantiago/spring/rest/support/SyntheticParametrizedTypeReference.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package io.github.polysantiago.spring.rest.support;
22

3-
import lombok.*;
3+
import java.lang.reflect.Type;
4+
import lombok.AccessLevel;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.Getter;
7+
import lombok.RequiredArgsConstructor;
48
import org.springframework.core.ParameterizedTypeReference;
59
import org.springframework.core.ResolvableType;
610

7-
import java.lang.reflect.Type;
8-
911
@Getter
1012
@EqualsAndHashCode(callSuper = false)
11-
@ToString
1213
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
1314
public class SyntheticParametrizedTypeReference<T> extends ParameterizedTypeReference<T> {
1415

src/main/java/io/github/polysantiago/spring/rest/util/OptionalTypeFutureAdapter.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package io.github.polysantiago.spring.rest.util;
22

3+
import java.util.Optional;
4+
import java.util.concurrent.ExecutionException;
5+
import java.util.concurrent.TimeUnit;
6+
import java.util.concurrent.TimeoutException;
37
import org.springframework.http.HttpStatus;
48
import org.springframework.http.ResponseEntity;
59
import org.springframework.util.concurrent.FailureCallback;
610
import org.springframework.util.concurrent.ListenableFuture;
711
import org.springframework.util.concurrent.SuccessCallback;
812
import org.springframework.web.client.HttpClientErrorException;
913

10-
import java.util.Optional;
11-
import java.util.concurrent.ExecutionException;
12-
import java.util.concurrent.TimeUnit;
13-
import java.util.concurrent.TimeoutException;
14-
1514
public class OptionalTypeFutureAdapter<T> extends ResponseFutureAdapter<Optional<T>> {
1615

1716
public OptionalTypeFutureAdapter(ListenableFuture<ResponseEntity<Optional<T>>> delegate) {
@@ -22,7 +21,7 @@ public OptionalTypeFutureAdapter(ListenableFuture<ResponseEntity<Optional<T>>> d
2221
public void addCallback(SuccessCallback<? super Optional<T>> successCallback, FailureCallback failureCallback) {
2322
super.addCallback(successCallback, throwable -> {
2423
if (isNotFoundException(throwable)) {
25-
successCallback.onSuccess(Optional.<T>empty());
24+
successCallback.onSuccess(Optional.empty());
2625
} else {
2726
failureCallback.onFailure(throwable);
2827
}

src/main/java/io/github/polysantiago/spring/rest/util/ResolvableTypeUtils.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
package io.github.polysantiago.spring.rest.util;
22

3-
import lombok.experimental.UtilityClass;
4-
import org.springframework.core.ResolvableType;
5-
63
import java.lang.reflect.Method;
7-
import java.lang.reflect.ParameterizedType;
84
import java.util.Arrays;
5+
import lombok.experimental.UtilityClass;
6+
import org.springframework.core.ResolvableType;
97

108
@UtilityClass
119
public class ResolvableTypeUtils {
1210

13-
public static boolean returnTypeIsGeneric(Method method) {
14-
return method.getGenericReturnType() instanceof ParameterizedType;
15-
}
16-
1711
public static boolean typeIsAnyOf(ResolvableType resolvableType, Class<?>... classes) {
1812
return Arrays.stream(classes).anyMatch(clazz -> typeIs(resolvableType, clazz));
1913
}
@@ -23,7 +17,8 @@ public static boolean typeIs(ResolvableType resolvableType, Class<?> clazz) {
2317
}
2418

2519
public static boolean returnTypeIs(Method method, Class<?> returnType) {
26-
return ResolvableType.forClass(returnType).isAssignableFrom(ResolvableType.forMethodReturnType(method));
20+
return ResolvableType.forClass(returnType)
21+
.isAssignableFrom(ResolvableType.forMethodReturnType(method));
2722
}
2823

2924
public static boolean returnTypeIsAnyOf(Method method, Class<?>... returnTypes) {

0 commit comments

Comments
 (0)