Commit 004a3062 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade configuración básica + tests

parent 99c031b3

time-series-commands/src/main/java/es/redmic/timeseries/TimeSeriesApplication.java

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
package es.redmic.timeseries;



import org.springframework.boot.SpringApplication;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.context.annotation.ComponentScan;



@SpringBootApplication

@ComponentScan({ "es.redmic.timeseries" })

public class TimeSeriesApplication {



	public static void main(String[] args) {

		SpringApplication.run(TimeSeriesApplication.class, args);

	}

}

time-series-commands/src/main/java/es/redmic/timeseriescommands/TimeSeriesCommandsApplication.java

0 → 100644
+42 −0
Original line number Diff line number Diff line 
package es.redmic.timeseriescommands;



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

import org.springframework.boot.SpringApplication;

import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.context.MessageSource;

import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.ComponentScan;



import es.redmic.commandslib.config.GenerateJsonSchemaScanBean;

import es.redmic.restlib.config.ResourceBundleMessageSource;

import io.micrometer.core.instrument.MeterRegistry;



@SpringBootApplication

@ComponentScan({ "es.redmic.timeseriescommand", "es.redmic.restlib", "es.redmic.commandslib",

		"es.redmic.brokerlib.alert" })

public class TimeSeriesCommandsApplication {



	@Value("${info.microservice.name}")

	String microserviceName;



	public static void main(String[] args) {

		SpringApplication.run(TimeSeriesCommandsApplication.class, args);

	}



	@Bean

	public MessageSource messageSource() {



		return new ResourceBundleMessageSource();

	}



	@Bean

	public GenerateJsonSchemaScanBean generateSchemaScanBean() {

		return new GenerateJsonSchemaScanBean();

	}



	@Bean

	MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {

		return registry -> registry.config().commonTags("application", microserviceName);

	}

}

time-series-commands/src/main/java/es/redmic/timeseriescommands/config/Oauth2SecurityConfiguration.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
package es.redmic.timeseriescommands.config;



import org.springframework.context.annotation.Configuration;

import org.springframework.http.HttpMethod;

import org.springframework.security.config.annotation.web.builders.HttpSecurity;

import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;



import es.redmic.restlib.config.ResourceServerConfigurationBase;



@Configuration

public class Oauth2SecurityConfiguration {



	@Configuration

	@EnableResourceServer

	protected static class ResourceServerConfiguration extends ResourceServerConfigurationBase {



		@Override

		public void configure(HttpSecurity http) throws Exception {

			// @formatter:off

			

			http.anonymous().and().authorizeRequests()

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

			

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

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

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

			

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

					"#oauth2.hasScope('write') and hasAnyRole('ROLE_ADMINISTRATOR', 'ROLE_OAG', 'ROLE_COLLABORATOR')");

			

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

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

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

		}

	}

}

time-series-commands/src/main/java/es/redmic/timeseriescommands/config/UserService.java

0 → 100644
+18 −0
Original line number Diff line number Diff line 
package es.redmic.timeseriescommands.config;



import org.springframework.stereotype.Service;



import es.redmic.restlib.common.service.UserUtilsServiceItfc;

import es.redmic.restlib.config.UserBaseService;



@Service

public class UserService extends UserBaseService implements UserUtilsServiceItfc {



	/*

	 * Implementa la interfaz para obtener información de usuarios

	 */



	public UserService() {

		super();

	}

}

time-series-commands/src/test/java/es/redmic/test/timeseriescommands/integration/translation/ExceptionsTranslationTest.java

0 → 100644
+106 −0
Original line number Diff line number Diff line 
package es.redmic.test.timeseriescommands.integration.translation;



import java.text.MessageFormat;

import java.util.Locale;



import org.junit.Assert;

import org.junit.ClassRule;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

import org.springframework.context.MessageSource;

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

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.TestPropertySource;

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



import es.redmic.commandslib.exceptions.HistoryNotFoundException;

import es.redmic.exception.common.PatternUtils;

import es.redmic.timeseriescommands.TimeSeriesCommandsApplication;



@RunWith(SpringJUnit4ClassRunner.class)

@SpringBootTest(classes = { TimeSeriesCommandsApplication.class })

@ActiveProfiles("test")

@TestPropertySource(properties = { "schema.registry.port=0" })

public class ExceptionsTranslationTest {



	@ClassRule

	public static EmbeddedKafkaRule embeddedKafka = new EmbeddedKafkaRule(1);



	@Autowired

	MessageSource messageSource;



	protected static final String resourcePathSpanish = "classpath*:i18n/messages_es_ES.properties",

			resourcePathEnglish = "classpath*:i18n/messages_en_EN.properties";



	@Test

	public void getEnglishMessage_returnI18nMessageInDefaultLocale_WhenCodePropertyExist() {



		try {

			throw new HistoryNotFoundException("UpdateTimeSeriesCommand", "1");

		} catch (HistoryNotFoundException e) {



			String code = e.getCode().toString();



			String[] fields = (String[]) e.getFieldErrors().toArray();



			String mess = messageSource.getMessage(code, fields, new Locale("en", "EN"));



			Assert.assertEquals(getMessage(code, fields, resourcePathEnglish), mess);

		}

	}



	@Test

	public void getSpanishMessage_returnI18nMessage_WhenCodePropertyExist() {



		try {

			throw new HistoryNotFoundException("UpdateTimeSeriesCommand", "1");

		} catch (HistoryNotFoundException e) {



			String code = e.getCode().toString();



			String[] fields = (String[]) e.getFieldErrors().toArray();



			String mess = messageSource.getMessage(code, fields, new Locale("es", "ES"));



			Assert.assertEquals(getMessage(code, fields, resourcePathSpanish), mess);

		}

	}



	@Test

	public void getRussianLanguageMessage_returnDefaultI18nMessage_WhenI18nFileNotExist() {



		try {

			throw new HistoryNotFoundException("UpdateTimeSeriesCommand", "1");

		} catch (HistoryNotFoundException e) {



			String code = e.getCode().toString();



			String[] fields = (String[]) e.getFieldErrors().toArray();



			String mess = messageSource.getMessage(code, fields, new Locale("ru", "RU"));



			Assert.assertEquals(getMessage(code, fields, resourcePathSpanish), mess);

		}

	}



	@Test

	public void getMessage_returnCode_WhenCodeNotInI18nFile() {



		String code = "CodeNotFound";



		String mess = messageSource.getMessage(code, null, new Locale("es", "ES"));



		Assert.assertEquals(code, mess);

	}



	private String getMessage(String code, String[] fields, String resourcePath) {



		String message = PatternUtils.getPattern(code, resourcePath);

		MessageFormat format = new MessageFormat(message);



		return format.format(fields);

	}



}