Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the dependencies group across 1 directory with 9 updates #175

Merged
merged 2 commits into from
May 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -22,26 +22,26 @@
<dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
<git-commit-id-plugin.version>8.0.2</git-commit-id-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-gpg-plugin>3.2.1</maven-gpg-plugin>
<maven-gpg-plugin>3.2.4</maven-gpg-plugin>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-nexus-staging-plugin>1.6.13</maven-nexus-staging-plugin>
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-shade-plugin.version>3.5.3</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>

<!-- Dependency versions -->
<FROST-Client.version>0.44</FROST-Client.version>
<commons-collections.version>4.4</commons-collections.version>
<commons-csv.version>1.10.0</commons-csv.version>
<commons-io.version>2.15.1</commons-io.version>
<commons-csv.version>1.11.0</commons-csv.version>
<commons-io.version>2.16.1</commons-io.version>
<configurable.version>0.35</configurable.version>
<geotools.version>31.0</geotools.version>
<groovy.version>3.0.21</groovy.version>
<javax-activation.version>1.1.1</javax-activation.version>
<junit.version>4.13.2</junit.version>
<logback.version>1.5.3</logback.version>
<openjfx.version>21.0.2</openjfx.version>
<logback.version>1.5.6</logback.version>
<openjfx.version>22.0.1</openjfx.version>
<quartz.version>2.3.2</quartz.version>
<slf4j-version>2.0.12</slf4j-version>
<slf4j-version>2.0.13</slf4j-version>
</properties>

<licenses>
Original file line number Diff line number Diff line change
@@ -111,6 +111,13 @@ private Datastream getDatastreamFor(String filter, CSVRecord record, ErrorLog er
EntityList<Datastream> streams = query.list();
if (streams.size() > 1) {
LOGGER.error("Found incorrect number of datastreams: {} for filter: {}", streams.size(), filter);
if (dsGenerator != null) {
ds = dsGenerator.createDatastreamFor(record, errorLog);
if (ds == null) {
LOGGER.info("DsGenerator did not fix it.");
}
return ds;
}
return null;
} else if (streams.isEmpty()) {
if (dsGenerator != null) {
Original file line number Diff line number Diff line change
@@ -218,6 +218,13 @@ private void updateDsLocalId(Datastream ds, String localId) {

private Datastream importEntities(EeaStationRecord sr, CSVRecord record) throws ImportException {
String pointLocalId = getFromRecord(record, "SAMPLINGPOINT_LOCALID");
String obsPropName = getFromRecord(record, "PROPERTY");
ObservedProperty observedProperty = observedPropertyCache.getByName(obsPropName);
if (observedProperty == null) {
LOGGER.error("Found no ObservedProperty for {}", obsPropName);
return null;
}

Point point = new Point(
sr.longitude.setScale(6, RoundingMode.HALF_EVEN).doubleValue(),
sr.latitude.setScale(6, RoundingMode.HALF_EVEN).doubleValue());
@@ -286,7 +293,6 @@ private Datastream importEntities(EeaStationRecord sr, CSVRecord record) throws
sr.measurementEquipment,
sensorProps,
null);
ObservedProperty observedProperty = observedPropertyCache.get(FrostUtils.afterLastSlash(sr.airPollutant).trim());

String valueUnit = getFromRecord(record, "UNIT", "value_unit", "UnitOfMeasurement");
if (valueUnit == null) {
@@ -384,7 +390,6 @@ private static class EeaStationRecord {
String assessmentMethodId;
String sample;
String samplingMethod;
String airPollutant;
String observationDateBegin;
String observationDateEnd;

@@ -417,7 +422,6 @@ public EeaStationRecord(JsonNode samplingPoint) {

processId = deQuote(getString(samplingPoint, "ProcessId"));
assessmentMethodId = deQuote(getString(samplingPoint, "AssessmentMethodId"));
airPollutant = deQuote(getString(samplingPoint, "AirPollutant"));

observationDateBegin = deQuote(getString(samplingPoint, "OperationalActivityBegin"));
observationDateEnd = deQuote(getString(samplingPoint, "OperationalActivityEnd"));