Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: fix osrd error deserialisation due to missing unit and kotlin adapters #7355

Merged
merged 1 commit into from
May 2, 2024
+12 −91
Merged

core: fix osrd error deserialisation due to missing unit and kotlin adapters #7355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/kt-osrd-utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ dependencies {
// PLEASE ADD AND UPDATE DEPENDENCIES USING libs.versions.toml
implementation project(':kt-fast-collections')
ksp project(':kt-fast-collections-generator')
api project(':osrd-reporting')

// JSON parsing
implementation libs.moshi
Expand Down
88 changes: 0 additions & 88 deletions core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/DiscreteEventSimulation.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions core/osrd-reporting/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'java'
id 'jacoco'
alias(libs.plugins.kotlin.jvm)
}

repositories {
Expand All @@ -15,10 +16,14 @@ java {

dependencies {
// PLEASE ADD AND UPDATE DEPENDENCIES USING libs.versions.toml
api project(':kt-osrd-utils')

implementation libs.kotlin.stdlib

//moshi
implementation libs.moshi
implementation libs.moshi.adapters
implementation libs.moshi.kotlin

//class-graph
implementation libs.classgraph
Expand Down
9 changes: 7 additions & 2 deletions core/osrd-reporting/src/main/java/fr/sncf/osrd/reporting/exceptions/OSRDError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package fr.sncf.osrd.reporting.exceptions;

import com.squareup.moshi.*;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.Moshi;
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory;
import fr.sncf.osrd.reporting.ErrorContext;
import fr.sncf.osrd.reporting.warnings.DiagnosticRecorder;
import fr.sncf.osrd.reporting.warnings.Warning;
import fr.sncf.osrd.utils.json.UnitAdapterFactory;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
Expand Down Expand Up @@ -456,7 +458,10 @@ public String getMessage() {
public static final JsonAdapter<OSRDError> adapter;

static {
Moshi moshi = new Moshi.Builder().build();
Moshi moshi = new Moshi.Builder()
.addLast(new UnitAdapterFactory())
.addLast(new KotlinJsonAdapterFactory())
.build();
adapter = moshi.adapter(OSRDError.class);
}

Expand Down
Loading