Merge branch 'dev' into 'master' (76d877ed) · Commits · REDMIC Project / Server / Vessel / Vessels

.gitlab-ci.yml

+4 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@ maven-build-lib:
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		LOGGING_LEVEL_ROOT: error
		LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error
		only:
		- branches
		cache:
		@@ -34,8 +36,9 @@ maven-build-commands:
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		LOGGING_LEVEL_ROOT: error
		LOGGING_LEVEL_ROOT: "off"
		LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error
		LOGGING_LEVEL_ES_REDMIC: error
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}

deploy/docker-compose.vessels-commands.tmpl.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ services:
		- OAUTH_CLIENT_ID
		- OAUTH_CLIENT_SECRET
		- MICROSERVICE_NAME=${UNIT_NAME}-commands
		- JAVA_OPTS=-XX:MaxRAMFraction=1
		- JAVA_OPTS=-XX:MaxRAMFraction=2
		networks:
		- kafka-net
		- redmic-net

deploy/docker-compose.vessels-view.tmpl.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ services:
		- OAUTH_CLIENT_SECRET
		- ELASTIC_XPACKSECURITYUSER
		- MICROSERVICE_NAME=${UNIT_NAME}-view
		- JAVA_OPTS=-XX:MaxRAMFraction=1
		- JAVA_OPTS=-XX:MaxRAMFraction=2
		networks:
		- elastic-net
		- kafka-net

vessels-commands/src/docs/asciidocs/vessels-command.adoc

+53 −1

Original line number	Diff line number	Diff line
		@@ -173,3 +173,55 @@ include::{snippets}/create-vessel-type-from-rest-test/get-edit-schema_-return200

		=== HTTP response
		include::{snippets}/create-vessel-type-from-rest-test/get-edit-schema_-return200_-when-schema-is-available/http-response.adoc[]

		//-----------------------------------------------------------------------------

		[[resources-add-vessel-tracking]]
		== Add vessel tracking

		=== Example
		include::{snippets}/create-vessel-tracking-from-rest-test/create-vessel-tracking_-send-create-vessel-tracking-event_-if-command-was-success/curl-request.adoc[]

		=== HTTP request
		include::{snippets}/create-vessel-tracking-from-rest-test/create-vessel-tracking_-send-create-vessel-tracking-event_-if-command-was-success/http-request.adoc[]

		=== HTTP response
		include::{snippets}/create-vessel-tracking-from-rest-test/create-vessel-tracking_-send-create-vessel-tracking-event_-if-command-was-success/http-response.adoc[]


		[[resources-update-vessel-tracking]]
		== Update vessel tracking

		=== Example
		include::{snippets}/create-vessel-tracking-from-rest-test/update-vessel-tracking_-send-update-vessel-tracking-event_-if-command-was-success/curl-request.adoc[]

		=== HTTP request
		include::{snippets}/create-vessel-tracking-from-rest-test/update-vessel-tracking_-send-update-vessel-tracking-event_-if-command-was-success/http-request.adoc[]

		=== HTTP response
		include::{snippets}/create-vessel-tracking-from-rest-test/update-vessel-tracking_-send-update-vessel-tracking-event_-if-command-was-success/http-response.adoc[]


		[[resources-delete-vessel-tracking]]
		== Delete vessel tracking

		=== Example
		include::{snippets}/create-vessel-tracking-from-rest-test/delete-vessel-tracking_-send-delete-vessel-tracking-event_-if-command-was-success/curl-request.adoc[]

		=== HTTP request
		include::{snippets}/create-vessel-tracking-from-rest-test/delete-vessel-tracking_-send-delete-vessel-tracking-event_-if-command-was-success/http-request.adoc[]

		=== HTTP response
		include::{snippets}/create-vessel-tracking-from-rest-test/delete-vessel-tracking_-send-delete-vessel-tracking-event_-if-command-was-success/http-response.adoc[]

		[[resources-editschema-vessel-tracking]]
		== Get vessel tracking edit schema

		=== Example
		include::{snippets}/create-vessel-tracking-from-rest-test/get-edit-schema_-return200_-when-schema-is-available/curl-request.adoc[]

		=== HTTP request
		include::{snippets}/create-vessel-tracking-from-rest-test/get-edit-schema_-return200_-when-schema-is-available/http-request.adoc[]

		=== HTTP response
		include::{snippets}/create-vessel-tracking-from-rest-test/get-edit-schema_-return200_-when-schema-is-available/http-response.adoc[]
		No newline at end of file

vessels-commands/src/main/java/es/redmic/vesselscommands/VesselsCommandsApplication.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -5,13 +5,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
		import org.springframework.context.MessageSource;
		import org.springframework.context.annotation.Bean;
		import org.springframework.context.annotation.ComponentScan;
		import org.springframework.web.servlet.config.annotation.EnableWebMvc;

		import com.bedatadriven.jackson.datatype.jts.JtsModule;
		import com.fasterxml.jackson.databind.Module;

		import es.redmic.commandslib.config.GenerateJsonSchemaScanBean;
		import es.redmic.restlib.config.ResourceBundleMessageSource;

		@SpringBootApplication
		@EnableWebMvc
		@ComponentScan({ "es.redmic.vesselscommands", "es.redmic.restlib", "es.redmic.commandslib",
		"es.redmic.brokerlib.alert" })
		public class VesselsCommandsApplication {
		@@ -30,4 +31,9 @@ public class VesselsCommandsApplication {
		public GenerateJsonSchemaScanBean generateSchemaScanBean() {
		return new GenerateJsonSchemaScanBean();
		}

		@Bean
		public Module jtsModule() {
		return new JtsModule();
		}
		}
		No newline at end of file