Commit 1c99c874 authored by Noel Alonso's avatar Noel Alonso
Browse files

Elimina restos de atlas

parent e177f36f

src/main/java/es/redmic/api/config/GenerateJsonSchemaScanBean.java

+5 −7
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import es.redmic.models.es.administrative.dto.ContactOrganisationRoleDTO; 
import es.redmic.models.es.administrative.dto.OrganisationRoleDTO;

import es.redmic.models.es.administrative.taxonomy.dto.RecoveryDTO;

import es.redmic.models.es.administrative.taxonomy.dto.SpecimenTagDTO;

import es.redmic.models.es.atlas.dto.LayerCompactDTO;

import es.redmic.models.es.geojson.area.dto.AreaPropertiesDTO;

import es.redmic.models.es.maintenance.areas.dto.AreaClassificationDTO;

import es.redmic.models.es.maintenance.device.dto.CalibrationDTO;
@@ -81,10 +80,10 @@ public class GenerateJsonSchemaScanBean implements ApplicationContextAware { 
	@Value("${property.path.media_storage.JSONSCHEMA}")

	private String jsonschemaPath;



	private List<Class<?>> specialBeansToGenerate = new ArrayList<Class<?>>(Arrays.asList(RecoveryDTO.class,

			SpecimenTagDTO.class, ContactOrganisationRoleDTO.class, OrganisationRoleDTO.class,

			ActivityPlatformRoleDTO.class, FixedSurveyDTO.class, MeasurementDTO.class, LayerCompactDTO.class,

			CalibrationDTO.class, AreaClassificationDTO.class, AreaPropertiesDTO.class));

	private List<Class<?>> specialBeansToGenerate = new ArrayList<Class<?>>(

			Arrays.asList(RecoveryDTO.class, SpecimenTagDTO.class, ContactOrganisationRoleDTO.class,

					OrganisationRoleDTO.class, ActivityPlatformRoleDTO.class, FixedSurveyDTO.class,

					MeasurementDTO.class, CalibrationDTO.class, AreaClassificationDTO.class, AreaPropertiesDTO.class));



	/**

	 * {@inheritDoc}
@@ -97,8 +96,7 @@ public class GenerateJsonSchemaScanBean implements ApplicationContextAware { 
	}



	/**

	 * Recorre todos los beans de tipo Lectura-Escritura para generar los

	 * esquemas

	 * Recorre todos los beans de tipo Lectura-Escritura para generar los esquemas

	 */

	public void addAllControllerBeans() {

		/* Genera los esquemas de json de datos simples */

src/main/java/es/redmic/api/config/OrikaScanBean.java

+5 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import es.redmic.db.config.OrikaScanBeanDBItfc; 
import es.redmic.es.common.objectFactory.ModelESFactory;

import es.redmic.es.config.OrikaScanBeanESItfc;

import es.redmic.es.geodata.common.objectfactory.GeometryESFactory;

import es.redmic.models.es.atlas.LatLonBoundingBox;

import es.redmic.models.es.common.model.BaseES;

import ma.glasnost.orika.Converter;

import ma.glasnost.orika.CustomMapper;
@@ -109,6 +108,7 @@ public class OrikaScanBean extends ConfigurableMapper 
	 * @param applicationContext

	 *            The application context to look for managed beans in.

	 */

	@Override

	public void addAllSpringBeans() {

		@SuppressWarnings("rawtypes")

		final Map<String, Converter> converters = applicationContext.getBeansOfType(Converter.class);
@@ -127,8 +127,8 @@ public class OrikaScanBean extends ConfigurableMapper 
		/*

		 * @SuppressWarnings("rawtypes") final Map<String, Filter> filters =

		 * applicationContext.getBeansOfType(Filter.class); for

		 * (@SuppressWarnings("rawtypes") final Filter filter :

		 * filters.values()) { addFilter(filter); }

		 * (@SuppressWarnings("rawtypes") final Filter filter : filters.values()) {

		 * addFilter(filter); }

		 */



		addObjectFactory();
@@ -141,6 +141,7 @@ public class OrikaScanBean extends ConfigurableMapper 
	 * @param converter

	 *            The converter.

	 */

	@Override

	public void addConverter(final Converter<?, ?> converter) {

		factory.getConverterFactory().registerConverter(converter);

	}
@@ -151,6 +152,7 @@ public class OrikaScanBean extends ConfigurableMapper 
	 * @param mapper

	 *            The mapper.

	 */

	@Override

	@SuppressWarnings({ "rawtypes", "unchecked" })

	public void addMapper(final CustomMapper<?, ?> mapper) {

		factory.classMap(mapper.getAType(), mapper.getBType()).byDefault().customize((CustomMapper) mapper).register();
@@ -166,10 +168,6 @@ public class OrikaScanBean extends ConfigurableMapper 


	private void addDefaultActions() {



		factory.classMap(Double[].class, LatLonBoundingBox.class)

				.customize(new CustomMapper<Double[], LatLonBoundingBox>() {

				}).register();



		factory.classMap(Point.class, Point.class).customize(new CustomMapper<Point, Point>() {

		}).register();

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

+0 −3
Original line number Diff line number Diff line
@@ -127,9 +127,6 @@ public class GenerateSitemapService { 


		if (moduleNameSplit.length > 1) {



			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"))

src/test/resources/sitemap/openModules.json

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
	[null, "inner-what-is-redmic"],

	["viewer", "trash-collection"],

	["viewer", "charts"],

	[null, "atlas"],

	[null, "service-ogc-catalog"],

	[null, "home"],

	[null, "register"],