#480

Committed 04 Mar 2025 12:05PM UTC coverage: 77.85% (+5.5%) from 72.4%

Build # #480

Build Type

Pull #264

github

Committed by

web-flow

Commit Message

Merge 2a565921e into 534c1d4a6

Pull Request Pull Request #264: Development branch for v3.0.0

Run Details

371 of 466 new or added lines in 22 files covered. (79.61%)

2 existing lines in 1 file now uncovered.

956 of 1228 relevant lines covered (77.85%)

0.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

70.45

/src/main/java/edu/kit/datamanager/pit/typeregistry/schema/TypeApiSchemaGenerator.java

package edu.kit.datamanager.pit.typeregistry.schema;

import edu.kit.datamanager.pit.Application;
import edu.kit.datamanager.pit.common.ExternalServiceException;
import edu.kit.datamanager.pit.common.InvalidConfigException;
import edu.kit.datamanager.pit.common.TypeNotFoundException;
import edu.kit.datamanager.pit.configuration.ApplicationProperties;
import jakarta.validation.constraints.NotNull;
import org.everit.json.schema.Schema;
import org.everit.json.schema.loader.SchemaLoader;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.web.client.RestClient;

import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;

public class TypeApiSchemaGenerator implements SchemaGenerator {
    private static final Logger LOG = LoggerFactory.getLogger(TypeApiSchemaGenerator.class);

    protected final URL baseUrl;
    protected final RestClient http;

    public TypeApiSchemaGenerator(@NotNull ApplicationProperties props) {
        this.baseUrl = props.getTypeRegistryUri();
        String baseUri;
        try {
            baseUri = baseUrl.toURI().resolve("v1/types").toString();
        } catch (URISyntaxException e) {
            throw new InvalidConfigException("Type-Api base url not valid: " + baseUrl, e);
        }
        this.http = RestClient.builder()
                .baseUrl(baseUri)
                .requestInterceptor((request, body, execution) -> {
                    long start = System.currentTimeMillis();
                    ClientHttpResponse response = execution.execute(request,  body);
                    long timeSpan = System.currentTimeMillis() - start;
                    boolean isLongRequest = timeSpan > Application.LONG_HTTP_REQUEST_THRESHOLD;
                    if (isLongRequest) {
                        LOG.warn("Long http request to {} ({}ms)", request.getURI(), timeSpan);
                    }
                    return response;
                })
                .build();
    }

    @Override
    public SchemaInfo generateSchema(@NotNull String maybeTypePid) {
        return http.get()
                .uri(uriBuilder -> uriBuilder
                        .pathSegment("schema")
                        .path(maybeTypePid)
                        .build())
                .exchange((request, response) -> {
                    HttpStatusCode statusCode = response.getStatusCode();
                    if (statusCode.is2xxSuccessful()) {
                        Schema schema = null;
                        try (InputStream inputStream = response.getBody()) {
                            JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream));
                            schema = SchemaLoader.load(rawSchema);
                        } catch (JSONException e) {
                            return new SchemaInfo(
                                    this.baseUrl.toString(),
                                    schema,
                                    new ExternalServiceException(baseUrl.toString(), "Response (" + maybeTypePid + ") is not a valid schema.")
                            );
                        }
                        return new SchemaInfo(this.baseUrl.toString(), schema, null);
                    } else if (statusCode.value() == 404) {
                        return new SchemaInfo(
                                this.baseUrl.toString(),
                                null,
                                new TypeNotFoundException(maybeTypePid));
                    } else {
                        return new SchemaInfo(
                                this.baseUrl.toString(),
                                null,
                                new ExternalServiceException(
                                        this.baseUrl.toString(),
                                        "Error generating schema: %s - %s".formatted(statusCode.value(), response.getStatusText())));
                    }
                });
    }
}

