Loading src/main/java/es/redmic/es/common/utils/ElasticSearchUtils.java +3 −5 Original line number Diff line number Diff line package es.redmic.es.common.utils; import java.io.BufferedReader; /*- * #%L * ElasticSearch Loading @@ -24,7 +22,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.lang.reflect.Field; Loading @@ -34,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.get.GetResponse; Loading Loading @@ -293,7 +289,9 @@ public class ElasticSearchUtils { public static String getScriptFile(String mappingFilePath) { try { return FileUtils.readFileToString(new ClassPathResource(mappingFilePath).getFile(), StandardCharsets.UTF_8); InputStream resource = new ClassPathResource(mappingFilePath).getInputStream(); return IOUtils.toString(resource, Charset.forName(StandardCharsets.UTF_8.name())); } catch (IOException e) { e.printStackTrace(); throw new ResourceNotFoundException(e); Loading src/main/java/es/redmic/es/geodata/common/repository/SpeciesGeoESRepository.java +2 −1 Original line number Diff line number Diff line Loading @@ -48,6 +48,7 @@ public class SpeciesGeoESRepository extends GeoPresenceESRepository<GeoPointData super(); } @SuppressWarnings({ "unchecked" }) public List<String> getActivitiesBySpecies(String speciesId) { List<String> activities = new ArrayList<>(); Loading @@ -64,7 +65,7 @@ public class SpeciesGeoESRepository extends GeoPresenceESRepository<GeoPointData GeoSearchWrapper<Properties, Geometry> result = (GeoSearchWrapper<Properties, Geometry>) findBy( QueryBuilders.boolQuery().filter(filterBuilder), SortBuilders.fieldSort("properties.date").order(SortOrder.DESC), SortBuilders.fieldSort("properties.activityId").order(SortOrder.DESC), returnFields); if (result == null || result.getTotal() == 0) Loading Loading
src/main/java/es/redmic/es/common/utils/ElasticSearchUtils.java +3 −5 Original line number Diff line number Diff line package es.redmic.es.common.utils; import java.io.BufferedReader; /*- * #%L * ElasticSearch Loading @@ -24,7 +22,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.lang.reflect.Field; Loading @@ -34,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.get.GetResponse; Loading Loading @@ -293,7 +289,9 @@ public class ElasticSearchUtils { public static String getScriptFile(String mappingFilePath) { try { return FileUtils.readFileToString(new ClassPathResource(mappingFilePath).getFile(), StandardCharsets.UTF_8); InputStream resource = new ClassPathResource(mappingFilePath).getInputStream(); return IOUtils.toString(resource, Charset.forName(StandardCharsets.UTF_8.name())); } catch (IOException e) { e.printStackTrace(); throw new ResourceNotFoundException(e); Loading
src/main/java/es/redmic/es/geodata/common/repository/SpeciesGeoESRepository.java +2 −1 Original line number Diff line number Diff line Loading @@ -48,6 +48,7 @@ public class SpeciesGeoESRepository extends GeoPresenceESRepository<GeoPointData super(); } @SuppressWarnings({ "unchecked" }) public List<String> getActivitiesBySpecies(String speciesId) { List<String> activities = new ArrayList<>(); Loading @@ -64,7 +65,7 @@ public class SpeciesGeoESRepository extends GeoPresenceESRepository<GeoPointData GeoSearchWrapper<Properties, Geometry> result = (GeoSearchWrapper<Properties, Geometry>) findBy( QueryBuilders.boolQuery().filter(filterBuilder), SortBuilders.fieldSort("properties.date").order(SortOrder.DESC), SortBuilders.fieldSort("properties.activityId").order(SortOrder.DESC), returnFields); if (result == null || result.getTotal() == 0) Loading