Commit 6abdd163 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade componentes para obtener capas de servicios 

De esta manera a partir de una url se obtiene las capas, en este caso,
de un servicio wms

Añade tests + excepción de seguridad
parent 891c47c8

atlas-commands/src/main/java/es/redmic/atlascommands/config/Oauth2SecurityConfiguration.java

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ public class Oauth2SecurityConfiguration { 
			http.cors().and().anonymous().and().authorizeRequests()

				.antMatchers(HttpMethod.GET, "/actuator/**").permitAll();

			

			http.authorizeRequests()

				.antMatchers(HttpMethod.POST, "/discover-layers/**").permitAll();

			

			http.authorizeRequests().antMatchers(HttpMethod.POST, "/**").access(

					"#oauth2.hasScope('write') and "

					+ "hasAnyRole('ROLE_ADMINISTRATOR', 'ROLE_OAG', 'ROLE_COLLABORATOR')");

atlas-commands/src/main/java/es/redmic/atlascommands/controller/OGCLayerController.java

0 → 100644
+69 −0
Original line number Diff line number Diff line 
package es.redmic.atlascommands.controller;



/*-

 * #%L

 * Atlas-management

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import java.util.List;



import javax.validation.Valid;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.http.MediaType;

import org.springframework.stereotype.Controller;

import org.springframework.validation.BindingResult;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.ResponseBody;



import es.redmic.atlascommands.service.OGCLayerService;

import es.redmic.atlaslib.dto.layer.LayerDTO;

import es.redmic.exception.data.ItemAlreadyExistException;

import es.redmic.exception.databinding.DTONotValidException;

import es.redmic.models.es.common.dto.BodyItemDTO;

import es.redmic.models.es.common.dto.SuperDTO;

import es.redmic.models.es.common.dto.UrlDTO;



@Controller

@RequestMapping(value = "${controller.mapping.DISCOVER_LAYERS}")

public class OGCLayerController {



	private OGCLayerService service;



	@Autowired

	public OGCLayerController(OGCLayerService service) {

		this.service = service;

	}



	@PostMapping(value = "/wms", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)

	@ResponseBody

	public SuperDTO discoverWMSLayers(@Valid @RequestBody UrlDTO workSpace, BindingResult errorDto) {



		if (errorDto.hasErrors())

			throw new DTONotValidException(errorDto);



		List<LayerDTO> result = service.discoverWMSLayers(workSpace.getUrl());



		if (result == null)

			throw new ItemAlreadyExistException();



		return new BodyItemDTO<List<LayerDTO>>(result);

	}

}

atlas-commands/src/main/java/es/redmic/atlascommands/service/OGCLayerService.java

0 → 100644
+39 −0
Original line number Diff line number Diff line 
package es.redmic.atlascommands.service;



/*-

 * #%L

 * Atlas-management

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import java.util.ArrayList;

import java.util.List;



import org.springframework.stereotype.Service;



import es.redmic.atlascommands.utils.Capabilities;

import es.redmic.atlaslib.dto.layer.LayerDTO;



@Service

public class OGCLayerService {



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

	public List<LayerDTO> discoverWMSLayers(String urlSource) {



		return new ArrayList(Capabilities.getCapabilities(urlSource).values());

	}

}

atlas-commands/src/main/resources/application.properties

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ controller.mapping.CATEGORY=/category 


controller.mapping.EDIT_SCHEMA=/_schema



controller.mapping.DISCOVER_LAYERS=/discover-layers



#Alert

broker.topic.alert=alert

alert.email=alerts@redmic.es

atlas-commands/src/test/java/es/redmic/test/atlascommands/integration/ogc/DiscoverWMSLayersTest.java

0 → 100644
+120 −0
Original line number Diff line number Diff line 
package es.redmic.test.atlascommands.integration.ogc;



/*-

 * #%L

 * Atlas-management

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import static org.hamcrest.CoreMatchers.is;

import static org.hamcrest.CoreMatchers.notNullValue;

import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;

import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;



import java.io.File;



import org.junit.Before;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.http.MediaType;

import org.springframework.kafka.test.rule.EmbeddedKafkaRule;

import org.springframework.test.annotation.DirtiesContext;

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import org.springframework.test.web.servlet.setup.MockMvcBuilders;



import es.redmic.atlascommands.AtlasCommandsApplication;

import es.redmic.models.es.common.dto.UrlDTO;

import es.redmic.test.atlascommands.integration.KafkaEmbeddedConfig;

import es.redmic.testutils.documentation.DocumentationCommandBaseTest;



@RunWith(SpringJUnit4ClassRunner.class)

@SpringBootTest(classes = { AtlasCommandsApplication.class })

@ActiveProfiles("test")

@DirtiesContext

public class DiscoverWMSLayersTest extends DocumentationCommandBaseTest {



	@ClassRule

	public static EmbeddedKafkaRule embeddedKafka = new EmbeddedKafkaRule(KafkaEmbeddedConfig.NUM_BROKERS, true,

			KafkaEmbeddedConfig.PARTITIONS_PER_TOPIC, KafkaEmbeddedConfig.TOPICS_NAME);



	// @formatter:off

	

	private final String HOST = "redmic.es/api/atlas/commands",

			PATH = "/discover-layers/wms",

			URL_CAPABILITIES = new File("src/test/resources/data/capabilities/wms.xml").toURI().toString();

	

	// @formatter:on



	private UrlDTO url;



	@Before

	public void before() {



		// @formatter:off

		

		url = new UrlDTO();

		url.setUrl(URL_CAPABILITIES);

		

		mockMvc = MockMvcBuilders

				.webAppContextSetup(webApplicationContext)

				.addFilters(springSecurityFilterChain)

				.apply(documentationConfiguration(this.restDocumentation)

						.uris().withScheme(SCHEME).withHost(HOST).withPort(PORT))

				.alwaysDo(this.document).build();



		// @formatter:on

	}



	@Test

	public void createLayer_SendCreateLayerEvent_IfCommandWasSuccess() throws Exception {



		// @formatter:off



		this.mockMvc.perform(post(PATH)

					.content(mapper.writeValueAsString(url))

					.contentType(MediaType.APPLICATION_JSON)

					.accept(MediaType.APPLICATION_JSON))

				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))

				.andExpect(jsonPath("$.body", notNullValue()))

				.andExpect(jsonPath("$.body.length()", is(1)))

				.andExpect(jsonPath("$.body[0]", notNullValue()))

				.andExpect(jsonPath("$.body[0].urlSource", is(url.getUrl())))

				.andExpect(jsonPath("$.body[0].title", notNullValue()))

				.andExpect(jsonPath("$.body[0].abstractLayer", notNullValue()))

				.andExpect(jsonPath("$.body[0].keywords", notNullValue()))

				.andExpect(jsonPath("$.body[0].srs", notNullValue()))

				.andExpect(jsonPath("$.body[0].stylesLayer", notNullValue()))

				.andExpect(jsonPath("$.body[0].contact", notNullValue()))

				.andExpect(jsonPath("$.body[0].activities", notNullValue()))

				.andExpect(jsonPath("$.body[0].queryable", notNullValue()))

				.andExpect(jsonPath("$.body[0].formats", notNullValue()))

				.andExpect(jsonPath("$.body[0].geometry", notNullValue()))

				.andExpect(jsonPath("$.body[0].legend", notNullValue()))

				.andExpect(jsonPath("$.body[0].attibution", notNullValue()))

				.andExpect(jsonPath("$.body[0].timeDimension", notNullValue()))

				.andExpect(jsonPath("$.body[0].elevationDimension", notNullValue()));



		// @formatter:on



	}

}