Commit a1f5c7f4 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'hotfix-generateJsonSchemaError' into 'dev' 

Hotfix generate json schema error

See merge request redmic-project/server/api!38
parents 721fec38 4edf4ff2

.gitlab-ci.yml

+13 −6
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ variables: 
    - >

      mkdir -p sql;

      chmod -R 755 sql;

      docker network create test

      docker network create test || true

    - >

      docker run -d --rm --name postgres \

        -p 5432:5432 \
@@ -183,14 +183,21 @@ variables: 
        -e ES_XPACK_SECURITY_ENABLED \

        ${ELASTICSEARCH_IMAGE_NAME}:${ELASTICSEARCH_IMAGE_TAG}

    - >

      sleep 20;

      RETRIES=10;

      RESPONSE="";

      until [ "$RESPONSE" = "green" ];

      until [ "$RESPONSE" = "green" ] || [ "$RETRIES" -eq 0 ];

      do

        sleep 15;

        sleep 5;

        RETRIES=$((RETRIES-=1));

        RESPONSE="$(curl -sS -u ${ELASTIC_USER}:${ELASTIC_USER_PASS} docker:9200/_cat/health?h=status || :)";

        echo "Waiting for elasticsearch server, remaining attempts... Last output:";

        echo $RESPONSE;

      done

        echo "Waiting for elasticsearch server, ${RETRIES} remaining attempts... Last output:";

      done;

      if [ "$RESPONSE" != "green" ];

      then

        echo "Elasticsearch logs:"

        docker logs -n 100 es6-1

      fi;

  after_script:

    - rm -rf .m2/repository/es

    - docker stop user oauth postgres es6-1

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<modelVersion>4.0.0</modelVersion>

	<artifactId>api</artifactId>

	<packaging>jar</packaging>

	<version>0.13.0</version>

	<version>0.13.1</version>

	<name>API</name>

	<description>RESTful web services</description>

src/main/java/es/redmic/ApiApplication.java

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import io.micrometer.core.instrument.MeterRegistry; 
@SpringBootApplication(exclude = { MongoAutoConfiguration.class, ElasticsearchAutoConfiguration.class })

@EnableAutoConfiguration

@EnableTransactionManagement

@EnableGlobalMethodSecurity(prePostEnabled = true)

@ComponentScan({ "es.redmic.api", "es.redmic.es", "es.redmic.databaselib", "es.redmic.db", "es.redmic.mediastorage",

		"es.redmic.utils" })

@EnableJpaRepositories(basePackages = { "es.redmic.db",

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

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ import org.springframework.core.env.PropertySource; 
import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.JsonNode;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.databind.ser.FilterProvider;

import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;

import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;

import com.kjetland.jackson.jsonSchema.JsonSchemaGenerator;

import com.kjetland.jackson.jsonSchema.JsonSchemaResources;
@@ -169,6 +172,12 @@ public class GenerateJsonSchemaScanBean implements ApplicationContextAware { 


	private void jsonSchemaGeneratorInit() {



		FilterProvider filters = new SimpleFilterProvider().setFailOnUnknownId(false)

			.addFilter("DataQueryDTO", SimpleBeanPropertyFilter.serializeAll())

			.addFilter("InternalDocumentFilter", SimpleBeanPropertyFilter.serializeAll());



		objectMapper.setFilterProvider(filters);



		jsonSchemaGenerator = new JsonSchemaGenerator(objectMapper, JsonSchemaResources.setResources(getProperties()));

	}