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.

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

fixes #9577 #9580

Draft
wants to merge 5 commits into
base: 4.0.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ micronaut-validation = "4.0.0-M9"
micronaut-rxjava2 = "2.0.0-M6"
micronaut-rxjava3 = "3.0.0-M6"
micronaut-reactor = "3.0.0-M7"
micronaut-serde = "2.0.0"
neo4j-java-driver = "1.4.5"
selenium = "4.9.1"
slf4j = "2.0.7"
Expand Down Expand Up @@ -83,6 +84,7 @@ test-boms-micronaut-validation = { module = "io.micronaut.validation:micronaut-v
test-boms-micronaut-rxjava2 = { module = "io.micronaut.rxjava2:micronaut-rxjava2-bom", version.ref = "micronaut-rxjava2" }
test-boms-micronaut-rxjava3 = { module = "io.micronaut.rxjava3:micronaut-rxjava3-bom", version.ref = "micronaut-rxjava3" }
test-boms-micronaut-reactor = { module = "io.micronaut.reactor:micronaut-reactor-bom", version.ref = "micronaut-reactor" }
test-micronaut-serialisation-serde-jackson = { module = "io.micronaut.serde:micronaut-serde-jackson", version.ref = "micronaut-serde" }

boms-groovy = { module = "org.apache.groovy:groovy-bom", version.ref = "managed-groovy" }
boms-kotlin = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "managed-kotlin" }
Expand Down
1 change: 1 addition & 0 deletions json-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies {
testImplementation project(":inject-java")
testImplementation project(":inject-java-test")
testImplementation project(":inject-groovy")
testImplementation libs.test.micronaut.serialisation.serde.jackson
if (!JavaVersion.current().isJava9Compatible()) {
testImplementation files(org.gradle.internal.jvm.Jvm.current().toolsJar)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.micronaut.core.convert.MutableConversionService;
import io.micronaut.core.convert.TypeConverter;
import io.micronaut.core.convert.TypeConverterRegistrar;
import io.micronaut.core.convert.exceptions.ConversionErrorException;
import io.micronaut.core.convert.value.ConvertibleValues;
import io.micronaut.core.naming.NameUtils;
import io.micronaut.core.type.Argument;
Expand Down Expand Up @@ -176,6 +177,9 @@ protected TypeConverter<Map, Object> mapToObjectConverter() {
}
ArgumentBinder binder = this.beanPropertyBinder.get();
ArgumentBinder.BindingResult result = binder.bind(conversionContext, correctKeys(map));
conversionContext.getLastError().ifPresent(error -> {
throw new ConversionErrorException(conversionContext.getArgument(), error);
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will modify universally for all type conversions that use this type converter which is a breaking change.

We need to modify only the place where the conversion happens to throw this error

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@n0tl3ss can you address @graemerocher PR feedback? thanks.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sdelamo Offline I told Graeme that I think this is the right place where I should expect error to be thrown. He told me that he will take a look how better to do it.

return result.getValue();
};
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Copyright 2017-2019 original authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micronaut.json.convert

import io.micronaut.context.ApplicationContext
import io.micronaut.core.annotation.Introspected
import io.micronaut.core.convert.exceptions.ConversionErrorException
import spock.lang.Specification

class JsonConverterRegistrarSpec extends Specification {

void "throw ConversionErrorException when there is problem with serialisation"() {

given:
ApplicationContext ctx = ApplicationContext.run([
'micronaut.codec.json.additional-types': ['text/javascript', 'text/json']
])

when:
JsonConverterRegistrar registrar = ctx.getBean(JsonConverterRegistrar)
def converter = registrar.mapToObjectConverter()
Map<String, Object> jsonMap = Map.of("firstName", "test", "constraint", Map.of("type", "age", "value", "18"))
converter.convert(jsonMap, OuterClass.class)

then:
def conversionError = thrown(ConversionErrorException.class)
conversionError.getMessage().contains("Ensure the class is annotated with io.micronaut.core.annotation.Introspected")
}

@Introspected
static class OuterClass {
String firstName
Constraint constraint
}

static record Constraint(Type type, String value) {
enum Type {
AGE,
SEX
}
}

}