Merge pull request #9544 from htynkn:feature/use-getUsableSpace-in-DiskSpaceHealthIndicator

* pr/9544:
  Polish "Use getUsableSpace() in DiskSpaceHealthIndicator"
  Use getUsableSpace() in DiskSpaceHealthIndicator
pull/9585/head
Stephane Nicoll 8 years ago
commit fc57a0eddc

@ -46,7 +46,7 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator {
@Override @Override
protected void doHealthCheck(Health.Builder builder) throws Exception { protected void doHealthCheck(Health.Builder builder) throws Exception {
File path = this.properties.getPath(); File path = this.properties.getPath();
long diskFreeInBytes = path.getFreeSpace(); long diskFreeInBytes = path.getUsableSpace();
if (diskFreeInBytes >= this.properties.getThreshold()) { if (diskFreeInBytes >= this.properties.getThreshold()) {
builder.up(); builder.up();
} }

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -56,7 +56,7 @@ public class DiskSpaceHealthIndicatorTests {
@Test @Test
public void diskSpaceIsUp() throws Exception { public void diskSpaceIsUp() throws Exception {
given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES + 10); given(this.fileMock.getUsableSpace()).willReturn(THRESHOLD_BYTES + 10);
given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10); given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
Health health = this.healthIndicator.health(); Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.UP); assertThat(health.getStatus()).isEqualTo(Status.UP);
@ -67,7 +67,7 @@ public class DiskSpaceHealthIndicatorTests {
@Test @Test
public void diskSpaceIsDown() throws Exception { public void diskSpaceIsDown() throws Exception {
given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES - 10); given(this.fileMock.getUsableSpace()).willReturn(THRESHOLD_BYTES - 10);
given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10); given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
Health health = this.healthIndicator.health(); Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.DOWN); assertThat(health.getStatus()).isEqualTo(Status.DOWN);

Loading…
Cancel
Save