diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/FileAggregatorCommon.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/FileAggregatorCommon.java index ec93335..b79e20d 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/FileAggregatorCommon.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/FileAggregatorCommon.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Optional; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.util.IndicSearchCommon; import ru.nbch.indicsearchservice.util.MovableBufferedReader; @@ -108,7 +109,7 @@ public class FileAggregatorCommon { Optional foundRuUidSerialNum = IndicSearchCommon.getRowValue(lineList, "SERIAL_NUM"); if (foundRuUidSerialNum.isEmpty()) { - throw new RuntimeException("SERIAL_NUM was not found!"); + throw new InternalException("SERIAL_NUM was not found in line " + ruUidLine); } Long ruUidSerialNum = Long.parseLong(foundRuUidSerialNum.get()); @@ -124,7 +125,7 @@ public class FileAggregatorCommon { List childLineList = Arrays.asList(childLine.split("%%%")); Optional foundChildAccSerialNum = IndicSearchCommon.getRowValue(childLineList, "ACC_SERIAL_NUM"); if (foundChildAccSerialNum.isEmpty()) { - throw new RuntimeException("ACC_SERIAL_NUM was not found in table " + childTableName); + throw new InternalException("ACC_SERIAL_NUM was not found in table " + childTableName + " in line " + childLine); } Long childAccSerialNum = Long.parseLong(foundChildAccSerialNum.get()); @@ -133,7 +134,7 @@ public class FileAggregatorCommon { childLineList = Arrays.asList(childLine.split("%%%")); foundChildAccSerialNum = IndicSearchCommon.getRowValue(childLineList, "ACC_SERIAL_NUM"); if (foundChildAccSerialNum.isEmpty()) { - throw new RuntimeException("ACC_SERIAL_NUM was not found in table " + childTableName); + throw new InternalException("ACC_SERIAL_NUM was not found in table " + childTableName + " in line " + childLine); } childAccSerialNum = Long.parseLong(foundChildAccSerialNum.get()); @@ -164,7 +165,7 @@ public class FileAggregatorCommon { childLineList = Arrays.asList(childLine.split("%%%")); foundChildAccSerialNum = IndicSearchCommon.getRowValue(childLineList, "ACC_SERIAL_NUM"); if (foundChildAccSerialNum.isEmpty()) { - throw new RuntimeException("ACC_SERIAL_NUM was not found in table " + childTableName); + throw new InternalException("ACC_SERIAL_NUM was not found in table " + childTableName + " in line " + childLine); } childAccSerialNum = Long.parseLong(foundChildAccSerialNum.get()); @@ -190,7 +191,7 @@ public class FileAggregatorCommon { br.getReader().close(); } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException(e); } } @@ -212,7 +213,7 @@ public class FileAggregatorCommon { Optional foundParentSerialNum = IndicSearchCommon.getRowValue(parentLineList, "SERIAL_NUM"); if (foundParentSerialNum.isEmpty()) { - throw new RuntimeException("SERIAL_NUM was not found!"); + throw new InternalException("SERIAL_NUM was not found in line " + parentLine); } Long parentSerialNum = Long.parseLong(foundParentSerialNum.get()); @@ -224,7 +225,7 @@ public class FileAggregatorCommon { List childLineList = Arrays.asList(blocksLine.split("%%%")); Optional foundChildParentSerialNum = IndicSearchCommon.getRowValue(childLineList, "PARENT_SERIAL_NUM"); if (foundChildParentSerialNum.isEmpty()) { - throw new RuntimeException("PARENT_SERIAL_NUM was not found!"); + throw new InternalException("PARENT_SERIAL_NUM was not found in line " + blocksLine); } Long blocksParentSerialNum = Long.parseLong(foundChildParentSerialNum.get()); @@ -233,7 +234,7 @@ public class FileAggregatorCommon { childLineList = Arrays.asList(blocksLine.split("%%%")); foundChildParentSerialNum = IndicSearchCommon.getRowValue(childLineList, "PARENT_SERIAL_NUM"); if (foundChildParentSerialNum.isEmpty()) { - throw new RuntimeException("PARENT_SERIAL_NUM was not found!"); + throw new InternalException("PARENT_SERIAL_NUM was not found in line " + blocksLine); } blocksParentSerialNum = Long.parseLong(foundChildParentSerialNum.get()); @@ -256,7 +257,7 @@ public class FileAggregatorCommon { childLineList = Arrays.asList(blocksLine.split("%%%")); foundChildParentSerialNum = IndicSearchCommon.getRowValue(childLineList, "PARENT_SERIAL_NUM"); if (foundChildParentSerialNum.isEmpty()) { - throw new RuntimeException("PARENT_SERIAL_NUM was not found!"); + throw new InternalException("PARENT_SERIAL_NUM was not found in line " + blocksLine); } blocksParentSerialNum = Long.parseLong(foundChildParentSerialNum.get()); @@ -273,7 +274,7 @@ public class FileAggregatorCommon { } } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException(e); } } @@ -333,7 +334,7 @@ public class FileAggregatorCommon { rowCounter.increment(); if (foundAccountSerialNum.isEmpty()) { - throw new RuntimeException("SERIAL_NUM was not found!"); + throw new InternalException("SERIAL_NUM was not found in line " + accountLine); } Long accountSerialNum = Long.parseLong(foundAccountSerialNum.get()); @@ -349,7 +350,7 @@ public class FileAggregatorCommon { List childLineList = Arrays.asList(childLine.split("%%%")); Optional foundChildAccSerialNum = IndicSearchCommon.getRowValue(childLineList, "ACC_SERIAL_NUM"); if (foundChildAccSerialNum.isEmpty()) { - throw new RuntimeException("ACC_SERIAL_NUM was not found in table " + childTableName); + throw new InternalException("ACC_SERIAL_NUM was not found in table " + childTableName + " in line " + childLine); } Long childAccSerialNum = Long.parseLong(foundChildAccSerialNum.get()); @@ -358,7 +359,7 @@ public class FileAggregatorCommon { childLineList = Arrays.asList(childLine.split("%%%")); foundChildAccSerialNum = IndicSearchCommon.getRowValue(childLineList, "ACC_SERIAL_NUM"); if (foundChildAccSerialNum.isEmpty()) { - throw new RuntimeException("ACC_SERIAL_NUM was not found in table " + childTableName); + throw new InternalException("ACC_SERIAL_NUM was not found in table " + childTableName + " in line " + childLine); } childAccSerialNum = Long.parseLong(foundChildAccSerialNum.get()); @@ -381,7 +382,7 @@ public class FileAggregatorCommon { childLineList = Arrays.asList(childLine.split("%%%")); foundChildAccSerialNum = IndicSearchCommon.getRowValue(childLineList, "ACC_SERIAL_NUM"); if (foundChildAccSerialNum.isEmpty()) { - throw new RuntimeException("ACC_SERIAL_NUM was not found in table " + childTableName); + throw new InternalException("ACC_SERIAL_NUM was not found in table " + childTableName + " in line " + childLine); } childAccSerialNum = Long.parseLong(foundChildAccSerialNum.get()); @@ -403,7 +404,7 @@ public class FileAggregatorCommon { br.getReader().close(); } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException(e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfFidPassportOgrnFileAggregator.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfFidPassportOgrnFileAggregator.java index 1e3b58b..46c24c2 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfFidPassportOgrnFileAggregator.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfFidPassportOgrnFileAggregator.java @@ -13,6 +13,7 @@ import java.util.UUID; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; import ru.nbch.indicsearchservice.util.IndicSearchCommon; @@ -73,14 +74,14 @@ public class GutdfFidPassportOgrnFileAggregator implements FileAggregator { rowCounter.increment(); } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read file " + tableFileMap.get(tableName) + " " + e); } } } aggregatedFileWriter.write("EOF"); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException(e); } return aggregatedFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuApplicationFileAggregator.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuApplicationFileAggregator.java index a508c1d..11a9590 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuApplicationFileAggregator.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuApplicationFileAggregator.java @@ -12,6 +12,7 @@ import java.util.UUID; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; import ru.nbch.indicsearchservice.util.IndicSearchCommon; @@ -65,7 +66,7 @@ public class GutdfRuApplicationFileAggregator implements FileAggregator { aggregatedFileWriter.write("EOF"); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read file " + tableFileMap.get("RU_APPLICATION") + " " + e); } return aggregatedFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuUidFileAggregator.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuUidFileAggregator.java index 71e96f5..6d77190 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuUidFileAggregator.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/GutdfRuUidFileAggregator.java @@ -10,6 +10,7 @@ import java.util.UUID; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -39,7 +40,7 @@ public class GutdfRuUidFileAggregator implements FileAggregator { aggregatedFileWriter.write("EOF"); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to write file " + aggregatedFile + " " + e); } return aggregatedFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfAccountFileAggregator.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfAccountFileAggregator.java index 6a5ec90..1b4f8ad 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfAccountFileAggregator.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfAccountFileAggregator.java @@ -10,6 +10,7 @@ import java.util.UUID; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -41,7 +42,7 @@ public class TutdfAccountFileAggregator implements FileAggregator { aggregatedFileWriter.write("EOF"); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to write file " + aggregatedFile + " " + e); } return aggregatedFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfFidPassportOgrnFileAggregator.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfFidPassportOgrnFileAggregator.java index 7b2f157..62c2e78 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfFidPassportOgrnFileAggregator.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfFidPassportOgrnFileAggregator.java @@ -13,6 +13,7 @@ import java.util.UUID; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; import ru.nbch.indicsearchservice.util.IndicSearchCommon; @@ -68,14 +69,14 @@ public class TutdfFidPassportOgrnFileAggregator implements FileAggregator { rowCounter.increment(); } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read file " + tableFileMap.get(tableName) + " " + e); } } } aggregatedFileWriter.write("EOF"); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to write file " + aggregatedFile + " " + e); } return aggregatedFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfInformationFileAggregator.java b/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfInformationFileAggregator.java index 2194d0f..3fe564b 100644 --- a/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfInformationFileAggregator.java +++ b/src/main/java/ru/nbch/indicsearchservice/aggregator/TutdfInformationFileAggregator.java @@ -12,6 +12,7 @@ import java.util.UUID; import org.apache.commons.lang3.mutable.MutableLong; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; import ru.nbch.indicsearchservice.util.IndicSearchCommon; @@ -63,7 +64,7 @@ public class TutdfInformationFileAggregator implements FileAggregator { aggregatedFileWriter.write("EOF"); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read file " + tableFileMap.get("INFORMATION") + " " + e); } return aggregatedFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/dto/response/InternalExceptionResponseDto.java b/src/main/java/ru/nbch/indicsearchservice/dto/response/InternalExceptionResponseDto.java new file mode 100644 index 0000000..af6ea4b --- /dev/null +++ b/src/main/java/ru/nbch/indicsearchservice/dto/response/InternalExceptionResponseDto.java @@ -0,0 +1,8 @@ +package ru.nbch.indicsearchservice.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "Internal exception response data transfer object") +public record InternalExceptionResponseDto( + @Schema(description = "Error message", example = "При обработке запроса произошла ошибка.") String message) { +} diff --git a/src/main/java/ru/nbch/indicsearchservice/exception/ExceptionHandlerAdvice.java b/src/main/java/ru/nbch/indicsearchservice/exception/ExceptionHandlerAdvice.java new file mode 100644 index 0000000..6b3be6d --- /dev/null +++ b/src/main/java/ru/nbch/indicsearchservice/exception/ExceptionHandlerAdvice.java @@ -0,0 +1,24 @@ +package ru.nbch.indicsearchservice.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import ru.nbch.indicsearchservice.dto.response.InternalExceptionResponseDto; + +@RestControllerAdvice +public class ExceptionHandlerAdvice { + @ExceptionHandler(InternalException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public @ResponseBody InternalExceptionResponseDto handleInternalException(InternalException ex) { + return ex.getInternalExceptionResponseDto(); + } + + @ExceptionHandler(HttpMessageNotReadableException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public @ResponseBody InternalExceptionResponseDto handleHttpMessageNotReadableException(HttpMessageNotReadableException ex) { + return new InternalExceptionResponseDto("Invalid JSON " + ex); + } +} diff --git a/src/main/java/ru/nbch/indicsearchservice/exception/InternalException.java b/src/main/java/ru/nbch/indicsearchservice/exception/InternalException.java index b109eca..48fa868 100644 --- a/src/main/java/ru/nbch/indicsearchservice/exception/InternalException.java +++ b/src/main/java/ru/nbch/indicsearchservice/exception/InternalException.java @@ -1,5 +1,7 @@ package ru.nbch.indicsearchservice.exception; +import ru.nbch.indicsearchservice.dto.response.InternalExceptionResponseDto; + public class InternalException extends RuntimeException { private final String message; @@ -7,4 +9,13 @@ public class InternalException extends RuntimeException { super(message); this.message = message; } + + public InternalException(Throwable cause) { + super(cause); + this.message = cause.getMessage(); + } + + public InternalExceptionResponseDto getInternalExceptionResponseDto() { + return new InternalExceptionResponseDto(this.message); + } } diff --git a/src/main/java/ru/nbch/indicsearchservice/exporter/JsonExporter.java b/src/main/java/ru/nbch/indicsearchservice/exporter/JsonExporter.java index 3c0224b..34a7360 100644 --- a/src/main/java/ru/nbch/indicsearchservice/exporter/JsonExporter.java +++ b/src/main/java/ru/nbch/indicsearchservice/exporter/JsonExporter.java @@ -45,6 +45,9 @@ public class JsonExporter implements Exporter { try (BufferedReader reader = Files.newBufferedReader(aggregatedFile); JsonGenerator jsonGenerator = jsonMapper.createGenerator(Files.newOutputStream(jsonFile))) { + jsonGenerator.writeStartObject(); + jsonGenerator.writeName("datasheets"); + jsonGenerator.writeStartArray(); jsonGenerator.writeStartArray(); Iterator iterator = reader.lines().iterator(); @@ -74,6 +77,8 @@ public class JsonExporter implements Exporter { } jsonGenerator.writeEndArray(); + jsonGenerator.writeEndArray(); + jsonGenerator.writeEndObject(); } catch (IOException e) { log.error(e.getMessage(), e); } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/AccountTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/AccountTableLoader.java index c4987f2..b620bf0 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/AccountTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/AccountTableLoader.java @@ -10,6 +10,7 @@ import java.util.Set; import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.loader.subtable.AccountSubTableLoader; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; @@ -71,7 +72,7 @@ public class AccountTableLoader implements FirstLevelTableLoader, TableLoaderFor tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, foundFids, tableMetaDataMap)); accountSubTableLoaders.parallelStream().forEach(tl -> tl.searchByAccountFid(taskId, foundFids, tableFileMap, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } else if (searchParameter == SearchParameter.FID) { Set fids = Set.of(Integer.parseInt(searchValue)); @@ -80,7 +81,7 @@ public class AccountTableLoader implements FirstLevelTableLoader, TableLoaderFor tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); accountSubTableLoaders.parallelStream().forEach(tl -> tl.searchByAccountFid(taskId, fids, tableFileMap, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -99,7 +100,7 @@ public class AccountTableLoader implements FirstLevelTableLoader, TableLoaderFor try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromAccount(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/BankruptcyTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/BankruptcyTableLoader.java index 5e814cf..dbcda49 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/BankruptcyTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/BankruptcyTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class BankruptcyTableLoader implements FirstLevelTableLoader, TableLoader try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromBankruptcy(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class BankruptcyTableLoader implements FirstLevelTableLoader, TableLoader try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromBankruptcy(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/ConsumerBankruptcyTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/ConsumerBankruptcyTableLoader.java index 293b99b..7055308 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/ConsumerBankruptcyTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/ConsumerBankruptcyTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class ConsumerBankruptcyTableLoader implements FirstLevelTableLoader, Tab try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromConsumerBankruptcy(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class ConsumerBankruptcyTableLoader implements FirstLevelTableLoader, Tab try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromConsumerBankruptcy(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/IdTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/IdTableLoader.java index 8a5fae2..1665f18 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/IdTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/IdTableLoader.java @@ -12,6 +12,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -81,7 +82,7 @@ public class IdTableLoader implements FirstLevelTableLoader { } } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } tableLoaders.parallelStream().forEach(tl -> tl.searchById( @@ -114,7 +115,7 @@ public class IdTableLoader implements FirstLevelTableLoader { } } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } tableLoaders.parallelStream().forEach(tl -> tl.searchById( diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/InformationTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/InformationTableLoader.java index 14e7955..78de216 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/InformationTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/InformationTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class InformationTableLoader implements FirstLevelTableLoader, TableLoade try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByMemberCodeFromInformation(memberCode)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } else if (searchParameter == SearchParameter.FID) { Set fids = Set.of(Integer.parseInt(searchValue)); @@ -67,7 +68,7 @@ public class InformationTableLoader implements FirstLevelTableLoader, TableLoade try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromInformation(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -87,7 +88,7 @@ public class InformationTableLoader implements FirstLevelTableLoader, TableLoade try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromInformation(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/LegalTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/LegalTableLoader.java index 76ca382..542b133 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/LegalTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/LegalTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class LegalTableLoader implements FirstLevelTableLoader, TableLoaderForId try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromLegal(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class LegalTableLoader implements FirstLevelTableLoader, TableLoaderForId try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromLegal(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuApplicationTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuApplicationTableLoader.java index fa800df..4b157ab 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuApplicationTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuApplicationTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuApplicationTableLoader implements FirstLevelTableLoader, TableLoa try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByMemberCodeFromRuApplication(memberCode)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } else if (searchParameter == SearchParameter.FID) { Set fids = Set.of(Integer.parseInt(searchValue)); @@ -67,7 +68,7 @@ public class RuApplicationTableLoader implements FirstLevelTableLoader, TableLoa try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuApplication(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -87,7 +88,7 @@ public class RuApplicationTableLoader implements FirstLevelTableLoader, TableLoa try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuApplication(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuBankruptcyTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuBankruptcyTableLoader.java index dfefecb..d5fb28b 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuBankruptcyTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuBankruptcyTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuBankruptcyTableLoader implements FirstLevelTableLoader, TableLoad try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuBankruptcy(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class RuBankruptcyTableLoader implements FirstLevelTableLoader, TableLoad try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuBankruptcy(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuCapabilityTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuCapabilityTableLoader.java index b5d8d5c..cf3ebc4 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuCapabilityTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuCapabilityTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuCapabilityTableLoader implements FirstLevelTableLoader, TableLoad try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCapability(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class RuCapabilityTableLoader implements FirstLevelTableLoader, TableLoad try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCapability(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuDebtBurdenInfoTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuDebtBurdenInfoTableLoader.java index 17fb10b..a173a43 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuDebtBurdenInfoTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuDebtBurdenInfoTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuDebtBurdenInfoTableLoader implements FirstLevelTableLoader, Table try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuDebtBurdenInfo(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class RuDebtBurdenInfoTableLoader implements FirstLevelTableLoader, Table try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuDebtBurdenInfo(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuObligPartTakeTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuObligPartTakeTableLoader.java index 5658969..0fe77b0 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuObligPartTakeTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuObligPartTakeTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuObligPartTakeTableLoader implements FirstLevelTableLoader, TableL try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuObligPartTake(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class RuObligPartTakeTableLoader implements FirstLevelTableLoader, TableL try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuObligPartTake(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuOtherLegalTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuOtherLegalTableLoader.java index ede3d00..ee23096 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuOtherLegalTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuOtherLegalTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuOtherLegalTableLoader implements FirstLevelTableLoader, TableLoad try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuOtherLegal(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class RuOtherLegalTableLoader implements FirstLevelTableLoader, TableLoad try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuOtherLegal(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuSettledTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuSettledTableLoader.java index 916f400..6182f78 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuSettledTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuSettledTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; import ru.nbch.indicsearchservice.model.enums.SearchParameter; @@ -59,7 +60,7 @@ public class RuSettledTableLoader implements FirstLevelTableLoader, TableLoaderF try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuSettled(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -79,7 +80,7 @@ public class RuSettledTableLoader implements FirstLevelTableLoader, TableLoaderF try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuSettled(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/RuUidTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/RuUidTableLoader.java index acb0339..78e8278 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/RuUidTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/RuUidTableLoader.java @@ -11,6 +11,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.loader.subtable.RuUidSubTableLoader; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.model.enums.DataType; @@ -72,7 +73,7 @@ public class RuUidTableLoader implements FirstLevelTableLoader, TableLoaderForId tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, foundFids, tableMetaDataMap)); ruUidSubTableLoaders.parallelStream().forEach(tl -> tl.searchByRuUidFid(taskId, foundFids, tableFileMap, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } else if (searchParameter == SearchParameter.FID) { Set fids = Set.of(Integer.parseInt(searchValue)); @@ -81,7 +82,7 @@ public class RuUidTableLoader implements FirstLevelTableLoader, TableLoaderForId tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); ruUidSubTableLoaders.parallelStream().forEach(tl -> tl.searchByRuUidFid(taskId, fids, tableFileMap, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } @@ -101,7 +102,7 @@ public class RuUidTableLoader implements FirstLevelTableLoader, TableLoaderForId try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuUid(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/AccountAmendTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/AccountAmendTableLoader.java index 64265fc..3217aaa 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/AccountAmendTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/AccountAmendTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class AccountAmendTableLoader implements AccountSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromAccountAmend(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/BankGuaranteeTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/BankGuaranteeTableLoader.java index b32de5a..911a358 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/BankGuaranteeTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/BankGuaranteeTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class BankGuaranteeTableLoader implements AccountSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromBankGuarantee(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/CollateralTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/CollateralTableLoader.java index 3c21ce2..a54c580 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/CollateralTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/CollateralTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class CollateralTableLoader implements AccountSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromCollateral(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/GuarantorTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/GuarantorTableLoader.java index 40731e1..957b984 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/GuarantorTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/GuarantorTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class GuarantorTableLoader implements AccountSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromGuarantor(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/PaymentTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/PaymentTableLoader.java index 58ec02b..ba88906 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/PaymentTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/PaymentTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class PaymentTableLoader implements AccountSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromPayment(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAccountAmtTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAccountAmtTableLoader.java index da199d4..8d0df5d 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAccountAmtTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAccountAmtTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuAccountAmtTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuAccountAmt(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerIndividTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerIndividTableLoader.java index 263439e..853107b 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerIndividTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerIndividTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuAcquirerIndividTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuAcquirerIndivid(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerLegalTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerLegalTableLoader.java index 603fc32..f3cae55 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerLegalTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAcquirerLegalTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuAcquirerLegalTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuAcquirerLegal(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAllArrearsTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAllArrearsTableLoader.java index a1fabb7..7dcfa2f 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAllArrearsTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAllArrearsTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuAllArrearsTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuAllArrears(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmendmentTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmendmentTableLoader.java index 786687e..020ca24 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmendmentTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmendmentTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuAmendmentTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuAmendment(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmountInfoTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmountInfoTableLoader.java index c3a27b9..35bad4b 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmountInfoTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuAmountInfoTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuAmountInfoTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuAmountInfo(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuArrearTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuArrearTableLoader.java index 9eb350f..b20951d 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuArrearTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuArrearTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuArrearTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuArrear(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuBankruptcyBlocksTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuBankruptcyBlocksTableLoader.java index 841e716..b5aa76f 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuBankruptcyBlocksTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuBankruptcyBlocksTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuBankruptcyBlocksTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuBankruptcyBlocks(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCoborrowerTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCoborrowerTableLoader.java index c0f1fa3..f093bf7 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCoborrowerTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCoborrowerTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuCoborrowerTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCoborrower(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatInsuredTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatInsuredTableLoader.java index 7018afe..0ba1ad2 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatInsuredTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatInsuredTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuCollatInsuredTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCollatInsured(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatRepayTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatRepayTableLoader.java index e343703..dcff360 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatRepayTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollatRepayTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuCollatRepayTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCollatRepay(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralBlocksTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralBlocksTableLoader.java index f57d6da..68b33cd 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralBlocksTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralBlocksTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuCollateralBlocksTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCollateralBlocks(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralTableLoader.java index f7c127d..95478bb 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuCollateralTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuCollateralTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuCollateral(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuContractTermsChangesTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuContractTermsChangesTableLoader.java index 656bf4a..9f3de70 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuContractTermsChangesTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuContractTermsChangesTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuContractTermsChangesTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuContractTermsChanges(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuDueArrearTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuDueArrearTableLoader.java index d5ed694..a75a3c5 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuDueArrearTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuDueArrearTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuDueArrearTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuDueArrear(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuFundDateTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuFundDateTableLoader.java index 53fe9e3..985c1f3 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuFundDateTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuFundDateTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuFundDateTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuFundDate(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuaranteeRepayTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuaranteeRepayTableLoader.java index b8b8319..47783f2 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuaranteeRepayTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuaranteeRepayTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuGuaranteeRepayTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuGuaranteeRepay(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuarantorTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuarantorTableLoader.java index c1fc7a9..29175a4 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuarantorTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuGuarantorTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuGuarantorTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuGuarantor(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuIndepGuarantorTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuIndepGuarantorTableLoader.java index 31c1998..1762bda 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuIndepGuarantorTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuIndepGuarantorTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuIndepGuarantorTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuIndepGuarantor(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuLegalRecordTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuLegalRecordTableLoader.java index 5e204ba..7e9b25f 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuLegalRecordTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuLegalRecordTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuLegalRecordTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuLegalRecord(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuMonthAverPaymtTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuMonthAverPaymtTableLoader.java index 6e65bd9..2c96878 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuMonthAverPaymtTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuMonthAverPaymtTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuMonthAverPaymtTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuMonthAverPaymt(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligAccountTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligAccountTableLoader.java index 38ab0c3..19af6f5 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligAccountTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligAccountTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuObligAccountTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuObligAccount(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligTerminationTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligTerminationTableLoader.java index 75651f2..3ae6ca7 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligTerminationTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligTerminationTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuObligTerminationTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuObligTermination(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcBankruptTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcBankruptTableLoader.java index 602aabf..ace4f00 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcBankruptTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcBankruptTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuObligsRcBankruptTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuObligsRcBankrupt(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcLiquidTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcLiquidTableLoader.java index 3ccf7ea..d10a613 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcLiquidTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuObligsRcLiquidTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuObligsRcLiquidTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuObligsRcLiquid(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuOverallvalTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuOverallvalTableLoader.java index 6ae1233..f3ceea4 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuOverallvalTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuOverallvalTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -39,7 +40,7 @@ public class RuOverallvalTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuOverallval(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPastDueArrearTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPastDueArrearTableLoader.java index e6c3a6c..d8e8a3b 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPastDueArrearTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPastDueArrearTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuPastDueArrearTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuPastDueArrear(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtConditionTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtConditionTableLoader.java index b274c39..18526d1 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtConditionTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtConditionTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuPaymtConditionTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuPaymtCondition(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtTableLoader.java index 9393be1..b08beb6 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuPaymtTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuPaymtTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuPaymt(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuServiceCoTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuServiceCoTableLoader.java index 2deb558..6083458 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuServiceCoTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuServiceCoTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuServiceCoTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuServiceCo(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSourceNonMonetObligTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSourceNonMonetObligTableLoader.java index 46a8d5c..7aee343 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSourceNonMonetObligTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSourceNonMonetObligTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuSourceNonMonetObligTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuSourceNonMonetOblig(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubjectNonMonetObligTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubjectNonMonetObligTableLoader.java index 2d265f6..7fe3dba 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubjectNonMonetObligTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubjectNonMonetObligTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuSubjectNonMonetObligTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuSubjectNonMonetOblig(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubmitHoldTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubmitHoldTableLoader.java index e915e5f..886573f 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubmitHoldTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuSubmitHoldTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuSubmitHoldTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuSubmitHold(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuTradeTableLoader.java b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuTradeTableLoader.java index bccca37..a6b57af 100644 --- a/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuTradeTableLoader.java +++ b/src/main/java/ru/nbch/indicsearchservice/loader/subtable/RuTradeTableLoader.java @@ -9,6 +9,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.util.IndicSearchUtils; import ru.nbch.indicsearchservice.util.MapperHolder; @@ -38,7 +39,7 @@ public class RuTradeTableLoader implements RuUidSubTableLoader { try (Cursor> cursor = mapperHolder.getIndicMapper().findAllByFidsFromRuTrade(fids)) { tableFileMap.put(getTableName(), indicSearchUtils.writeRowsToFile(taskId, getTableName(), cursor, tableMetaDataMap)); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read cursor " + e); } } } diff --git a/src/main/java/ru/nbch/indicsearchservice/model/TableData.java b/src/main/java/ru/nbch/indicsearchservice/model/TableData.java index 8735464..40b05df 100644 --- a/src/main/java/ru/nbch/indicsearchservice/model/TableData.java +++ b/src/main/java/ru/nbch/indicsearchservice/model/TableData.java @@ -1,5 +1,6 @@ package ru.nbch.indicsearchservice.model; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.ArrayList; import java.util.List; @@ -9,6 +10,8 @@ import java.util.Objects; public class TableData { private String tableName; private List fieldData = new ArrayList<>(); + + @JsonProperty("related_data") private List relatedTableData = new ArrayList<>(); public TableData() { @@ -58,7 +61,7 @@ public class TableData { '}'; } - public record FieldData(String columnName, - Object columnValue) { + public record FieldData(@JsonProperty("key") String columnName, + @JsonProperty("value") Object columnValue) { } } diff --git a/src/main/java/ru/nbch/indicsearchservice/service/IndicSearchService.java b/src/main/java/ru/nbch/indicsearchservice/service/IndicSearchService.java index 02e0c54..5c5ddf1 100644 --- a/src/main/java/ru/nbch/indicsearchservice/service/IndicSearchService.java +++ b/src/main/java/ru/nbch/indicsearchservice/service/IndicSearchService.java @@ -25,6 +25,7 @@ import ru.nbch.indicsearchservice.aggregator.FileAggregator; import ru.nbch.indicsearchservice.dto.request.AddSearchJobRequestDto; import ru.nbch.indicsearchservice.dto.response.AddSearchJobResponseDto; import ru.nbch.indicsearchservice.dto.response.JobStatusResponseDto; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.exporter.ExcelExporter; import ru.nbch.indicsearchservice.exporter.JsonExporter; import ru.nbch.indicsearchservice.loader.FirstLevelTableLoader; @@ -42,7 +43,7 @@ import ru.nbch.indicsearchservice.util.MapperHolder; public class IndicSearchService { private static final Logger log = LoggerFactory.getLogger(IndicSearchService.class); - private static final boolean IS_EXPORT_AS_EXCEL = true; + private static final boolean IS_EXPORT_AS_EXCEL = false; private final List tableLoaders; private final List fileAggregators; @@ -133,7 +134,7 @@ public class IndicSearchService { try { Files.deleteIfExists(tableFilePath); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to delete file " + tableFilePath + " " + e); } } @@ -151,11 +152,13 @@ public class IndicSearchService { sw.stop(); log.info(sw.prettyPrint()); -// try { -// Files.deleteIfExists(aggregatedFile); -// } catch (IOException e) { -// throw new RuntimeException(e); -// } + try { + if (aggregatedFile != null) { + Files.deleteIfExists(aggregatedFile); + } + } catch (IOException e) { + throw new InternalException("Failed to delete file " + aggregatedFile + " " + e); + } return null; } diff --git a/src/main/java/ru/nbch/indicsearchservice/service/SettingsService.java b/src/main/java/ru/nbch/indicsearchservice/service/SettingsService.java index bfe22ac..69db2e6 100644 --- a/src/main/java/ru/nbch/indicsearchservice/service/SettingsService.java +++ b/src/main/java/ru/nbch/indicsearchservice/service/SettingsService.java @@ -12,6 +12,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; import ru.nbch.indicsearchservice.event.DataSourceChangedEvent; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.Settings; import ru.nbch.indicsearchservice.repository.bank.SettingsMapper; import ru.nbch.indicsearchservice.util.DataSourceUpdater; @@ -32,7 +33,7 @@ public class SettingsService { public String getSettingsValueByName(String name) { return settingsMapper.findByName(name) - .orElseThrow(() -> new RuntimeException("Setting with key: " + name + " was not found in database!")) + .orElseThrow(() -> new InternalException("Setting with key: " + name + " was not found in database!")) .getValue(); } @@ -75,7 +76,7 @@ public class SettingsService { try { Files.createDirectories(Paths.get(newStorageDirectory.get())); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to create directory " + newStorageDirectory.get() + " " + e); } localSettings.setStorageDirectory(new File(newStorageDirectory.get())); } diff --git a/src/main/java/ru/nbch/indicsearchservice/util/DataSourceUpdater.java b/src/main/java/ru/nbch/indicsearchservice/util/DataSourceUpdater.java index 345ff11..c35bfd5 100644 --- a/src/main/java/ru/nbch/indicsearchservice/util/DataSourceUpdater.java +++ b/src/main/java/ru/nbch/indicsearchservice/util/DataSourceUpdater.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; import ru.nbch.indicsearchservice.config.settings.DataSourceSettings; import ru.nbch.indicsearchservice.event.DataSourceChangedEvent; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.repository.MyBatisRepository; import ru.nbch.indicsearchservice.repository.indic.IndicMapper; import ru.nbch.indicsearchservice.service.SettingsService; @@ -175,13 +176,13 @@ public class DataSourceUpdater { SqlSessionFactory sessionFactory = sqlSessionFactoryBean.getObject(); if (sessionFactory == null) { - throw new IllegalStateException("Failed to create SqlSessionFactory"); + throw new InternalException("Failed to create SqlSessionFactory"); } return sessionFactory; } catch (Exception e) { log.error("Failed to build SqlSessionFactory", e); - throw new RuntimeException("Failed to build SqlSessionFactory", e); + throw new InternalException("Failed to build SqlSessionFactory " + e); } } @@ -217,10 +218,10 @@ public class DataSourceUpdater { )); DataSourceSettings dataSourceSettings = new DataSourceSettings(); - dataSourceSettings.setDriver(fetchedSettings.get("datasource." + key + ".driver").orElseThrow(() -> new RuntimeException("Required SETTINGS not found!"))); - dataSourceSettings.setUrl(fetchedSettings.get("datasource." + key + ".url").orElseThrow(() -> new RuntimeException("Required SETTINGS not found!"))); - dataSourceSettings.setUsername(fetchedSettings.get("datasource." + key + ".username").orElseThrow(() -> new RuntimeException("Required SETTINGS not found!"))); - dataSourceSettings.setPassword(fetchedSettings.get("datasource." + key + ".password").orElseThrow(() -> new RuntimeException("Required SETTINGS not found!"))); + dataSourceSettings.setDriver(fetchedSettings.get("datasource." + key + ".driver").orElseThrow(() -> new InternalException("Key datasource." + key + ".driver" + " was not found in SETTINGS!"))); + dataSourceSettings.setUrl(fetchedSettings.get("datasource." + key + ".url").orElseThrow(() -> new InternalException("Key datasource." + key + ".url" + " was not found in SETTINGS!"))); + dataSourceSettings.setUsername(fetchedSettings.get("datasource." + key + ".username").orElseThrow(() -> new InternalException("Key datasource." + key + ".username" + " was not found in SETTINGS!"))); + dataSourceSettings.setPassword(fetchedSettings.get("datasource." + key + ".password").orElseThrow(() -> new InternalException("Key datasource." + key + ".password" + " was not found in SETTINGS!"))); dataSourceSettings.setConnectionTimeout(Long.valueOf(fetchedSettings.get("datasource." + key + ".connection-timeout").orElse("30000"))); dataSourceSettings.setValidationTimeout(Long.valueOf(fetchedSettings.get("datasource." + key + ".validation-timeout").orElse("5000"))); diff --git a/src/main/java/ru/nbch/indicsearchservice/util/IndicSearchUtils.java b/src/main/java/ru/nbch/indicsearchservice/util/IndicSearchUtils.java index 63aa5db..6af1cd7 100644 --- a/src/main/java/ru/nbch/indicsearchservice/util/IndicSearchUtils.java +++ b/src/main/java/ru/nbch/indicsearchservice/util/IndicSearchUtils.java @@ -16,6 +16,7 @@ import java.util.UUID; import org.apache.ibatis.cursor.Cursor; import org.springframework.stereotype.Component; import ru.nbch.indicsearchservice.config.settings.ApplicationSettings; +import ru.nbch.indicsearchservice.exception.InternalException; import ru.nbch.indicsearchservice.model.LocalizationObject; import ru.nbch.indicsearchservice.model.TableMetaData; import ru.nbch.indicsearchservice.repository.bank.LocalizationObjectMapper; @@ -94,7 +95,7 @@ public class IndicSearchUtils { writer.newLine(); } } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to write file " + resultFile + " " + e); } return resultFile; diff --git a/src/main/java/ru/nbch/indicsearchservice/util/MovableBufferedReader.java b/src/main/java/ru/nbch/indicsearchservice/util/MovableBufferedReader.java index 6824aed..e9891ad 100644 --- a/src/main/java/ru/nbch/indicsearchservice/util/MovableBufferedReader.java +++ b/src/main/java/ru/nbch/indicsearchservice/util/MovableBufferedReader.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.Closeable; import java.io.IOException; import java.util.Objects; +import ru.nbch.indicsearchservice.exception.InternalException; public class MovableBufferedReader implements Closeable { private final BufferedReader reader; @@ -14,7 +15,7 @@ public class MovableBufferedReader implements Closeable { try { this.currentLine = reader.readLine(); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read next line in file " + e); } } @@ -22,7 +23,7 @@ public class MovableBufferedReader implements Closeable { try { this.currentLine = reader.readLine(); } catch (IOException e) { - throw new RuntimeException(e); + throw new InternalException("Failed to read next line in file " + e); } return this.currentLine; }