Skip to content

Commit 1b655fa

Browse files
DokyeongyunDokyeongyun
committed
Remove each model's toCsvString method and replace that to CsvUtils toCsvString method
1 parent 092cc92 commit 1b655fa

File tree

7 files changed

+11
-170
lines changed

7 files changed

+11
-170
lines changed

‎src/main/java/Test/Main.java‎

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

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
5-
import com.opencsv.bean.CsvBindByName;
6-
73
import lombok.AllArgsConstructor;
84
import lombok.Data;
95
import lombok.NoArgsConstructor;
@@ -13,45 +9,20 @@
139
@Data
1410
public class ASMDiskUsage {
1511

16-
@CsvBindByName(column = "NAME")
1712
private String asmDiskGroupName;
1813

19-
@CsvBindByName(column = "TYPE")
2014
private String asmDiskGroupType;
2115

22-
@CsvBindByName(column = "TOTAL_RAW(MB)")
2316
private double totalRawSpace;
2417

25-
@CsvBindByName(column = "TOTAL_USABLE(MB)")
2618
private double totalFreeSpace;
2719

28-
@CsvBindByName(column = "FREE(MB)")
2920
private double freeSpace;
3021

31-
@CsvBindByName(column = "USED(MB)")
3222
private double usedSpace;
3323

34-
@CsvBindByName(column = "USED(%)")
3524
private double usedPercent;
3625

37-
@CsvBindByName(column = "RESULT")
3826
private String resultMsg;
3927

40-
public static String toCsvString(List<ASMDiskUsage> list) {
41-
StringBuffer toCsv = new StringBuffer();
42-
toCsv.append("NAME,TYPE,TOTAL_RAW(MB),TOTAL_USABLE(MB),USED(MB),USED(%),FREE(MB),RESULT").append("\n");
43-
44-
for (ASMDiskUsage data : list) {
45-
toCsv.append(data.getAsmDiskGroupName()).append(",");
46-
toCsv.append(data.getAsmDiskGroupType()).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(",");
52-
toCsv.append(data.getResultMsg()).append("\n");
53-
}
54-
55-
return toCsv.toString();
56-
}
5728
}

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
53
import com.opencsv.bean.CsvBindByName;
64

75
import lombok.AllArgsConstructor;
@@ -19,35 +17,14 @@ public class ArchiveUsage {
1917
@CsvBindByName(column = "NumberOfFiles")
2018
private int numberOfFiles;
2119

22-
@CsvBindByName(column = "LimitSpace(G)")
2320
private double totalSpace;
2421

25-
@CsvBindByName(column = "ReclaimableSpace(G)")
2622
private double reclaimableSpace;
2723

28-
@CsvBindByName(column = "UsedSpace(G)")
2924
private double usedSpace;
3025

31-
@CsvBindByName(column = "Used(%)")
3226
private double usedPercent;
3327

34-
@CsvBindByName(column = "DNT")
3528
private String dnt;
3629

37-
public static String toCsvString(List<ArchiveUsage> list) {
38-
StringBuffer toCsv = new StringBuffer();
39-
toCsv.append("NAME,NumberOfFiles,Used(%),UsedSpace(G),ReclaimableSpace(G),LimitSpace(G),DNT").append("\n");
40-
41-
for (ArchiveUsage data : list) {
42-
toCsv.append(data.getArchiveName()).append(",");
43-
toCsv.append(data.getNumberOfFiles()).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(",");
48-
toCsv.append(data.getDnt()).append("\n");
49-
}
50-
51-
return toCsv.toString();
52-
}
5330
}

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
5-
import com.opencsv.bean.CsvBindByName;
6-
73
import lombok.AllArgsConstructor;
84
import lombok.Data;
95
import lombok.NoArgsConstructor;
@@ -13,37 +9,16 @@
139
@Data
1410
public class OSDiskUsage {
1511

16-
@CsvBindByName(column = "Filesystem")
1712
private String fileSystem;
1813

19-
@CsvBindByName(column = "Mounted on")
2014
private String mountedOn;
2115

22-
@CsvBindByName(column = "Size")
2316
private double totalSpace;
2417

25-
@CsvBindByName(column = "Avail")
2618
private double freeSpace;
2719

28-
@CsvBindByName(column = "Used")
2920
private double usedSpace;
3021

31-
@CsvBindByName(column = "Use%")
3222
private double usedPercent;
3323

34-
public static String toCsvString(List<OSDiskUsage> list) {
35-
StringBuffer toCsv = new StringBuffer();
36-
toCsv.append("Filesystem,Size,Used,Avail,Use%,Mounted on").append("\n");
37-
38-
for (OSDiskUsage data : list) {
39-
toCsv.append(data.getFileSystem()).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(",");
44-
toCsv.append(data.getMountedOn()).append("\n");
45-
}
46-
47-
return toCsv.toString();
48-
}
4924
}

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package root.core.domain;
22

