Skip to content

Commit e13c177

Browse files
DokyeongyunDokyeongyun
committed
Refactoring: remove UnitString class and it's dependent and get Monitoring result in Byte unit
1 parent 51a7223 commit e13c177

File tree

12 files changed

+138
-214
lines changed

12 files changed

+138
-214
lines changed

‎src/main/java/root/core/domain/ASMDiskUsage.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import java.util.List;
44

55
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
76

87
import lombok.AllArgsConstructor;
98
import lombok.Data;
109
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
1210

1311
@AllArgsConstructor
1412
@NoArgsConstructor
@@ -21,20 +19,20 @@ public class ASMDiskUsage {
2119
@CsvBindByName(column = "TYPE")
2220
private String asmDiskGroupType;
2321

24-
@CsvCustomBindByName(column = "TOTAL_RAW(MB)", converter = UnitStringConverter.class)
25-
private UnitString totalRawSpace;
22+
@CsvBindByName(column = "TOTAL_RAW(MB)")
23+
private double totalRawSpace;
2624

27-
@CsvCustomBindByName(column = "TOTAL_USABLE(MB)", converter = UnitStringConverter.class)
28-
private UnitString totalFreeSpace;
25+
@CsvBindByName(column = "TOTAL_USABLE(MB)")
26+
private double totalFreeSpace;
2927

30-
@CsvCustomBindByName(column = "FREE(MB)", converter = UnitStringConverter.class)
31-
private UnitString freeSpace;
28+
@CsvBindByName(column = "FREE(MB)")
29+
private double freeSpace;
3230

33-
@CsvCustomBindByName(column = "USED(MB)", converter = UnitStringConverter.class)
34-
private UnitString usedSpace;
31+
@CsvBindByName(column = "USED(MB)")
32+
private double usedSpace;
3533

36-
@CsvCustomBindByName(column = "USED(%)", converter = UnitStringConverter.class)
37-
private UnitString usedPercent;
34+
@CsvBindByName(column = "USED(%)")
35+
private double usedPercent;
3836

3937
@CsvBindByName(column = "RESULT")
4038
private String resultMsg;
@@ -46,11 +44,11 @@ public static String toCsvString(List<ASMDiskUsage> list) {
4644
for (ASMDiskUsage data : list) {
4745
toCsv.append(data.getAsmDiskGroupName()).append(",");
4846
toCsv.append(data.getAsmDiskGroupType()).append(",");
49-
toCsv.append(data.getTotalRawSpace().getValue()).append(data.getTotalRawSpace().getUnit()).append(",");
50-
toCsv.append(data.getTotalFreeSpace().getValue()).append(data.getTotalFreeSpace().getUnit()).append(",");
51-
toCsv.append(data.getFreeSpace().getValue()).append(data.getFreeSpace().getUnit()).append(",");
52-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
53-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
47+
toCsv.append(data.getTotalRawSpace()).append(",");
48+
toCsv.append(data.getTotalFreeSpace()).append(",");
49+
toCsv.append(data.getFreeSpace()).append(",");
50+
toCsv.append(data.getUsedSpace()).append(",");
51+
toCsv.append(data.getUsedPercent()).append(",");
5452
toCsv.append(data.getResultMsg()).append("\n");
5553
}
5654

‎src/main/java/root/core/domain/ArchiveUsage.java‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import java.util.List;
44

55
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
76

87
import lombok.AllArgsConstructor;
98
import lombok.Data;
109
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
1210

1311
@AllArgsConstructor
1412
@NoArgsConstructor
@@ -21,35 +19,35 @@ public class ArchiveUsage {
2119
@CsvBindByName(column = "NumberOfFiles")
2220
private int numberOfFiles;
2321

24-
@CsvCustomBindByName(column = "LimitSpace(G)", converter = UnitStringConverter.class)
25-
private UnitString totalSpace;
22+
@CsvBindByName(column = "LimitSpace(G)")
23+
private double totalSpace;
2624

27-
@CsvCustomBindByName(column = "ReclaimableSpace(G)", converter = UnitStringConverter.class)
28-
private UnitString reclaimableSpace;
25+
@CsvBindByName(column = "ReclaimableSpace(G)")
26+
private double reclaimableSpace;
2927

30-
@CsvCustomBindByName(column = "UsedSpace(G)", converter = UnitStringConverter.class)
31-
private UnitString usedSpace;
28+
@CsvBindByName(column = "UsedSpace(G)")
29+
private double usedSpace;
30+
31+
@CsvBindByName(column = "Used(%)")
32+
private double usedPercent;
3233

33-
@CsvCustomBindByName(column = "Used(%)", converter = UnitStringConverter.class)
34-
private UnitString usedPercent;
35-
3634
@CsvBindByName(column = "DNT")
3735
private String dnt;
38-
36+
3937
public static String toCsvString(List<ArchiveUsage> list) {
4038
StringBuffer toCsv = new StringBuffer();
4139
toCsv.append("NAME,NumberOfFiles,Used(%),UsedSpace(G),ReclaimableSpace(G),LimitSpace(G),DNT").append("\n");
42-
43-
for(ArchiveUsage data : list) {
40+
41+
for (ArchiveUsage data : list) {
4442
toCsv.append(data.getArchiveName()).append(",");
4543
toCsv.append(data.getNumberOfFiles()).append(",");
46-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
47-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
48-
toCsv.append(data.getReclaimableSpace().getValue()).append(data.getReclaimableSpace().getUnit()).append(",");
49-
toCsv.append(data.getTotalSpace().getValue()).append(data.getTotalSpace().getUnit()).append(",");
44+
toCsv.append(data.getUsedPercent()).append(",");
45+
toCsv.append(data.getUsedSpace()).append(",");
46+
toCsv.append(data.getReclaimableSpace()).append(",");
47+
toCsv.append(data.getTotalSpace()).append(",");
5048
toCsv.append(data.getDnt()).append("\n");
5149
}
52-
50+
5351
return toCsv.toString();
5452
}
5553
}

‎src/main/java/root/core/domain/OSDiskUsage.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import java.util.List;
44

55
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
76

87
import lombok.AllArgsConstructor;
98
import lombok.Data;
109
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
1210

1311
@AllArgsConstructor
1412
@NoArgsConstructor
@@ -21,28 +19,28 @@ public class OSDiskUsage {
2119
@CsvBindByName(column = "Mounted on")
2220
private String mountedOn;
2321

24-
@CsvCustomBindByName(column = "Size", converter = UnitStringConverter.class)
25-
private UnitString totalSpace;
22+
@CsvBindByName(column = "Size")
23+
private double totalSpace;
2624

27-
@CsvCustomBindByName(column = "Avail", converter = UnitStringConverter.class)
28-
private UnitString freeSpace;
25+
@CsvBindByName(column = "Avail")
26+
private double freeSpace;
2927

30-
@CsvCustomBindByName(column = "Used", converter = UnitStringConverter.class)
31-
private UnitString usedSpace;
28+
@CsvBindByName(column = "Used")
29+
private double usedSpace;
3230

33-
@CsvCustomBindByName(column = "Use%", converter = UnitStringConverter.class)
34-
private UnitString usedPercent;
31+
@CsvBindByName(column = "Use%")
32+
private double usedPercent;
3533

3634
public static String toCsvString(List<OSDiskUsage> list) {
3735
StringBuffer toCsv = new StringBuffer();
3836
toCsv.append("Filesystem,Size,Used,Avail,Use%,Mounted on").append("\n");
3937

4038
for (OSDiskUsage data : list) {
4139
toCsv.append(data.getFileSystem()).append(",");
42-
toCsv.append(data.getTotalSpace().getValue()).append(data.getTotalSpace().getUnit()).append(",");
43-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
44-
toCsv.append(data.getFreeSpace().getValue()).append(data.getFreeSpace().getUnit()).append(",");
45-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
40+
toCsv.append(data.getTotalSpace()).append(",");
41+
toCsv.append(data.getUsedSpace()).append(",");
42+
toCsv.append(data.getFreeSpace()).append(",");
43+
toCsv.append(data.getUsedPercent()).append(",");
4644
toCsv.append(data.getMountedOn()).append("\n");
4745
}
4846

‎src/main/java/root/core/domain/TableSpaceUsage.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import java.util.List;
44

55
import com.opencsv.bean.CsvBindByName;
6-
import com.opencsv.bean.CsvCustomBindByName;
76

87
import lombok.AllArgsConstructor;
98
import lombok.Data;
109
import lombok.NoArgsConstructor;
11-
import root.javafx.CustomView.UnitStringConverter;
1210

1311
@AllArgsConstructor
1412
@NoArgsConstructor
@@ -18,28 +16,28 @@ public class TableSpaceUsage {
1816
@CsvBindByName(column = "TableSpace")
1917
private String tableSpaceName;
2018

21-
@CsvCustomBindByName(column = "Total(G)", converter = UnitStringConverter.class)
22-
private UnitString totalSpace;
19+
@CsvBindByName(column = "Total(G)")
20+
private double totalSpace;
2321

24-
@CsvCustomBindByName(column = "FreeSpace(G)", converter = UnitStringConverter.class)
25-
private UnitString freeSpace;
22+
@CsvBindByName(column = "FreeSpace(G)")
23+
private double freeSpace;
2624

27-
@CsvCustomBindByName(column = "UsedSpace(G)", converter = UnitStringConverter.class)
28-
private UnitString usedSpace;
25+
@CsvBindByName(column = "UsedSpace(G)")
26+
private double usedSpace;
2927

30-
@CsvCustomBindByName(column = "Used(%)", converter = UnitStringConverter.class)
31-
private UnitString usedPercent;
28+
@CsvBindByName(column = "Used(%)")
29+
private double usedPercent;
3230

3331
public static String toCsvString(List<TableSpaceUsage> list) {
3432
StringBuffer toCsv = new StringBuffer();
3533
toCsv.append("TableSpace,Total(G),UsedSpace(G),Used(%),FreeSpace(G)").append("\n");
3634

3735
for (TableSpaceUsage data : list) {
3836
toCsv.append(data.getTableSpaceName()).append(",");
39-
toCsv.append(data.getTotalSpace().getValue()).append(data.getTotalSpace().getUnit()).append(",");
40-
toCsv.append(data.getUsedSpace().getValue()).append(data.getUsedSpace().getUnit()).append(",");
41-
toCsv.append(data.getUsedPercent().getValue()).append(data.getUsedPercent().getUnit()).append(",");
42-
toCsv.append(data.getFreeSpace().getValue()).append(data.getFreeSpace().getUnit()).append("\n");
37+
toCsv.append(data.getTotalSpace()).append(",");
38+
toCsv.append(data.getUsedSpace()).append(",");
39+
toCsv.append(data.getUsedPercent()).append(",");
40+
toCsv.append(data.getFreeSpace()).append(",");
4341
}
4442

4543
return toCsv.toString();

‎src/main/java/root/core/domain/UnitString.java‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)