1	package edu.kit.datamanager.pit.typeregistry.schema;
2
3	import edu.kit.datamanager.pit.Application;
4	import edu.kit.datamanager.pit.common.ExternalServiceException;
5	import edu.kit.datamanager.pit.common.InvalidConfigException;
6	import edu.kit.datamanager.pit.common.TypeNotFoundException;
7	import edu.kit.datamanager.pit.configuration.ApplicationProperties;
8	import jakarta.validation.constraints.NotNull;
9	import org.everit.json.schema.Schema;
10	import org.everit.json.schema.loader.SchemaLoader;
11	import org.json.JSONException;
12	import org.json.JSONObject;
13	import org.json.JSONTokener;
14	import org.slf4j.Logger;
15	import org.slf4j.LoggerFactory;
16	import org.springframework.http.HttpStatusCode;
17	import org.springframework.http.client.ClientHttpResponse;
18	import org.springframework.web.client.RestClient;
19
20	import java.io.InputStream;
21	import java.net.URISyntaxException;
22	import java.net.URL;
23
24	public class TypeApiSchemaGenerator implements SchemaGenerator {
25	private static final Logger LOG = LoggerFactory.getLogger(TypeApiSchemaGenerator.class);	1✔
26
27	protected final URL baseUrl;
28	protected final RestClient http;
29
30	public TypeApiSchemaGenerator(@NotNull ApplicationProperties props) {	1✔
31	this.baseUrl = props.getTypeRegistryUri();	1✔
32	String baseUri;
33	try {
34	baseUri = baseUrl.toURI().resolve("v1/types").toString();	1✔
NEW 35	} catch (URISyntaxException e) {	×
NEW 36	throw new InvalidConfigException("Type-Api base url not valid: " + baseUrl, e);	×
37	}	1✔
38	this.http = RestClient.builder()	1✔
39	.baseUrl(baseUri)	1✔
40	.requestInterceptor((request, body, execution) -> {	1✔
41	long start = System.currentTimeMillis();	1✔
42	ClientHttpResponse response = execution.execute(request, body);	1✔
43	long timeSpan = System.currentTimeMillis() - start;	1✔
44	boolean isLongRequest = timeSpan > Application.LONG_HTTP_REQUEST_THRESHOLD;	1✔
45	if (isLongRequest) {	1✔
46	LOG.warn("Long http request to {} ({}ms)", request.getURI(), timeSpan);	1✔
47	}
48	return response;	1✔
49	})
50	.build();	1✔
51	}	1✔
52
53	@Override
54	public SchemaInfo generateSchema(@NotNull String maybeTypePid) {
55	return http.get()	1✔
56	.uri(uriBuilder -> uriBuilder	1✔
57	.pathSegment("schema")	1✔
58	.path(maybeTypePid)	1✔
59	.build())	1✔
60	.exchange((request, response) -> {	1✔
61	HttpStatusCode statusCode = response.getStatusCode();	1✔
62	if (statusCode.is2xxSuccessful()) {	1✔
63	Schema schema = null;	1✔
64	try (InputStream inputStream = response.getBody()) {	1✔
65	JSONObject rawSchema = new JSONObject(new JSONTokener(inputStream));	1✔
66	schema = SchemaLoader.load(rawSchema);	1✔
NEW 67	} catch (JSONException e) {	×
NEW 68	return new SchemaInfo(	×
NEW 69	this.baseUrl.toString(),	×
70	schema,
NEW 71	new ExternalServiceException(baseUrl.toString(), "Response (" + maybeTypePid + ") is not a valid schema.")	×
72	);
73	}	1✔
74	return new SchemaInfo(this.baseUrl.toString(), schema, null);	1✔
NEW 75	} else if (statusCode.value() == 404) {	×
NEW 76	return new SchemaInfo(	×
NEW 77	this.baseUrl.toString(),	×
78	null,
79	new TypeNotFoundException(maybeTypePid));
80	} else {
NEW 81	return new SchemaInfo(	×
NEW 82	this.baseUrl.toString(),	×
83	null,
84	new ExternalServiceException(
NEW 85	this.baseUrl.toString(),	×
NEW 86	"Error generating schema: %s - %s".formatted(statusCode.value(), response.getStatusText())));	×
87	}
88	});
89	}
90	}

kit-data-manager / pit-service / #480

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous