treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added emptyBatchCheckFunction for StaxXmlProcessor to not process empty lists of data

Browse source
This commit is contained in:
Mikhail Trofimov 2025-09-04 12:04:06 +03:00
parent af2cd72647
commit 3fe63a93ec
8 changed files with 77 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
View file

@ -181,7 +181,10 @@ public class SignalFacade {
throw e;
}
request.getSubjects().getSubject().clear();
}, 40000, "/MonitoringRequest/Subjects/Subject");
},
null
,
40000, "/MonitoringRequest/Subjects/Subject");
} catch (IOException e) {
throw new RuntimeException("Error while parsing and validating monitoring request", e);
}

4
src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java
View file

@ -152,6 +152,8 @@ public class MonitoringService {
writer.accept(subjectsBatch);
personsData.getPersons().clear(); // чистим список для экономии памяти
},
pesons -> pesons.getPersons().isEmpty()
,
10000,
"/Report/Persons/Person");
} catch (IOException e) {
@ -267,6 +269,8 @@ public class MonitoringService {
});
response.getSubjects().getSubjects().clear(); // чистим список для экономии памяти
},
response -> response.getSubjects().getSubjects().isEmpty()
,
10000,
"/MonitoringSignalResponse/Subjects/Subject");
} catch (IOException e) {

5
src/main/java/ru/nbch/credit_tracker/service/SignalService.java
View file

@ -91,7 +91,10 @@ public class SignalService {
log.trace("Registered subject's batch. Total count: {}. PackageId: {}", request.getSubjects().getSubject().size(), packageId);
request.getSubjects().getSubject().clear();
}
}, batchSize, "/MonitoringRequest/Subjects/Subject");
},
request -> request.getSubjects().getSubject().isEmpty()
,
batchSize, "/MonitoringRequest/Subjects/Subject");
} catch (IOException e) {
throw new RuntimeException("Error while parsing monitoring request", e);
}

13
src/main/java/ru/nbch/credit_tracker/service/xml/stax/BaseStaxReader.java
View file

@ -7,6 +7,7 @@ import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Iterator;
import java.util.function.Consumer;
import java.util.function.Function;
public abstract class BaseStaxReader<T> implements StaxReader<T> {
private final Deque<String> stack = new ArrayDeque<>();
@ -16,10 +17,10 @@ public abstract class BaseStaxReader<T> implements StaxReader<T> {
@Override
public T read(XMLStreamReader reader) throws XMLStreamException {
return read(reader, null, null, null);
return read(reader, null, null, null, null);
}
public T read(XMLStreamReader reader, Consumer<T> objProcessor, Integer batchSize, String endBatchElementPath) throws XMLStreamException {
public T read(XMLStreamReader reader, Consumer<T> objProcessor, Function<T, Boolean> emptyBatchCheckFunction, Integer batchSize, String endBatchElementPath) throws XMLStreamException {
T obj = createObject();
int objCount = 0;
try {
@ -47,7 +48,7 @@ public abstract class BaseStaxReader<T> implements StaxReader<T> {
if (endBatchElementPath.equals(lastElementPath)) {
objCount++;
if (objCount == batchSize) {
objProcessor.accept(obj);
objProcessor.accept(obj); // обрабатываем пачку элементов
objCount = 0;
}
}
@ -59,7 +60,11 @@ public abstract class BaseStaxReader<T> implements StaxReader<T> {
if (breakExecution) break;
}
if (objProcessor != null) {
objProcessor.accept(obj);
if (emptyBatchCheckFunction == null) {
objProcessor.accept(obj); // Дополнительная обработка пачки если: batchSize меньше количества элементов в xml или дообрабатываем "хвост" меньший чем batchSize
} else if (!emptyBatchCheckFunction.apply(obj)) { // Проверка на пустоту пачки, чтобы не обрабатывать пустой список
objProcessor.accept(obj);
}
}
return obj;
} catch (Exception e) {

3
src/main/java/ru/nbch/credit_tracker/service/xml/stax/StaxReader.java
View file

@ -3,9 +3,10 @@ package ru.nbch.credit_tracker.service.xml.stax;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.util.function.Consumer;
import java.util.function.Function;
public interface StaxReader<T> {
Class<T> type();
T read(XMLStreamReader xmlStreamReader) throws XMLStreamException;
T read(XMLStreamReader reader, Consumer<T> objProcessor, Integer batchSize, String endBatchElementPath) throws XMLStreamException;
T read(XMLStreamReader reader, Consumer<T> objProcessor, Function<T, Boolean> emptyBatchCheckFunction, Integer batchSize, String endBatchElementPath) throws XMLStreamException;
}

12
src/main/java/ru/nbch/credit_tracker/service/xml/stax/StaxXmlProcessor.java
View file

@ -2,16 +2,20 @@ package ru.nbch.credit_tracker.service.xml.stax;
import java.io.InputStream;
import java.util.function.Consumer;
import java.util.function.Function;
public interface StaxXmlProcessor {
<Z> Z read(String xml, Class<Z> clazz);
<Z> Z read(byte[] xml, Class<Z> clazz);
<Z> Z read(InputStream inputStream, Class<Z> clazz);
/**
* @param objProcessor: Консьюмер, который срабатывает, когда считается batchSize элементов endBatchElementPath
* @param batchSize: количество считываемых элементов в пачке
* @param endBatchElementPath: localPath считываемых в пачку элементов. Например: "/Report/Subjects/Subject"
* @param objProcessor: Консьюмер, который срабатывает, когда считается batchSize элементов endBatchElementPath
* @param emptyBatchCheckFunction: Функция проверки на пустоту списка элементов. Пустые списки не будут обработаны консьюмером
* @param batchSize: количество считываемых элементов в пачке
* @param endBatchElementPath: localPath считываемых в пачку элементов. Например: "/Report/Subjects/Subject"
* <Report>
* <Subjects>
* <Subject></Subject>
@ -19,5 +23,5 @@ public interface StaxXmlProcessor {
* </Subjects>
* </Report>
*/
<Z> Z read(InputStream inputStream, Class<Z> clazz, Consumer<Z> objProcessor, Integer batchSize, String endBatchElementPath);
<Z> Z read(InputStream inputStream, Class<Z> clazz, Consumer<Z> objProcessor, Function<Z, Boolean> emptyBatchCheckFunction, Integer batchSize, String endBatchElementPath);
}

5
src/main/java/ru/nbch/credit_tracker/service/xml/stax/XmlProcessorStaxImpl.java
View file

@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
public class XmlProcessorStaxImpl implements StaxXmlProcessor {
private final Logger log = LoggerFactory.getLogger(getClass());
@ -96,13 +97,13 @@ public class XmlProcessorStaxImpl implements StaxXmlProcessor {
}
@Override
public <Z> Z read(InputStream inputStream, Class<Z> clazz, Consumer<Z> objProcessor, Integer batchSize, String endBatchElementPath) {
public <Z> Z read(InputStream inputStream, Class<Z> clazz, Consumer<Z> objProcessor, Function<Z, Boolean> emptyBatchCheckFunction, Integer batchSize, String endBatchElementPath) {
try {
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(inputStream);
@SuppressWarnings("unchecked")
StaxReader<Z> staxProcessor = (StaxReader<Z>) staxReaders.get(clazz);
if (staxProcessor != null) {
return staxProcessor.read(xmlStreamReader, objProcessor, batchSize, endBatchElementPath);
return staxProcessor.read(xmlStreamReader, objProcessor, emptyBatchCheckFunction, batchSize, endBatchElementPath);
}
throw new IllegalStateException("no stax reader registered for " + clazz);
} catch (SignalClientException e) {

44
src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java
View file

@ -89,10 +89,12 @@ public class StaxTest {
List<Person> firstPersonList = new ArrayList<>();
staxXmlProcessor.read(getClass().getResourceAsStream("/monitoring_request/xml/nbki_monitoring_report.xml"), Persons.class,
personsData -> {
Assertions.assertTrue(personsData.getPersons().size() == 1 || personsData.getPersons().isEmpty());
Assertions.assertEquals(1, personsData.getPersons().size());
firstPersonList.addAll(personsData.getPersons());
personsData.getPersons().clear();
},
obj -> obj.getPersons().isEmpty()
,
1,
"/Report/Persons/Person");
@ -102,9 +104,49 @@ public class StaxTest {
secondPersonList.addAll(personsData.getPersons());
personsData.getPersons().clear();
},
obj -> obj.getPersons().isEmpty(),
3,
"/Report/Persons/Person");
Assertions.assertEquals(firstPersonList.size(), secondPersonList.size());
}
@Test
void testParseNbkiMonitoringReportWithBounds() {
staxXmlProcessor.read(getClass().getResourceAsStream("/monitoring_request/xml/nbki_monitoring_report.xml"), Persons.class,
personsData -> {
Assertions.assertEquals(5, personsData.getPersons().size());
personsData.getPersons().clear();
},
obj -> obj.getPersons().isEmpty(),
5,
"/Report/Persons/Person");
staxXmlProcessor.read(getClass().getResourceAsStream("/monitoring_request/xml/nbki_monitoring_report.xml"), Persons.class,
personsData -> {
Assertions.assertFalse(personsData.getPersons().isEmpty());
personsData.getPersons().clear();
},
obj -> obj.getPersons().isEmpty(),
6,
"/Report/Persons/Person");
staxXmlProcessor.read(getClass().getResourceAsStream("/monitoring_request/xml/nbki_monitoring_report.xml"), Persons.class,
personsData -> {
Assertions.assertEquals(1, personsData.getPersons().size());
personsData.getPersons().clear();
},
obj -> obj.getPersons().isEmpty(),
1,
"/Report/Persons/Person");
staxXmlProcessor.read(getClass().getResourceAsStream("/monitoring_request/xml/nbki_monitoring_report.xml"), Persons.class,
personsData -> {
Assertions.assertTrue(personsData.getPersons().size() == 4 || personsData.getPersons().size() == 1);
personsData.getPersons().clear();
},
obj -> obj.getPersons().isEmpty(),
4,
"/Report/Persons/Person");
}
}