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.

Sign up for GitHub

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

Dependencies version update #951

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Dependencies version update #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
import org.geotools.geojson.geom.GeometryJSON;
import org.geotools.referencing.CRS;
import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.referencing.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.geotools.api.feature.simple.SimpleFeature;
import org.geotools.api.feature.simple.SimpleFeatureType;
import org.geotools.api.referencing.FactoryException;
import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
12 changes: 6 additions & 6 deletions ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticCapabilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
import org.geotools.filter.capability.TemporalCapabilitiesImpl;
import org.geotools.filter.capability.TemporalOperatorImpl;
import org.geotools.filter.visitor.IsFullySupportedFilterVisitor;
import org.opengis.filter.*;
import org.opengis.filter.capability.TemporalCapabilities;
import org.opengis.filter.capability.TemporalOperators;
import org.opengis.filter.spatial.BBOX;
import org.opengis.filter.spatial.Intersects;
import org.opengis.filter.temporal.*;
import org.geotools.api.filter.*;
import org.geotools.api.filter.capability.TemporalCapabilities;
import org.geotools.api.filter.capability.TemporalOperators;
import org.geotools.api.filter.spatial.BBOX;
import org.geotools.api.filter.spatial.Intersects;
import org.geotools.api.filter.temporal.*;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static BoolQuery.Builder filter(String constraint, CollectionReferenceDes
FilterToElastic filterToElastic = new FilterToElastic(collectionDescription, service);
try {
InputStream stream = new ByteArrayInputStream(constraint.getBytes(StandardCharsets.UTF_8));
org.opengis.filter.Filter openGisFilter = (org.opengis.filter.Filter) parser.parse(stream);
org.geotools.api.filter.Filter openGisFilter = (org.geotools.api.filter.Filter) parser.parse(stream);

if (ColumnFilterUtil.isValidColumnFilterPresent(columnFilter)) {
ColumnFilterUtil.assertOpenGisFilterAllowed(columnFilter, collectionDescription, OpenGISFieldsExtractor.extract(openGisFilter));
Expand Down
34 changes: 17 additions & 17 deletions ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElastic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LinearRing;
import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.feature.type.AttributeDescriptor;
import org.opengis.filter.*;
import org.opengis.filter.expression.*;
import org.opengis.filter.identity.Identifier;
import org.opengis.filter.spatial.*;
import org.opengis.filter.temporal.*;
import org.opengis.temporal.Instant;
import org.opengis.temporal.Period;
import org.geotools.api.feature.simple.SimpleFeatureType;
import org.geotools.api.feature.type.AttributeDescriptor;
import org.geotools.api.filter.*;
import org.geotools.api.filter.expression.*;
import org.geotools.api.filter.identity.Identifier;
import org.geotools.api.filter.spatial.*;
import org.geotools.api.filter.temporal.*;
import org.geotools.api.temporal.Instant;
import org.geotools.api.temporal.Period;
import org.slf4j.LoggerFactory;

import java.io.IOException;
Expand Down Expand Up @@ -226,7 +226,7 @@ public synchronized final Capabilities getCapabilities() {
}


// BEGIN IMPLEMENTING org.opengis.filter.FilterVisitor METHODS
// BEGIN IMPLEMENTING org.geotools.api.filter.FilterVisitor METHODS

/**
* Writes the FilterBuilder for the ExcludeFilter.
Expand Down Expand Up @@ -661,7 +661,7 @@ public Object visit(PropertyIsNull filter, Object extraData) {

Expression expr = filter.getExpression();

expr.accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
expr.accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);

queryBuilder = ImmutableMap.of("bool", ImmutableMap.of("must_not", ImmutableMap.of("exists", ImmutableMap.of("field", field))));

Expand Down Expand Up @@ -853,7 +853,7 @@ protected Object visitBinaryTemporalOperator(BinaryTemporalOperator filter,
updateDateFormatter(key);
if (temporal.evaluate(null) instanceof Instant) {
Instant instant = (Instant) temporal.evaluate(null);
filterFactory.literal(instant.getPosition().getDate()).accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
filterFactory.literal(instant.getPosition().getDate()).accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
}else{
temporal.accept(this, typeContext);

Expand Down Expand Up @@ -918,11 +918,11 @@ protected Object visitBinaryTemporalOperator(BinaryTemporalOperator filter,
}

void visitBegin(Period p, Object extraData) {
filterFactory.literal(p.getBeginning().getPosition().getDate()).accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
filterFactory.literal(p.getBeginning().getPosition().getDate()).accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
}

void visitEnd(Period p, Object extraData) {
filterFactory.literal(p.getEnding().getPosition().getDate()).accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
filterFactory.literal(p.getEnding().getPosition().getDate()).accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
}

/**
Expand All @@ -948,10 +948,10 @@ public Object visitNullFilter(Object extraData) {
return extraData;
}

// END IMPLEMENTING org.opengis.filter.FilterVisitor METHODS
// END IMPLEMENTING org.geotools.api.filter.FilterVisitor METHODS


// START IMPLEMENTING org.opengis.filter.ExpressionVisitor METHODS
// START IMPLEMENTING org.geotools.api.filter.ExpressionVisitor METHODS

/**
* Writes the FilterBuilder for the attribute Expression.
Expand Down Expand Up @@ -1229,7 +1229,7 @@ public Object visit(Function function, Object extraData) {
throw new UnsupportedOperationException("Function support not implemented");
}

// END IMPLEMENTING org.opengis.filter.ExpressionVisitor METHODS
// END IMPLEMENTING org.geotools.api.filter.ExpressionVisitor METHODS

protected void updateDateFormatter(AttributeDescriptor attType) {
dateFormatter = DEFAULT_DATE_FORMATTER;
Expand Down
8 changes: 4 additions & 4 deletions ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElasticHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
import org.geotools.geometry.jts.JTS;
import org.locationtech.jts.geom.*;
import org.locationtech.spatial4j.shape.SpatialRelation;
import org.opengis.filter.expression.Expression;
import org.opengis.filter.expression.Literal;
import org.opengis.filter.expression.PropertyName;
import org.opengis.filter.spatial.*;
import org.geotools.api.filter.expression.Expression;
import org.geotools.api.filter.expression.Literal;
import org.geotools.api.filter.expression.PropertyName;
import org.geotools.api.filter.spatial.*;
import org.slf4j.LoggerFactory;

import java.util.*;
Expand Down
6 changes: 3 additions & 3 deletions ogc-common/src/main/java/io/arlas/server/ogc/common/utils/OpenGISFieldsExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import io.arlas.commons.exceptions.InvalidParameterException;
import org.geotools.filter.BinaryLogicAbstract;
import org.geotools.filter.MultiCompareFilterImpl;
import org.opengis.filter.*;
import org.opengis.filter.spatial.BinarySpatialOperator;
import org.opengis.filter.temporal.BinaryTemporalOperator;
import org.geotools.api.filter.*;
import org.geotools.api.filter.spatial.BinarySpatialOperator;
import org.geotools.api.filter.temporal.BinaryTemporalOperator;
import java.util.*;
import java.util.stream.Collectors;

Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<!-- TESTS -->
<junit.version>4.13.2</junit.version>
<org.hamcrest.version>2.2</org.hamcrest.version>
<io.rest-assured.version>5.3.2</io.rest-assured.version>
<io.rest-assured.version>5.4.0</io.rest-assured.version>

<!-- REST AND DROPWIZARD-->
<dropwizard.version>2.1.10</dropwizard.version>
Expand All @@ -65,20 +65,20 @@
<hazelcast.version>5.3.6</hazelcast.version>

<!-- ELASTICSEARCH-->
<elastic.version>8.11.1</elastic.version>
<elastic.version>8.12.2</elastic.version>

<!-- GEO-->
<geotools.version>29.2</geotools.version>
<protobuf.version>3.24.3</protobuf.version>
<geotools.version>30.2</geotools.version>
<protobuf.version>3.25.3</protobuf.version>
<geojson.jackson.version>1.14</geojson.jackson.version>
<spatial4j.version>0.8</spatial4j.version>
<jts.version>1.19.0</jts.version>
<h3.version>4.1.1</h3.version>

<!-- AUTH -->
<jwt.version>3.19.2</jwt.version>
<elastic-apm.version>1.43.0</elastic-apm.version>
<keycloak.version>22.0.5</keycloak.version>
<elastic-apm.version>1.48.1</elastic-apm.version>
<keycloak.version>24.0.1</keycloak.version>

<nv-i18n.version>1.29</nv-i18n.version>
<itu.version>1.7.3</itu.version>
Expand Down
Loading