Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Pull request #149: RED-4014: Renamed metrics

Browse Source 
Merge in RED/redaction-report-service from RED-4014 to master

* commit '94b29f5bf2510500a714485fac3aba531d5c8f0e':
  RED-4014: Renamed metrics
This commit is contained in:
Dominique Eiflaender 2022-06-07 11:39:08 +02:00
commit 2743681c64
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java
View File

@ -67,7 +67,7 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
public class ExcelReportGenerationService {
@Timed("generateExcelReport")
@Timed("redactmanager_generateExcelReport")
public void generateExcelReport(List<ReportRedactionEntry> reportEntries, PlaceholderModel placeholderModel,
String reportTemplateName, SXSSFWorkbook workbook, String dossierName,
FileModel fileModel, ExcelModel excelModel, boolean isLastFile) {
@ -105,7 +105,7 @@ public class ExcelReportGenerationService {
@SneakyThrows
@Timed("excel-addRows")
@Timed("redactmanager_excel-addRows")
private void addRows(SXSSFWorkbook workbook, Sheet sheet, Map<CellIdentifier, Cell> copiedCells,
int numberOfRowsToShift, PlaceholderModel placeholderModel, String dossierName,
String filename) {
@ -145,7 +145,7 @@ public class ExcelReportGenerationService {
}
@Timed("calculateExcelModel")
@Timed("redactmanager_calculateExcelModel")
public ExcelModel calculateExcelModel(Sheet sheet) {
long start = System.currentTimeMillis();
@ -182,7 +182,7 @@ public class ExcelReportGenerationService {
}
@Timed("excel-addRedactionEntryRows")
@Timed("redactmanager_excel-addRedactionEntryRows")
private void addRedactionEntryRows(Sheet sheet, List<ReportRedactionEntry> reportEntries, String filename,
ExcelModel excelModel, PlaceholderModel placeholderModel) {

2
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/IuclidFunctionService.java
View File

@ -16,7 +16,7 @@ import io.micrometer.core.annotation.Timed;
@Service
public class IuclidFunctionService {
@Timed("computeIuclidFunction")
@Timed("redactmanager_computeIuclidFunction")
public String computeIuclidFunction(List<ReportRedactionEntry> reportRedactionEntries, String filename) {
Map<String, List<ReportRedactionEntry>> entriesPerJustification = new HashMap<>();

4
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
View File

@ -57,7 +57,7 @@ public class ReportGenerationService {
@SneakyThrows
@Timed("generateReports")
@Timed("redactmanager_generateReports")
public List<StoredFileInformation> generateReports(ReportRequestMessage reportMessage) {
List<StoredFileInformation> storedFileInformation = Collections.synchronizedList(new ArrayList<>());
@ -196,7 +196,7 @@ public class ReportGenerationService {
}
@Timed("getReportEntries")
@Timed("redactmanager_getReportEntries")
private List<ReportRedactionEntry> getReportEntries(String dossierId, String fileId, boolean isExcluded) {
if (isExcluded) {

8
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
View File

@ -39,7 +39,7 @@ public class WordReportGenerationService {
private final IuclidFunctionService iuclidFunctionService;
@Timed("generateWordReport")
@Timed("redactmanager_generateWordReport")
public XWPFDocument generateWordReport(List<ReportRedactionEntry> reportEntries, PlaceholderModel placeholderModel,
String reportTemplateName, XWPFDocument doc, FileModel fileModel,
Dossier dossier, boolean isLastFile) {
@ -167,7 +167,7 @@ public class WordReportGenerationService {
}
@Timed("word-replaceTextPlaceholders")
@Timed("redactmanager_word-replaceTextPlaceholders")
public void replaceTextPlaceholders(XWPFDocument doc, PlaceholderModel placeholderModel, String dossierName,
String fileName, XWPFTable tableToSkip,
List<ReportRedactionEntry> reportRedactionEntries) {
@ -260,7 +260,7 @@ public class WordReportGenerationService {
}
@Timed("word-computePlaceholderPos")
@Timed("redactmanager_word-computePlaceholderPos")
private PlaceHolderFunctions computePlaceholderPos(XWPFTable table, PlaceholderModel placeholderModel) {
Set<String> foundPlaceHolder = new HashSet<>();
@ -282,7 +282,7 @@ public class WordReportGenerationService {
}
@Timed("word-addRedactionEntryRows")
@Timed("redactmanager_word-addRedactionEntryRows")
private void addRedactionEntryRows(XWPFTable table, List<ReportRedactionEntry> reportEntries, String filename,
PlaceholderModel placeholderModel, PlaceHolderFunctions placeHolderFunctions) {