root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Rename Status.status to Status.code

This commit is contained in:
Christian Dupuis 2014-05-21 18:37:52 +02:00
parent 4648188782
commit 4bc6a0f49e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
View File

@ -66,8 +66,8 @@ public class OrderedHealthAggregator implements HealthAggregator {
@Override
public int compare(Status s1, Status s2) {
return Integer.valueOf(
OrderedHealthAggregator.this.statusOrder.indexOf(s1.getStatus())).compareTo(
Integer.valueOf(OrderedHealthAggregator.this.statusOrder.indexOf(s2.getStatus())));
OrderedHealthAggregator.this.statusOrder.indexOf(s1.getCode())).compareTo(
Integer.valueOf(OrderedHealthAggregator.this.statusOrder.indexOf(s2.getCode())));
}
});

16
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java
View File

@ -21,6 +21,7 @@ import org.springframework.util.ObjectUtils;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Value object to express state of a component or subsystem.
@ -58,7 +59,7 @@ public class Status {
*/
public static final Status OUT_OF_SERVICE = new Status("OUT_OF_SERVICE");
private final String status;
private final String code;
private final String description;
@ -67,14 +68,15 @@ public class Status {
}
public Status(String code, String description) {
Assert.notNull(code, "Status must not be null");
Assert.notNull(code, "Code must not be null");
Assert.notNull(description, "Description must not be null");
this.status = code;
this.code = code;
this.description = description;
}
public String getStatus() {
return this.status;
@JsonProperty("status")
public String getCode() {
return this.code;
}
@JsonInclude(Include.NON_EMPTY)
@ -88,13 +90,13 @@ public class Status {
return true;
}
if (obj != null && obj instanceof Status) {
return ObjectUtils.nullSafeEquals(this.status, ((Status) obj).status);
return ObjectUtils.nullSafeEquals(this.code, ((Status) obj).code);
}
return false;
}
@Override
public int hashCode() {
return this.status.hashCode();
return this.code.hashCode();
}
}