3-
import java.util.List;
4-
5-
import com.opencsv.bean.CsvBindByName;
6-
73
import lombok.AllArgsConstructor;
84
import lombok.Data;
95
import lombok.NoArgsConstructor;
@@ -13,33 +9,13 @@
139
@Data
1410
public class TableSpaceUsage {
1511

16-
@CsvBindByName(column = "TableSpace")
1712
private String tableSpaceName;
1813

19-
@CsvBindByName(column = "Total(G)")
2014
private double totalSpace;
2115

22-
@CsvBindByName(column = "FreeSpace(G)")
2316
private double freeSpace;
2417

25-
@CsvBindByName(column = "UsedSpace(G)")
2618
private double usedSpace;
2719

28-
@CsvBindByName(column = "Used(%)")
2920
private double usedPercent;
30-
31-
public static String toCsvString(List<TableSpaceUsage> list) {
32-
StringBuffer toCsv = new StringBuffer();
33-
toCsv.append("TableSpace,Total(G),UsedSpace(G),Used(%),FreeSpace(G)").append("\n");
34-
35-
for (TableSpaceUsage data : list) {
36-
toCsv.append(data.getTableSpaceName()).append(",");
37-
toCsv.append(data.getTotalSpace()).append(",");
38-
toCsv.append(data.getUsedSpace()).append(",");
39-
toCsv.append(data.getUsedPercent()).append(",");
40-
toCsv.append(data.getFreeSpace()).append(",");
41-
}
42-
43-
return toCsv.toString();
44-
}
4521
}

