Commit 65356e7d authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Aumenta versión a 0.7.1

See merge request redmic-project/server/api!14
parents 28eeebda cb93fef6

pom.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	<groupId>es.redmic</groupId>

	<artifactId>api</artifactId>

	<packaging>jar</packaging>

	<version>0.7.0</version>

	<version>0.7.1</version>

	<name>API</name>

	<description>RESTful web services</description>
@@ -27,11 +27,11 @@ 
		<tomcat.version>8.5.28</tomcat.version>



		<!-- REDMIC -->

		<redmic.db.version>0.6.0</redmic.db.version>

		<redmic.elasticsearch.version>0.6.0</redmic.elasticsearch.version>

		<redmic.db.version>0.6.1</redmic.db.version>

		<redmic.elasticsearch.version>0.6.1</redmic.elasticsearch.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.models.version>0.6.1</redmic.models.version>

		<redmic.mediastorage.version>0.6.0</redmic.mediastorage.version>

		<redmic.sitemapgen4j.version>0.6.0</redmic.sitemapgen4j.version>

src/main/java/es/redmic/api/presence/geodata/common/GeoDataPresenceController.java

+11 −1
Original line number Diff line number Diff line 
package es.redmic.api.presence.geodata.common;



import java.util.List;



import javax.validation.Valid;



import org.springframework.validation.BindingResult;
@@ -53,6 +55,14 @@ public abstract class GeoDataPresenceController<TModel extends Feature<GeoDataPr 
	public SuperDTO findById(@PathVariable("id") String id) {

		TDTO response = serviceES.searchById(id);

		return new ElasticSearchDTO(response, response == null ? 0 : 1);

	}



	@RequestMapping(value = "/_suggest", method = RequestMethod.POST)

	@ResponseBody

	public SuperDTO _advancedSuggest(@Valid @RequestBody TQueryDTO queryDTO, BindingResult bindingResult) {



		processQuery(queryDTO, bindingResult);

		List<String> response = serviceES.suggest(convertToQuery(queryDTO));

		return new ElasticSearchDTO(response, response.size());

	}

}

src/main/java/es/redmic/api/utils/sitemap/service/GenerateSitemapService.java

+16 −18
Original line number Diff line number Diff line 
package es.redmic.api.utils.sitemap.service;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;
@@ -17,7 +18,6 @@ import es.redmic.es.common.queryFactory.geodata.CitationQueryUtils; 
import es.redmic.es.common.queryFactory.geodata.PlatformTrackingQueryUtils;

import es.redmic.es.common.queryFactory.geodata.TrackingQueryUtils;

import es.redmic.es.common.service.MetaDataESService;

import es.redmic.exception.utils.SitemapGenerateException;

import es.redmic.mediastorage.service.FileUtils;

import es.redmic.models.es.common.query.dto.DataQueryDTO;

import es.redmic.utils.httpclient.HttpClient;
@@ -73,31 +73,23 @@ public class GenerateSitemapService { 
			String parentName = moduleNames.getParentName(), moduleName = moduleNames.getModuleName();



			if (!moduleName.contains(ID_PATTERN)) {



				sitemap.addUrl(createUrl(parentName, moduleName));



			} else {



				String serviceName = getServiceName(moduleName);



				if (serviceName == null) {



					System.out.println("Nombre del servicio no soportado en el generador de sitemap " + serviceName);

					throw new SitemapGenerateException();

				}



				} else {

					List<String> ids = getIds(serviceName, getQuery(moduleName));



					if (ids != null) {



						for (String id : ids) {



							String moduleNameWithId = moduleName.replace(ID_PATTERN, id);

							sitemap.addUrl(createUrl(parentName, moduleNameWithId));

						}

					}

				}

			}

		}



		sitemap.writeSitemap();

	}
@@ -118,6 +110,11 @@ public class GenerateSitemapService { 
			if (moduleNameSplit[1].equals("ogc"))

				return "layer" + SERVICE_SUFFIX;



			// TODO: extender funcionalidad para crear entradas de otros tipo de datos

			// getAllIds solo está implementado para metadata

			if (moduleName.contains("real-time-dashboard"))

				return null;



			return moduleNameSplit[0] + SERVICE_SUFFIX;

		}

		return name;
@@ -133,7 +130,7 @@ public class GenerateSitemapService { 
			service = (MetaDataESService) ctx.getBean(serviceName);

		} catch (Exception e) {

			System.out.println("Nombre del servicio no soportado en el generador de sitemap " + serviceName);

			throw new SitemapGenerateException(e);

			return new ArrayList<>();

		}



		return service.getAllIds(queryDTO, ID_PROPERTY);
@@ -153,6 +150,7 @@ public class GenerateSitemapService { 
		} else if (moduleName.contains("area")) {

			queryDTO.setTerms(AreaQueryUtils.getActivityCategoryTermQuery());

		}



		return queryDTO;

	}

}