Update diskUsage and memoryUsage to diskUsed and memoryUsed to comply with recent upstream cf-butler change

Author: pacphi

src/main/java/io/pivotal/cfapp/domain/AppDetail.java

@@ -38,9 +38,9 @@ public class AppDetail {
 	@Default
 	private Integer totalInstances = 0;
 	@Default
-	private Long memoryUsage = 0L;
+	private Long memoryUsed = 0L;
 	@Default
-	private Long diskUsage = 0L;
+	private Long diskUsed = 0L;
 	@Default
 	private List<String> urls = new ArrayList<>();
 	private LocalDateTime lastPushed;
@@ -52,8 +52,8 @@ public class AppDetail {
 	public String toCsv() {
 		return String.join(",", wrap(getFoundation()), wrap(getOrganization()), wrap(getSpace()), wrap(getAppId()), wrap(getAppName()),
 				wrap(getBuildpack()), wrap(getBuildpackVersion()), wrap(getImage()), wrap(getStack()), wrap(String.valueOf(getRunningInstances())),
-				wrap(String.valueOf(getTotalInstances())), wrap(Double.toString(toGigabytes(getMemoryUsage()))),
-				wrap(Double.toString(toGigabytes(getDiskUsage()))),
+				wrap(String.valueOf(getTotalInstances())), wrap(Double.toString(toGigabytes(getMemoryUsed()))),
+				wrap(Double.toString(toGigabytes(getDiskUsed()))),
 				(wrap(String.join(",", getUrls() != null ? getUrls(): Collections.emptyList()))),
 				wrap(getLastPushed() != null ? getLastPushed().toString() : ""), wrap(getLastEvent()),
 				wrap(getLastEventActor()), wrap(getLastEventTime() != null ? getLastEventTime().toString() : ""),
@@ -88,8 +88,8 @@ public static AppDetailBuilder from(AppDetail detail) {
 						.stack(detail.getStack())
 						.runningInstances(detail.getRunningInstances())
 						.totalInstances(detail.getTotalInstances())
-						.memoryUsage(detail.getMemoryUsage())
-						.diskUsage(detail.getDiskUsage())
+						.memoryUsed(detail.getMemoryUsed())
+						.diskUsed(detail.getDiskUsed())
 						.urls(detail.getUrls())
 						.lastPushed(detail.getLastPushed())
 						.lastEvent(detail.getLastEvent())