‎src/main/java/root/core/usecase/implement/DBCheckUsecaseImpl.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import root.core.repository.constracts.ReportRepository;
2424
import root.core.usecase.constracts.DBCheckUsecase;
2525
import root.utils.ConsoleUtils;
26+
import root.utils.CsvUtils;
2627
import root.utils.DBManageExcel;
2728
import root.utils.DateUtils;
2829
import root.utils.ExcelUtils;
@@ -44,7 +45,7 @@ public void printArchiveUsageCheck() {
4445
List<ArchiveUsage> result = dbCheckRepository.checkArchiveUsage();
4546
System.out.println("\t▶ Archive Usage Check");
4647
try {
47-
TextTable tt = new TextTable(new CsvTableModel(ArchiveUsage.toCsvString(result)));
48+
TextTable tt = new TextTable(new CsvTableModel(CsvUtils.toCsvString(result, ArchiveUsage.class)));
4849
tt.printTable(System.out, 8);
4950
System.out.println();
5051
} catch (IOException e) {
@@ -57,7 +58,7 @@ public void printTableSpaceCheck() {
5758
List<TableSpaceUsage> result = dbCheckRepository.checkTableSpaceUsage();
5859
System.out.println("\t▶ TableSpace Usage Check");
5960
try {
60-
TextTable tt = new TextTable(new CsvTableModel(TableSpaceUsage.toCsvString(result)));
61+
TextTable tt = new TextTable(new CsvTableModel(CsvUtils.toCsvString(result, TableSpaceUsage.class)));
6162
tt.printTable(System.out, 8);
6263
System.out.println();
6364
} catch (IOException e) {
@@ -70,7 +71,7 @@ public void printASMDiskCheck() {
7071
List<ASMDiskUsage> result = dbCheckRepository.checkASMDiskUsage();
7172
System.out.println("\t▶ ASM Disk Usage Check");
7273
try {
73-
TextTable tt = new TextTable(new CsvTableModel(ASMDiskUsage.toCsvString(result)));
74+
TextTable tt = new TextTable(new CsvTableModel(CsvUtils.toCsvString(result, ASMDiskUsage.class)));
7475
tt.printTable(System.out, 8);
7576
System.out.println();
7677
} catch (IOException e) {
@@ -131,7 +132,7 @@ public void writeCsvArchiveUsage() {
131132
reportRepository.writeReportFile("ArchiveUsage"
132133
, dbCheckRepository.getDBName()
133134
, ".txt"
134-
, new Date().toString() + "\n" + ArchiveUsage.toCsvString(result));
135+
, new Date().toString() + "\n" + CsvUtils.toCsvString(result, ArchiveUsage.class));
135136
}
136137

137138
@Override
@@ -140,7 +141,7 @@ public void writeCsvTableSpaceUsage() {
140141
reportRepository.writeReportFile("TableSpaceUsage"
141142
, dbCheckRepository.getDBName()
142143
, ".txt"
143-
, new Date().toString() + "\n" + TableSpaceUsage.toCsvString(result));
144+
, new Date().toString() + "\n" + CsvUtils.toCsvString(result, TableSpaceUsage.class));
144145
}
145146

146147
@Override
@@ -149,7 +150,7 @@ public void writeCsvASMDiskUsage() {
149150
reportRepository.writeReportFile("ASMDiskUsage"
150151
, dbCheckRepository.getDBName()
151152
, ".txt"
152-
, new Date().toString() + "\n" + ASMDiskUsage.toCsvString(result));
153+
, new Date().toString() + "\n" + CsvUtils.toCsvString(result, ASMDiskUsage.class));
153154
}
154155

155156
@Override

‎src/main/java/root/core/usecase/implement/ServerCheckUsecaseImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import root.core.repository.constracts.ServerCheckRepository;
2929
import root.core.usecase.constracts.ServerCheckUsecase;
3030
import root.utils.ConsoleUtils;
31+
import root.utils.CsvUtils;
3132
import root.utils.DBManageExcel;
3233
import root.utils.DateUtils;
3334
import root.utils.ExcelUtils;
@@ -177,7 +178,7 @@ public void printOSDiskUsage() {
177178
System.out.println("\t▶ OS Disk Usage : SUCCESS!");
178179
}
179180
try {
180-
TextTable tt = new TextTable(new CsvTableModel(OSDiskUsage.toCsvString(result)));
181+
TextTable tt = new TextTable(new CsvTableModel(CsvUtils.toCsvString(result, OSDiskUsage.class)));
181182
tt.printTable(System.out, 8);
182183
} catch (IOException e) {
183184
e.printStackTrace();
@@ -237,7 +238,7 @@ public void writeCsvOSDiskUsage() throws Exception {
237238

238239
List<OSDiskUsage> result = serverCheckRepository.checkOSDiskUsage();
239240

240-
String filePath = "C:\\Users\\aserv\\Documents\\WorkSpace_DBMonitoring_Quartz\\DBMonitoring\\report\\OSDiskUsage\\";
241+
String filePath = "./report/OSDiskUsage/";
241242
String fileName = serverName;
242243
String extension = ".txt";
243244
File file = new File(filePath + fileName + extension);
@@ -250,7 +251,7 @@ public void writeCsvOSDiskUsage() throws Exception {
250251

251252
BufferedWriter bw = new BufferedWriter(new FileWriter(file, true));
252253
bw.append(new Date().toString()).append("\n");
253-
bw.append(OSDiskUsage.toCsvString(result)).append("\n");
254+
bw.append(CsvUtils.toCsvString(result, OSDiskUsage.class)).append("\n");
254255
bw.flush();
255256
bw.close();
256257
}

0 commit comments

Comments
 (0)