Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

smallrye/smallrye-graphql/507/506

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/506

https://github.com/smallrye/smallrye-graphql/pull/507

https://github.com/smallrye/smallrye-graphql/pull/507

fix

Handling of LocalDateTime (and probably others)

As specified [here](https://download.eclipse.org/microprofile/microprofile-graphql-1.0.3/microprofile-graphql.html#scalars), the server generates, i.e. a `scalar DateTime` in the schema for a `LocalDateTime` parameter: ``` type Query { hello( "ISO-8601" ping: DateTime ): String } "Scalar for DateTime" scalar DateTime ``` The client must use this predefined type mapping as well.

4b04398363fe4e16ea2b23906f98f9772ef24344

b8c9adce51fa0ee34430c2e93a2e84c87227e15a

https://github.com/smallrye/smallrye-graphql/compare/4b04398363fe4e16ea2b23906f98f9772ef24344...b8c9adce51fa0ee34430c2e93a2e84c87227e15a

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java index a554a679..6a1ddf9a 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java @@ -3,6 +3,7 @@ package io.smallrye.graphql.client.typesafe.impl.reflection; import java.lang.annotation.Annotation; import java.lang.reflect.Parameter; +import org.eclipse.microprofile.graphql.Id; import org.eclipse.microprofile.graphql.Input; import org.eclipse.microprofile.graphql.Name; @@ -28,8 +29,8 @@ public class ParameterInfo { } public String graphQlInputTypeName() { - if (type.isScalar()) { - return graphQlInputTypeName(type) + optionalExclamationMark(type); + if (parameter.isAnnotationPresent(Id.class)) { + return "ID" + optionalExclamationMark(type); } else if (type.isCollection()) { return "[" + withExclamationMark(type.getItemType()) + "]" + optionalExclamationMark(type); } else { @@ -42,23 +43,45 @@ public class ParameterInfo { } private String graphQlInputTypeName(TypeInfo type) { - return simpleInputTypeName(type); - } - - private String simpleInputTypeName(TypeInfo type) { if (type.isAnnotated(Input.class)) return type.getAnnotation(Input.class).value(); if (type.isAnnotated(Name.class)) return type.getAnnotation(Name.class).value(); switch (type.getSimpleName()) { + case "int": + case "Integer": + case "short": + case "Short": + case "byte": + case "Byte": + return "Int"; + case "float": + case "Float": + case "double": + case "Double": + return "Float"; + case "String": + case "char": + case "Character": + return "String"; case "boolean": case "Boolean": return "Boolean"; - case "int": - case "Integer": + case "BigInteger": case "long": case "Long": - return "Int"; + return "BigInteger"; + case "BigDecimal": + return "BigDecimal"; + case "LocalDate": + return "Date"; + case "LocalTime": + case "OffsetTime": + return "Time"; + case "LocalDateTime": + case "OffsetDateTime": + case "ZonedDateTime": + return "DateTime"; default: return type.getSimpleName() + (type.isScalar() || type.isEnum() ? "" : "Input"); } diff --git a/client/implementation/src/test/java/test/unit/ParametersBehavior.java b/client/implementation/src/test/java/test/unit/ParametersBehavior.java index bbe47e98..574b14d7 100644 --- a/client/implementation/src/test/java/test/unit/ParametersBehavior.java +++ b/client/implementation/src/test/java/test/unit/ParametersBehavior.java @@ -552,7 +552,7 @@ public class ParametersBehavior { String greeting = api.greeting(123L); - then(fixture.query()).isEqualTo("query greeting($who: Int) { greeting(who: $who) }"); + then(fixture.query()).isEqualTo("query greeting($who: BigInteger) { greeting(who: $who) }"); then(fixture.variables()).isEqualTo("{'who':123}"); then(fixture.operationName()).isEqualTo("greeting"); then(greeting).isEqualTo("hi, foo"); @@ -570,7 +570,7 @@ public class ParametersBehavior { String greeting = api.greeting(123L); - then(fixture.query()).isEqualTo("query greeting($who: Int!) { greeting(who: $who) }"); + then(fixture.query()).isEqualTo("query greeting($who: BigInteger!) { greeting(who: $who) }"); then(fixture.variables()).isEqualTo("{'who':123}"); then(fixture.operationName()).isEqualTo("greeting"); then(greeting).isEqualTo("hi, foo"); @@ -588,7 +588,7 @@ public class ParametersBehavior { String greeting = api.greeting(123L); - then(fixture.query()).isEqualTo("query greeting($who: Int!) { greeting(who: $who) }"); + then(fixture.query()).isEqualTo("query greeting($who: BigInteger!) { greeting(who: $who) }"); then(fixture.variables()).isEqualTo("{'who':123}"); then(fixture.operationName()).isEqualTo("greeting"); then(greeting).isEqualTo("hi, foo"); diff --git a/client/implementation/src/test/java/test/unit/ScalarBehavior.java b/client/implementation/src/test/java/test/unit/ScalarBehavior.java index be1493a3..71c20e8f 100644 --- a/client/implementation/src/test/java/test/unit/ScalarBehavior.java +++ b/client/implementation/src/test/java/test/unit/ScalarBehavior.java @@ -9,10 +9,15 @@ import java.math.BigInteger; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.OffsetTime; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.Date; +import org.eclipse.microprofile.graphql.Id; +import org.eclipse.microprofile.graphql.NonNull; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -24,12 +29,12 @@ class ScalarBehavior { @GraphQlClientApi interface BoolApi { - boolean bool(); + boolean bool(boolean in); } @GraphQlClientApi interface BooleanApi { - Boolean bool(); + Boolean bool(Boolean in); } @Nested @@ -39,9 +44,9 @@ class ScalarBehavior { fixture.returnsData("'bool':true"); BoolApi api = fixture.builder().build(BoolApi.class); - boolean bool = api.bool(); + boolean bool = api.bool(true); - then(fixture.query()).isEqualTo("query bool { bool }"); + then(fixture.query()).isEqualTo("query bool($in: Boolean!) { bool(in: $in) }"); then(bool).isTrue(); } @@ -50,7 +55,7 @@ class ScalarBehavior { fixture.returnsData("'bool':null"); BoolApi api = fixture.builder().build(BoolApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::bool, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.bool(true), GraphQlClientException.class); then(thrown).hasMessage("invalid boolean value for " + BoolApi.class.getName() + "#bool: null"); } @@ -60,7 +65,7 @@ class ScalarBehavior { fixture.returnsData("'bool':'xxx'"); BoolApi api = fixture.builder().build(BoolApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::bool, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.bool(true), GraphQlClientException.class); then(thrown).hasMessage("invalid boolean value for " + BoolApi.class.getName() + "#bool: \\"xxx\\""); } @@ -70,7 +75,7 @@ class ScalarBehavior { fixture.returnsData("'bool':123"); BoolApi api = fixture.builder().build(BoolApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::bool, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.bool(true), GraphQlClientException.class); then(thrown).hasMessage("invalid boolean value for " + BoolApi.class.getName() + "#bool: 123"); } @@ -80,7 +85,7 @@ class ScalarBehavior { fixture.returnsData("'bool':[123]"); BoolApi api = fixture.builder().build(BoolApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::bool, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.bool(true), GraphQlClientException.class); then(thrown).hasMessage("invalid boolean value for " + BoolApi.class.getName() + "#bool: [123]"); } @@ -90,7 +95,7 @@ class ScalarBehavior { fixture.returnsData("'bool':{'foo':'bar'}"); BoolApi api = fixture.builder().build(BoolApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::bool, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.bool(true), GraphQlClientException.class); then(thrown).hasMessage("invalid boolean value for " + BoolApi.class.getName() + "#bool: {\\"foo\\":\\"bar\\"}"); } @@ -100,21 +105,21 @@ class ScalarBehavior { fixture.returnsData("'bool':true"); BooleanApi api = fixture.builder().build(BooleanApi.class); - Boolean bool = api.bool(); + Boolean bool = api.bool(true); - then(fixture.query()).isEqualTo("query bool { bool }"); + then(fixture.query()).isEqualTo("query bool($in: Boolean) { bool(in: $in) }"); then(bool).isTrue(); } } @GraphQlClientApi interface ByteApi { - Byte code(); + Byte code(Byte in); } @GraphQlClientApi interface PrimitiveByteApi { - byte code(); + byte code(byte in); } @Nested @@ -124,9 +129,9 @@ class ScalarBehavior { fixture.returnsData("'code':5"); ByteApi api = fixture.builder().build(ByteApi.class); - Byte code = api.code(); + Byte code = api.code((byte) 1); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: Int) { code(in: $in) }"); then(code).isEqualTo((byte) 5); } @@ -135,9 +140,9 @@ class ScalarBehavior { fixture.returnsData("'code':5"); PrimitiveByteApi api = fixture.builder().build(PrimitiveByteApi.class); - byte code = api.code(); + byte code = api.code((byte) 1); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: Int!) { code(in: $in) }"); then(code).isEqualTo((byte) 5); } @@ -147,7 +152,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooBig); ByteApi api = fixture.builder().build(ByteApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code((byte) 1), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Byte value for " + ByteApi.class.getName() + "#code: " + tooBig); } @@ -158,7 +163,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooSmall); ByteApi api = fixture.builder().build(ByteApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code((byte) 1), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Byte value for " + ByteApi.class.getName() + "#code: " + tooSmall); } @@ -166,12 +171,12 @@ class ScalarBehavior { @GraphQlClientApi interface CharacterApi { - Character code(); + Character code(Character in); } @GraphQlClientApi interface PrimitiveCharApi { - char code(); + char code(char in); } @Nested @@ -181,9 +186,9 @@ class ScalarBehavior { fixture.returnsData("'code':'a'"); CharacterApi api = fixture.builder().build(CharacterApi.class); - Character c = api.code(); + Character c = api.code('c'); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: String) { code(in: $in) }"); then(c).isEqualTo('a'); } @@ -192,7 +197,7 @@ class ScalarBehavior { fixture.returnsData("'code':'ab'"); CharacterApi api = fixture.builder().build(CharacterApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code('c'), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Character value for " + CharacterApi.class.getName() + "#code: \\"ab\\""); } @@ -202,9 +207,9 @@ class ScalarBehavior { fixture.returnsData("'code':97"); CharacterApi api = fixture.builder().build(CharacterApi.class); - Character c = api.code(); + Character c = api.code('c'); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: String) { code(in: $in) }"); then(c).isEqualTo('a'); } @@ -214,7 +219,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooBig); CharacterApi api = fixture.builder().build(CharacterApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code('c'), GraphQlClientException.class); then(thrown) .hasMessage("invalid java.lang.Character value for " + CharacterApi.class.getName() + "#code: " + tooBig); @@ -225,7 +230,7 @@ class ScalarBehavior { fixture.returnsData("'code':-15"); CharacterApi api = fixture.builder().build(CharacterApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code('c'), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Character value for " + CharacterApi.class.getName() + "#code: -15"); } @@ -235,9 +240,9 @@ class ScalarBehavior { fixture.returnsData("'code':'a'"); PrimitiveCharApi api = fixture.builder().build(PrimitiveCharApi.class); - char c = api.code(); + char c = api.code('c'); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: String!) { code(in: $in) }"); then(c).isEqualTo('a'); } @@ -246,7 +251,7 @@ class ScalarBehavior { fixture.returnsData("'code':'ab'"); PrimitiveCharApi api = fixture.builder().build(PrimitiveCharApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code('c'), GraphQlClientException.class); then(thrown).hasMessage("invalid char value for " + PrimitiveCharApi.class.getName() + "#code: \\"ab\\""); } @@ -254,12 +259,12 @@ class ScalarBehavior { @GraphQlClientApi interface ShortApi { - Short code(); + Short code(Short in); } @GraphQlClientApi interface PrimitiveShortApi { - short code(); + short code(short in); } @Nested @@ -269,9 +274,9 @@ class ScalarBehavior { fixture.returnsData("'code':5"); ShortApi api = fixture.builder().build(ShortApi.class); - Short code = api.code(); + Short code = api.code((short) 2); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: Int) { code(in: $in) }"); then(code).isEqualTo((short) 5); } @@ -281,7 +286,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooSmall); ShortApi api = fixture.builder().build(ShortApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code((short) 2), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Short value for " + ShortApi.class.getName() + "#code: " + tooSmall); } @@ -292,7 +297,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooBig); ShortApi api = fixture.builder().build(ShortApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code((short) 2), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Short value for " + ShortApi.class.getName() + "#code: " + tooBig); } @@ -302,21 +307,21 @@ class ScalarBehavior { fixture.returnsData("'code':5"); PrimitiveShortApi api = fixture.builder().build(PrimitiveShortApi.class); - short code = api.code(); + short code = api.code((short) 2); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: Int!) { code(in: $in) }"); then(code).isEqualTo((short) 5); } } @GraphQlClientApi interface IntegerApi { - Integer code(); + Integer code(Integer in); } @GraphQlClientApi interface IntApi { - int code(); + int code(int in); } @Nested @@ -326,9 +331,9 @@ class ScalarBehavior { fixture.returnsData("'code':5"); IntegerApi api = fixture.builder().build(IntegerApi.class); - Integer code = api.code(); + Integer code = api.code(3); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: Int) { code(in: $in) }"); then(code).isEqualTo(5); } @@ -338,7 +343,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + number); IntegerApi api = fixture.builder().build(IntegerApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code(3), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Integer value for " + IntegerApi.class.getName() + "#code: " + number); } @@ -349,7 +354,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooSmall); IntegerApi api = fixture.builder().build(IntegerApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code(3), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Integer value for " + IntegerApi.class.getName() + "#code: " + tooSmall); } @@ -360,7 +365,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooBig); IntegerApi api = fixture.builder().build(IntegerApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code(3), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Integer value for " + IntegerApi.class.getName() + "#code: " + tooBig); } @@ -370,21 +375,21 @@ class ScalarBehavior { fixture.returnsData("'code':5"); IntApi api = fixture.builder().build(IntApi.class); - int code = api.code(); + int code = api.code(3); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: Int!) { code(in: $in) }"); then(code).isEqualTo(5); } } @GraphQlClientApi interface LongApi { - Long code(); + Long code(Long in); } @GraphQlClientApi interface PrimitiveLongApi { - long code(); + long code(long in); } @Nested @@ -394,9 +399,9 @@ class ScalarBehavior { fixture.returnsData("'code':5"); LongApi api = fixture.builder().build(LongApi.class); - Long code = api.code(); + Long code = api.code(7L); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: BigInteger) { code(in: $in) }"); then(code).isEqualTo(5L); } @@ -406,7 +411,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooSmall); LongApi api = fixture.builder().build(LongApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code(7L), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Long value for " + LongApi.class.getName() + "#code: " + tooSmall); } @@ -417,7 +422,7 @@ class ScalarBehavior { fixture.returnsData("'code':" + tooBig); LongApi api = fixture.builder().build(LongApi.class); - GraphQlClientException thrown = catchThrowableOfType(api::code, GraphQlClientException.class); + GraphQlClientException thrown = catchThrowableOfType(() -> api.code(7L), GraphQlClientException.class); then(thrown).hasMessage("invalid java.lang.Long value for " + LongApi.class.getName() + "#code: " + tooBig); } @@ -427,21 +432,21 @@ class ScalarBehavior { fixture.returnsData("'code':5"); PrimitiveLongApi api = fixture.builder().build(PrimitiveLongApi.class); - long code = api.code(); + long code = api.code(7L); - then(fixture.query()).isEqualTo("query code { code }"); + then(fixture.query()).isEqualTo("query code($in: BigInteger!) { code(in: $in) }"); then(code).isEqualTo(5L); } } @GraphQlClientApi interface FloatApi { - Float number(); + Float number(Float in); } @GraphQlClientApi interface PrimitiveFloatApi { - float number(); + float number(float in); } @Nested @@ -451,9 +456,9 @@ class ScalarBehavior { fixture.returnsData("'number':123.456"); FloatApi api = fixture.builder().build(FloatApi.class); - Float number = api.number(); + Float number = api.number(7.8f); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: Float) { number(in: $in) }"); then(number).isEqualTo(123.456f); } @@ -462,21 +467,21 @@ class ScalarBehavior { fixture.returnsData("'number':123.456"); PrimitiveFloatApi api = fixture.builder().build(PrimitiveFloatApi.class); - float number = api.number(); + float number = api.number(7.8f); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: Float!) { number(in: $in) }"); then(number).isEqualTo(123.456f); } } @GraphQlClientApi interface DoubleApi { - Double number(); + Double number(Double in); } @GraphQlClientApi interface PrimitiveDoubleApi { - double number(); + double number(double in); } @Nested @@ -486,9 +491,9 @@ class ScalarBehavior { fixture.returnsData("'number':123.456"); DoubleApi api = fixture.builder().build(DoubleApi.class); - Double number = api.number(); + Double number = api.number(4.5); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: Float) { number(in: $in) }"); then(number).isEqualTo(123.456D); } @@ -497,16 +502,16 @@ class ScalarBehavior { fixture.returnsData("'number':123.456"); PrimitiveDoubleApi api = fixture.builder().build(PrimitiveDoubleApi.class); - double number = api.number(); + double number = api.number(4.5); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: Float!) { number(in: $in) }"); then(number).isEqualTo(123.456D); } } @GraphQlClientApi interface BigIntegerApi { - BigInteger number(); + BigInteger number(BigInteger in); } @Nested @@ -517,9 +522,9 @@ class ScalarBehavior { fixture.returnsData("'number':" + reallyLongInteger); BigIntegerApi api = fixture.builder().build(BigIntegerApi.class); - BigInteger number = api.number(); + BigInteger number = api.number(BigInteger.TEN); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: BigInteger) { number(in: $in) }"); then(number).isEqualTo(reallyLongInteger); } @@ -529,16 +534,16 @@ class ScalarBehavior { fixture.returnsData("'number':" + notSoLongInteger); BigIntegerApi api = fixture.builder().build(BigIntegerApi.class); - BigInteger number = api.number(); + BigInteger number = api.number(BigInteger.TEN); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: BigInteger) { number(in: $in) }"); then(number).isEqualTo(notSoLongInteger); } } @GraphQlClientApi interface BigDecimalApi { - BigDecimal number(); + BigDecimal number(BigDecimal in); } @Nested @@ -549,9 +554,9 @@ class ScalarBehavior { fixture.returnsData("'number':" + reallyLongDecimal); BigDecimalApi api = fixture.builder().build(BigDecimalApi.class); - BigDecimal number = api.number(); + BigDecimal number = api.number(BigDecimal.valueOf(12.34)); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: BigDecimal) { number(in: $in) }"); then(number).isEqualTo(reallyLongDecimal); } @@ -561,16 +566,29 @@ class ScalarBehavior { fixture.returnsData("'number':" + notSoLongDecimal); BigDecimalApi api = fixture.builder().build(BigDecimalApi.class); - BigDecimal number = api.number(); + BigDecimal number = api.number(BigDecimal.valueOf(12.34)); - then(fixture.query()).isEqualTo("query number { number }"); + then(fixture.query()).isEqualTo("query number($in: BigDecimal) { number(in: $in) }"); then(number).isEqualTo(notSoLongDecimal); } } @GraphQlClientApi interface StringApi { - String greeting(); + String greeting(String in); + } + + @GraphQlClientApi + interface IdApi { + @Id + String idea(@Id String in); + } + + @GraphQlClientApi + interface NonNullIdApi { + @NonNull + @Id + String idea(@NonNull @Id String in); } @GraphQlClientApi @@ -677,12 +695,34 @@ class ScalarBehavior { fixture.returnsData("'greeting':'dummy-greeting'"); StringApi api = fixture.builder().build(StringApi.class); - String greeting = api.greeting(); + String greeting = api.greeting("in"); - then(fixture.query()).isEqualTo("query greeting { greeting }"); + then(fixture.query()).isEqualTo("query greeting($in: String) { greeting(in: $in) }"); then(greeting).isEqualTo("dummy-greeting"); } + @Test + void shouldCallIdQuery() { + fixture.returnsData("'idea':'out'"); + IdApi api = fixture.builder().build(IdApi.class); + + String out = api.idea("in"); + + then(fixture.query()).isEqualTo("query idea($in: ID) { idea(in: $in) }"); + then(out).isEqualTo("out"); + } + + @Test + void shouldCallNonNullIdQuery() { + fixture.returnsData("'idea':'out'"); + NonNullIdApi api = fixture.builder().build(NonNullIdApi.class); + + String out = api.idea("in"); + + then(fixture.query()).isEqualTo("query idea($in: ID!) { idea(in: $in) }"); + then(out).isEqualTo("out"); + } + @Test void shouldCallScalarWithValueOfQuery() { fixture.returnsData("'foo':123456"); @@ -763,59 +803,77 @@ class ScalarBehavior { String getting(); } - @Test - void shouldCallStringGetterQuery() { - fixture.returnsData("'greeting':'foo'"); - StringGettersApi api = fixture.builder().build(StringGettersApi.class); + @Nested + class GetterBehavior { + @Test + void shouldCallStringGetterQuery() { + fixture.returnsData("'greeting':'foo'"); + StringGettersApi api = fixture.builder().build(StringGettersApi.class); - String value = api.getGreeting(); + String value = api.getGreeting(); - then(fixture.query()).isEqualTo("query greeting { greeting }"); - then(value).isEqualTo("foo"); - } + then(fixture.query()).isEqualTo("query greeting { greeting }"); + then(value).isEqualTo("foo"); + } - @Test - void shouldCallJustGetQuery() { - fixture.returnsData("'get':'foo'"); - StringGettersApi api = fixture.builder().build(StringGettersApi.class); + @Test + void shouldCallJustGetQuery() { + fixture.returnsData("'get':'foo'"); + StringGettersApi api = fixture.builder().build(StringGettersApi.class); - String value = api.get(); + String value = api.get(); - then(fixture.query()).isEqualTo("query get { get }"); - then(value).isEqualTo("foo"); - } + then(fixture.query()).isEqualTo("query get { get }"); + then(value).isEqualTo("foo"); + } - @Test - void shouldCallOneCharGetterQuery() { - fixture.returnsData("'g':'foo'"); - StringGettersApi api = fixture.builder().build(StringGettersApi.class); + @Test + void shouldCallOneCharGetterQuery() { + fixture.returnsData("'g':'foo'"); + StringGettersApi api = fixture.builder().build(StringGettersApi.class); - String value = api.getG(); + String value = api.getG(); - then(fixture.query()).isEqualTo("query g { g }"); - then(value).isEqualTo("foo"); - } + then(fixture.query()).isEqualTo("query g { g }"); + then(value).isEqualTo("foo"); + } - @Test - void shouldCallGetAndOneLowerCharQuery() { - fixture.returnsData("'gets':'foo'"); - StringGettersApi api = fixture.builder().build(StringGettersApi.class); + @Test + void shouldCallGetAndOneLowerCharQuery() { + fixture.returnsData("'gets':'foo'"); + StringGettersApi api = fixture.builder().build(StringGettersApi.class); + + String value = api.gets(); + + then(fixture.query()).isEqualTo("query gets { gets }"); + then(value).isEqualTo("foo"); + } + + @Test + void shouldCallGetAndLowerCharsQuery() { + fixture.returnsData("'getting':'foo'"); + StringGettersApi api = fixture.builder().build(StringGettersApi.class); - String value = api.gets(); + String value = api.getting(); - then(fixture.query()).isEqualTo("query gets { gets }"); - then(value).isEqualTo("foo"); + then(fixture.query()).isEqualTo("query getting { getting }"); + then(value).isEqualTo("foo"); + } } - @Test - void shouldCallGetAndLowerCharsQuery() { - fixture.returnsData("'getting':'foo'"); - StringGettersApi api = fixture.builder().build(StringGettersApi.class); + @GraphQlClientApi + interface LocalDateApi { + LocalDate foo(LocalDate date); + } - String value = api.getting(); + @GraphQlClientApi + interface LocalTimeApi { + LocalTime foo(LocalTime date); + } - then(fixture.query()).isEqualTo("query getting { getting }"); - then(value).isEqualTo("foo"); + @GraphQlClientApi + interface OffsetTimeApi { + OffsetTime foo(OffsetTime date); } @GraphQlClientApi @@ -823,18 +881,9 @@ class ScalarBehavior { LocalDateTime foo(LocalDateTime date); } - @Test - void shouldCallLocalDateTimeQuery() { - LocalDateTime in = LocalDateTime.ofEpochSecond(123456789, 987654321, UTC); - LocalDateTime out = LocalDateTime.ofEpochSecond(987654321, 123456789, UTC); - fixture.returnsData("'foo':'" + out + "'"); - LocalDateTimeApi api = fixture.builder().build(LocalDateTimeApi.class); - - LocalDateTime value = api.foo(in); - - then(fixture.query()).isEqualTo("query foo($date: LocalDateTime) { foo(date: $date) }"); - then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); - then(value).isEqualTo(out); + @GraphQlClientApi + interface OffsetDateTimeApi { + OffsetDateTime foo(OffsetDateTime date); } @GraphQlClientApi @@ -842,57 +891,128 @@ class ScalarBehavior { ZonedDateTime foo(ZonedDateTime date); } - @Test - void shouldCallZonedDateTimeQuery() { - ZonedDateTime in = ZonedDateTime.of(2020, 10, 9, 15, 58, 21, 0, ZoneOffset.ofHours(2)); - ZonedDateTime out = ZonedDateTime.of(2018, 1, 9, 1, 2, 3, 4, ZoneOffset.ofHours(-2)); - fixture.returnsData("'foo':'" + out + "'"); - ZonedDateTimeApi api = fixture.builder().build(ZonedDateTimeApi.class); - - ZonedDateTime value = api.foo(in); - - then(fixture.query()).isEqualTo("query foo($date: ZonedDateTime) { foo(date: $date) }"); - then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); - then(value).isEqualTo(out); - } - @GraphQlClientApi interface InstantApi { Instant foo(Instant instant); } - @Test - void shouldCallInstantQuery() { - Instant in = Instant.ofEpochMilli(123456789); - Instant out = Instant.ofEpochMilli(987654321); - fixture.returnsData("'foo':'" + out + "'"); - InstantApi api = fixture.builder().build(InstantApi.class); - - Instant value = api.foo(in); - - then(fixture.query()).isEqualTo("query foo($instant: Instant) { foo(instant: $instant) }"); - then(fixture.variables()).isEqualTo("{'instant':'" + in + "'}"); - then(value).isEqualTo(out); - } - @GraphQlClientApi interface DateApi { Date foo(Date date); } - @Test - void shouldCallDateQuery() { - Instant in = Instant.ofEpochMilli(123456789); - Instant out = Instant.ofEpochMilli(987654321); - fixture.returnsData("'foo':'" + out + "'"); - DateApi api = fixture.builder().build(DateApi.class); + @Nested + class DateAndTimeBehavior { + @Test + void shouldCallLocalDateQuery() { + LocalDate in = LocalDate.of(2020, 10, 31); + LocalDate out = LocalDate.of(3000, 1, 1); + fixture.returnsData("'foo':'" + out + "'"); + LocalDateApi api = fixture.builder().build(LocalDateApi.class); - Date value = api.foo(Date.from(in)); + LocalDate value = api.foo(in); - then(fixture.query()).isEqualTo("query foo($date: Date) { foo(date: $date) }"); - then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); - then(value).isEqualTo(Date.from(out)); - } + then(fixture.query()).isEqualTo("query foo($date: Date) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallLocalTimeQuery() { + LocalTime in = LocalTime.of(12, 34, 56); + LocalTime out = LocalTime.of(21, 43, 55); + fixture.returnsData("'foo':'" + out + "'"); + LocalTimeApi api = fixture.builder().build(LocalTimeApi.class); + + LocalTime value = api.foo(in); + + then(fixture.query()).isEqualTo("query foo($date: Time) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallOffsetTimeQuery() { + OffsetTime in = OffsetTime.of(12, 34, 56, 789, ZoneOffset.ofHours(3)); + OffsetTime out = OffsetTime.of(21, 43, 55, 987, ZoneOffset.ofHours(5)); + fixture.returnsData("'foo':'" + out + "'"); + OffsetTimeApi api = fixture.builder().build(OffsetTimeApi.class); + + OffsetTime value = api.foo(in); + + then(fixture.query()).isEqualTo("query foo($date: Time) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallLocalDateTimeQuery() { + LocalDateTime in = LocalDateTime.of(2020, 10, 9, 15, 58, 21, 0); + LocalDateTime out = LocalDateTime.of(2018, 1, 9, 1, 2, 3, 4); + fixture.returnsData("'foo':'" + out + "'"); + LocalDateTimeApi api = fixture.builder().build(LocalDateTimeApi.class); + + LocalDateTime value = api.foo(in); - // there's only special code for Date; java.time works out of the box, so we dont' test them all + then(fixture.query()).isEqualTo("query foo($date: DateTime) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallOffsetDateTimeQuery() { + OffsetDateTime in = OffsetDateTime.of(2020, 10, 9, 15, 58, 21, 0, ZoneOffset.ofHours(2)); + OffsetDateTime out = OffsetDateTime.of(2018, 1, 9, 1, 2, 3, 4, ZoneOffset.ofHours(-2)); + fixture.returnsData("'foo':'" + out + "'"); + OffsetDateTimeApi api = fixture.builder().build(OffsetDateTimeApi.class); + + OffsetDateTime value = api.foo(in); + + then(fixture.query()).isEqualTo("query foo($date: DateTime) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallZonedDateTimeQuery() { + ZonedDateTime in = ZonedDateTime.of(2020, 10, 31, 12, 34, 56, 789, ZoneOffset.ofHours(3)); + ZonedDateTime out = ZonedDateTime.of(3000, 1, 13, 21, 43, 55, 987, UTC); + fixture.returnsData("'foo':'" + out + "'"); + ZonedDateTimeApi api = fixture.builder().build(ZonedDateTimeApi.class); + + ZonedDateTime value = api.foo(in); + + then(fixture.query()).isEqualTo("query foo($date: DateTime) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallInstantQuery() { + Instant in = Instant.ofEpochMilli(123456789); + Instant out = Instant.ofEpochMilli(987654321); + fixture.returnsData("'foo':'" + out + "'"); + InstantApi api = fixture.builder().build(InstantApi.class); + + Instant value = api.foo(in); + + then(fixture.query()).isEqualTo("query foo($instant: Instant) { foo(instant: $instant) }"); + then(fixture.variables()).isEqualTo("{'instant':'" + in + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallDateQuery() { + Instant in = Instant.ofEpochMilli(123456789); + Instant out = Instant.ofEpochMilli(987654321); + fixture.returnsData("'foo':'" + out + "'"); + DateApi api = fixture.builder().build(DateApi.class); + + Date value = api.foo(Date.from(in)); + + then(fixture.query()).isEqualTo("query foo($date: Date) { foo(date: $date) }"); + then(fixture.variables()).isEqualTo("{'date':'" + in + "'}"); + then(value).isEqualTo(Date.from(out)); + } + } }

['client/implementation/src/test/java/test/unit/ScalarBehavior.java', 'client/implementation/src/test/java/test/unit/ParametersBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java']

{'.java': 3}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/950/946

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/946

https://github.com/smallrye/smallrye-graphql/pull/950

https://github.com/smallrye/smallrye-graphql/pull/950

fix

Typesafe Client: JsonException when a GraphQL error has a path that is actually `null`

```json { "errors": [ { "message": "some error message", "locations": [{"line": 1, "column": 256}], "path": ["foo", "bar", "baz"], } ], "data": { "foo": [ { "bar": null, } ] } } ``` There was an error in `foo/bar/baz` that resulted in `foo/bar` being `null`. ⇒ The typesafe client fails with `javax.json.JsonException: The reference value in a JSON Pointer must be a JSON Object or a JSON Array, was 'NULL'` in `ResultBuilder` line 74 when trying to apply an `ErrorOr`. Expected: don't apply the `ErrorOr`

ff1a3e5c74a216751dda31c60b2789cfab5be89f

821067e6127dfaaf63cc8520f45f0d0b94c0cdb6

https://github.com/smallrye/smallrye-graphql/compare/ff1a3e5c74a216751dda31c60b2789cfab5be89f...821067e6127dfaaf63cc8520f45f0d0b94c0cdb6

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java index c4e14be5..dbf0cbbf 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java @@ -13,6 +13,7 @@ import java.util.stream.Collectors; import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; +import javax.json.JsonException; import javax.json.JsonObject; import javax.json.JsonPatch; import javax.json.JsonPointer; @@ -72,6 +73,8 @@ public class ResultBuilder { if (data == null || path == null) return false; JsonPointer pointer = Json.createPointer(path.stream().map(Object::toString).collect(joining("/", "/", ""))); + if (!exists(pointer)) + return false; JsonArrayBuilder errors = Json.createArrayBuilder(); if (pointer.containsValue(data) && isListOf(pointer.getValue(data), ErrorOr.class.getSimpleName())) pointer.getValue(data).asJsonArray().forEach(errors::add); @@ -80,6 +83,15 @@ public class ResultBuilder { return true; } + private boolean exists(JsonPointer pointer) { + try { + pointer.containsValue(data); + return true; + } catch (JsonException e) { + return false; + } + } + private GraphQLClientError convert(JsonValue jsonValue) { JsonObject jsonObject = jsonValue.asJsonObject(); return new GraphQLClientError() { diff --git a/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java b/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java index 1660660a..beea0c32 100644 --- a/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java +++ b/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java @@ -458,6 +458,34 @@ class ErrorBehavior { then(error.getErrorCode()).isEqualTo("team-search-disabled"); } + @Test + void shouldFetchErrorOrWithNullInPath() { + fixture.returns("{" + + "\\"data\\":{\\"teams\\":null}," + + "\\"errors\\":[{" + + /**/"\\"message\\":\\"can't get team name\\"," + + /**/"\\"locations\\":[{\\"line\\":1,\\"column\\":2,\\"sourceName\\":\\"loc\\"}]," + + /**/"\\"path\\": [\\"teams\\",\\"name\\"],\\n" + + /**/"\\"extensions\\":{" + + /**//**/"\\"code\\":\\"team-name-disabled\\"}" + + "}]}}"); + SuperHeroApi api = fixture.build(SuperHeroApi.class); + + GraphQLClientException throwable = catchThrowableOfType(api::teams, GraphQLClientException.class); + + then(fixture.query()).isEqualTo("query teams { teams {name} }"); + then(throwable).hasMessage("errors from service"); + then(throwable).hasToString("GraphQlClientException: errors from service\\n" + + "errors:\\n" + + "- team-name-disabled: [teams, name] can't get team name [(1:2@loc)] {code=team-name-disabled})"); + then(throwable.getErrors()).hasSize(1); + GraphQLClientError error = throwable.getErrors().get(0); + then(error.getMessage()).isEqualTo("can't get team name"); + then(error.getPath()).containsExactly("teams", "name"); + then(error.getLocations()).containsExactly(new SourceLocation(1, 2, "loc")); + then(error.getErrorCode()).isEqualTo("team-name-disabled"); + } + static class Wrapper { @Name("findHeroes") List<ErrorOr<SuperHero>> superHeroes;

['client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java']

{'.java': 2}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/907/906

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/906

https://github.com/smallrye/smallrye-graphql/pull/907

https://github.com/smallrye/smallrye-graphql/pull/907

fix

Handle errors with a `null` error `message`

The typesafe client throws a `java.lang.ClassCastException: class javax.json.JsonValueImpl cannot be cast to class javax.json.JsonString` if the response is something like: ```json { "errors": [ { "message": null, "locations": [ ... ``` Reason: the `ResultBuilder` simply returns `jsonObject.getString("message");` which fails on a `JsonValue.NULL`.

bac875fe4eba77afa60d25013c47e100475d2c6e

43ea1fff9f297b2e8d1c05f6a34032fab892163d

https://github.com/smallrye/smallrye-graphql/compare/bac875fe4eba77afa60d25013c47e100475d2c6e...43ea1fff9f297b2e8d1c05f6a34032fab892163d

diff --git a/client/api/src/main/java/io/smallrye/graphql/client/typesafe/api/GraphQLClientError.java b/client/api/src/main/java/io/smallrye/graphql/client/typesafe/api/GraphQLClientError.java index 953adec1..06c00e48 100644 --- a/client/api/src/main/java/io/smallrye/graphql/client/typesafe/api/GraphQLClientError.java +++ b/client/api/src/main/java/io/smallrye/graphql/client/typesafe/api/GraphQLClientError.java @@ -27,12 +27,13 @@ public interface GraphQLClientError { default String defaultToString() { String errorCode = getErrorCode(); List<Object> path = getPath(); + String message = getMessage(); List<SourceLocation> locations = getLocations(); Map<String, Object> extensions = getExtensions(); - return ((errorCode == null) ? "" : errorCode + ": ") + return (((errorCode == null) ? "" : errorCode + ": ") + ((path == null) ? "" : path + " ") - + getMessage() - + ((locations == null) ? "" : " " + locations) - + ((extensions == null || extensions.isEmpty()) ? "" : " " + extensions); + + ((message == null) ? "" : message + " ") + + ((locations == null) ? "" : locations + " ") + + ((extensions == null || extensions.isEmpty()) ? "" : extensions + " ")).trim(); } } diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java index 8235ee8f..d3a70f41 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java @@ -85,7 +85,7 @@ public class ResultBuilder { return new GraphQLClientError() { @Override public String getMessage() { - return jsonObject.getString("message"); + return jsonObject.getString("message", null); } @Override diff --git a/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java b/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java index df33d2a2..1660660a 100644 --- a/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java +++ b/client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java @@ -107,6 +107,68 @@ class ErrorBehavior { then(error.getExtensions().get("classification")).isEqualTo("ValidationError"); } + @Test + void shouldFailOnErrorWithoutMessage() { + fixture.returns("{" + + "\\"data\\":{\\"greeting\\":null}," + + "\\"errors\\":[{" + + /**/"\\"locations\\":[{\\"line\\":1,\\"column\\":2,\\"sourceName\\":\\"loc\\"}]," + + /**/"\\"path\\": [\\"greeting\\"],\\n" + + /**/"\\"extensions\\":{" + + /**//**/"\\"description\\":\\"some description\\"," + + /**//**/"\\"queryPath\\":[\\"greeting\\"]," + + /**//**/"\\"classification\\":\\"DataFetchingException\\"," + + /**//**/"\\"code\\":\\"no-greeting\\"}" + + "}]}}"); + StringApi api = fixture.build(StringApi.class); + + GraphQLClientException thrown = catchThrowableOfType(api::greeting, GraphQLClientException.class); + + then(thrown).hasMessage("errors from service (and we can't apply them to a java.lang.String value for" + + " tck.graphql.typesafe.ErrorBehavior$StringApi#greeting; see ErrorOr)"); + then(thrown).hasToString( + "GraphQlClientException: errors from service (and we can't apply them to a java.lang.String value for " + + StringApi.class.getName() + "#greeting; see ErrorOr)\\n" + + "errors:\\n" + + "- no-greeting: [greeting] [(1:2@loc)]" + + " {description=some description, queryPath=[greeting], classification=DataFetchingException, code=no-greeting})"); + then(thrown.getErrors()).hasSize(1); + GraphQLClientError error = thrown.getErrors().get(0); + then(error.getMessage()).isNull(); + then(error.getLocations()).containsExactly(new SourceLocation(1, 2, "loc")); + then(error.getPath()).containsExactly("greeting"); + then(error.getErrorCode()).isEqualTo("no-greeting"); + } + + @Test + void shouldFailOnErrorWithNullMessage() { + fixture.returns("{\\n" + + " \\"errors\\": [\\n" + + " {\\n" + + " \\"message\\": null,\\n" + + " \\"extensions\\": {\\n" + + " \\"classification\\": \\"SomeClassification\\"\\n" + + " }\\n" + + " }\\n" + + " ],\\n" + + " \\"data\\": null\\n" + + "}\\n"); + StringApi api = fixture.build(StringApi.class); + + GraphQLClientException thrown = catchThrowableOfType(api::greeting, GraphQLClientException.class); + + then(thrown).hasMessage("errors from service"); + then(thrown).hasToString("GraphQlClientException: errors from service\\n" + + "errors:\\n" + + "- {classification=SomeClassification})"); + then(thrown.getErrors()).hasSize(1); + GraphQLClientError error = thrown.getErrors().get(0); + then(error.getMessage()).isNull(); + then(error.getLocations()).isNull(); + then(error.getErrorCode()).isNull(); + then(error.getExtensions().get("classification")).isEqualTo("SomeClassification"); + } + @Test void shouldFailOnErrorWithoutExtensions() { fixture.returns("{\\n" +

['client/tck/src/main/java/tck/graphql/typesafe/ErrorBehavior.java', 'client/api/src/main/java/io/smallrye/graphql/client/typesafe/api/GraphQLClientError.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/ResultBuilder.java']

{'.java': 3}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/340/337

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/337

https://github.com/smallrye/smallrye-graphql/pull/340

https://github.com/smallrye/smallrye-graphql/pull/340

fix

Support java.util.Date in queries from smallrye-graphql-client

I am using this library to fetch data from GitHub and I noticed that some types are not assembled correctly. This is what I have so far: ```java @GraphQlClientApi(endpoint = "https://api.github.com/graphql") @AuthorizationHeader(confPrefix = "github", type = AuthorizationHeader.Type.BEARER) public interface GitHub { @Query("repository") Repository repository(String owner, String name); } ``` This is the `Repository` class: ```java public class Repository { public String id; public java.util.Date createdAt; } ``` This is my test: ```java @Test void test() { final GitHub github = GraphQlClientBuilder.newBuilder().build(GitHub.class); System.out.println(github.repository("gastaldi", "backport-repo")); } ``` And this is the error I get: ```java io.smallrye.graphql.client.typesafe.api.GraphQlClientException: errors from service: [{"message":"Parse error on \\"}\\" (RCURLY) at [1, 77]","locations":[{"line":1,"column":77}]}]: {"query":"query { repository(owner: \\"gastaldi\\", name: \\"backport-repo\\") {id createdAt {}} }"} at io.smallrye.graphql.client.typesafe.impl.GraphQlClientProxy.readResponse(GraphQlClientProxy.java:128) at io.smallrye.graphql.client.typesafe.impl.GraphQlClientProxy.fromJson(GraphQlClientProxy.java:120) at io.smallrye.graphql.client.typesafe.impl.GraphQlClientProxy.invoke(GraphQlClientProxy.java:52) at io.smallrye.graphql.client.typesafe.impl.GraphQlClientBuilderImpl.lambda$build$0(GraphQlClientBuilderImpl.java:45) at com.sun.proxy.$Proxy18.repository(Unknown Source) at io.quarkus.backports.GraphQLTest.test(GraphQLTest.java:12) ```

af0555254f21ab09bad79a37d2091087c4cac3dd

c1ca136b97d818dc91e42894ca9381437f974c43

https://github.com/smallrye/smallrye-graphql/compare/af0555254f21ab09bad79a37d2091087c4cac3dd...c1ca136b97d818dc91e42894ca9381437f974c43

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java index a4f150bf..41f30933 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java @@ -48,10 +48,9 @@ public class GraphQlClientBuilderImpl implements GraphQlClientBuilder { } private ClassLoader getClassLoader(Class<?> apiClass) { - if (System.getSecurityManager() == null) { + if (System.getSecurityManager() == null) return apiClass.getClassLoader(); - } - return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> apiClass.getClassLoader()); + return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) apiClass::getClassLoader); } private void readConfig(GraphQlClientApi annotation) { diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java index bd200d63..93fd8578 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java @@ -83,15 +83,13 @@ class GraphQlClientProxy { while (type.isOptional()) type = type.getItemType(); - if (type.isScalar()) { + if (type.isScalar()) return ""; - } else if (type.isCollection()) { + if (type.isCollection()) return fields(type.getItemType()); - } else { - return type.fields() - .map(this::field) - .collect(joining(" ", " {", "}")); - } + return type.fields() + .map(this::field) + .collect(joining(" ", " {", "}")); } private String field(FieldInfo field) { diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java index be3be778..3b6b5efb 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java @@ -42,23 +42,27 @@ class RequestBuilder { private void buildParam(TypeInfo type, Object value) { if (value == null) request.append("null"); - else if (value instanceof Boolean || value instanceof Number || type.isEnum()) - request.append(value); else if (type.isScalar()) - buildScalarParam(value); + buildScalarParam(type, value); else if (type.isCollection()) buildArrayParam(type.getItemType(), (List<?>) value); else buildObjectParam(type, value); } - private void buildScalarParam(Object value) { - request - .append("\\"") - .append(value.toString() - .replace("\\"", "\\\\\\"") - .replace("\\n", "\\\\n")) - .append("\\""); + private void buildScalarParam(TypeInfo type, Object value) { + boolean quoted = !unquoted(type); + if (quoted) + request.append("\\""); + request.append(type.stringValue(value)); + if (quoted) + request.append("\\""); + } + + public boolean unquoted(TypeInfo type) { + return type.isPrimitive() + || Number.class.isAssignableFrom(type.getRawType()) + || type.isEnum(); } private void buildArrayParam(TypeInfo itemType, List<?> values) { diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java index 7d90e80a..66f12fed 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java @@ -1,5 +1,7 @@ package io.smallrye.graphql.client.typesafe.impl.json; +import java.time.Instant; + import javax.json.JsonString; import io.smallrye.graphql.client.typesafe.api.GraphQlClientException; @@ -24,6 +26,9 @@ class JsonStringReader extends Reader<JsonString> { //noinspection rawtypes,unchecked return Enum.valueOf((Class) type.getRawType(), value.getString()); + if (java.util.Date.class.equals(this.type.getRawType())) + return java.util.Date.from(Instant.parse(value.getString())); + ConstructionInfo constructor = type.scalarConstructor() .orElseThrow(() -> new GraphQlClientValueException(location, value)); try { diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java index bb0a1cd7..b9cc7915 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java @@ -4,7 +4,6 @@ import static java.lang.reflect.Modifier.isStatic; import static java.lang.reflect.Modifier.isTransient; import static java.util.Objects.requireNonNull; -import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedType; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; @@ -111,10 +110,9 @@ public class TypeInfo { } private Field[] getDeclaredFields(Class<?> type) { - if (System.getSecurityManager() == null) { + if (System.getSecurityManager() == null) return type.getDeclaredFields(); - } - return AccessController.doPrivileged((PrivilegedAction<Field[]>) () -> type.getDeclaredFields()); + return AccessController.doPrivileged((PrivilegedAction<Field[]>) type::getDeclaredFields); } private boolean isGraphQlField(Field field) { @@ -127,10 +125,11 @@ public class TypeInfo { public boolean isScalar() { return isPrimitive() - || Character.class.equals(getRawType()) // has a valueOf(char), not valueOf(String) || Number.class.isAssignableFrom(getRawType()) - || CharSequence.class.isAssignableFrom(getRawType()) || isEnum() + || CharSequence.class.isAssignableFrom(getRawType()) + || Character.class.equals(getRawType()) // has a valueOf(char), not valueOf(String) + || java.util.Date.class.equals(getRawType()) || scalarConstructor().isPresent(); } @@ -143,15 +142,12 @@ public class TypeInfo { } public Optional<ConstructionInfo> scalarConstructor() { - return Stream.of(getRawType().getMethods()).filter(this::isStaticStringConstructor) + return Stream.of(getRawType().getMethods()) + .filter(this::isStaticStringConstructor) .findFirst() .map(ConstructionInfo::new); } - private boolean hasOneStringParameter(Executable executable) { - return executable.getParameterCount() == 1 && CharSequence.class.isAssignableFrom(executable.getParameterTypes()[0]); - } - private boolean isStaticStringConstructor(Method method) { return isStaticConstructorMethodNamed(method, "of") || isStaticConstructorMethodNamed(method, "valueOf") @@ -165,6 +161,18 @@ public class TypeInfo { && hasOneStringParameter(method); } + private boolean hasOneStringParameter(Executable executable) { + return executable.getParameterCount() == 1 && CharSequence.class.isAssignableFrom(executable.getParameterTypes()[0]); + } + + public String stringValue(Object value) { + if (java.util.Date.class.equals(getRawType())) + return ((java.util.Date) value).toInstant().toString(); + return value.toString() + .replace("\\"", "\\\\\\"") + .replace("\\n", "\\\\n"); + } + public Object newInstance() { try { Constructor<?> noArgsConstructor = getDeclaredConstructor(getRawType()); @@ -180,8 +188,7 @@ public class TypeInfo { return type.getDeclaredConstructor(); } try { - return AccessController - .doPrivileged((PrivilegedExceptionAction<Constructor<?>>) () -> type.getDeclaredConstructor()); + return AccessController.doPrivileged((PrivilegedExceptionAction<Constructor<?>>) type::getDeclaredConstructor); } catch (PrivilegedActionException pae) { if (pae.getCause() instanceof NoSuchMethodException) { throw (NoSuchMethodException) pae.getCause(); @@ -229,28 +236,22 @@ public class TypeInfo { throw new GraphQlClientException("unsupported reflection type " + type.getClass()); } - public <A extends Annotation> Stream<A> getAnnotations(Class<A> type) { - return Stream.of(((Class<?>) this.type).getAnnotationsByType(type)); + public Optional<MethodInfo> getMethod(String name, Class<?>... args) { + return getDeclaredMethod((Class<?>) this.type, name, args) + .map(MethodInfo::of); } - public Optional<MethodInfo> getMethod(String name) { + private Optional<Method> getDeclaredMethod(Class<?> type, String name, Class<?>... args) { try { - return Optional.of(MethodInfo.of(getDeclaredMethod((Class<?>) this.type, name))); + if (System.getSecurityManager() == null) + return Optional.of(type.getDeclaredMethod(name, args)); + return Optional.of(AccessController + .doPrivileged((PrivilegedExceptionAction<Method>) () -> type.getDeclaredMethod(name, args))); } catch (NoSuchMethodException e) { return Optional.empty(); - } - } - - private Method getDeclaredMethod(Class<?> type, String name) throws NoSuchMethodException { - if (System.getSecurityManager() == null) { - return type.getDeclaredMethod(name); - } - try { - return AccessController.doPrivileged((PrivilegedExceptionAction<Method>) () -> type.getDeclaredMethod(name)); } catch (PrivilegedActionException pae) { - if (pae.getCause() instanceof NoSuchMethodException) { - throw (NoSuchMethodException) pae.getCause(); - } + if (pae.getCause() instanceof NoSuchMethodException) + return Optional.empty(); throw new RuntimeException(pae.getCause()); } } diff --git a/client/implementation/src/test/java/test/unit/ScalarBehavior.java b/client/implementation/src/test/java/test/unit/ScalarBehavior.java index 887adfe6..790ba3a9 100644 --- a/client/implementation/src/test/java/test/unit/ScalarBehavior.java +++ b/client/implementation/src/test/java/test/unit/ScalarBehavior.java @@ -6,7 +6,9 @@ import static org.assertj.core.api.BDDAssertions.then; import java.math.BigDecimal; import java.math.BigInteger; +import java.time.Instant; import java.time.LocalDate; +import java.util.Date; import javax.ws.rs.core.Response; @@ -845,4 +847,22 @@ class ScalarBehavior { then(fixture.query()).isEqualTo("getting"); then(value).isEqualTo("foo"); } + + @GraphQlClientApi + interface DateApi { + Date foo(Date date); + } + + @Test + void shouldCallDateQuery() { + Instant in = Instant.ofEpochMilli(123456789); + Instant out = Instant.ofEpochMilli(987654321); + fixture.returnsData("'foo':'" + out + "'"); + DateApi api = fixture.builder().build(DateApi.class); + + Date value = api.foo(Date.from(in)); + + then(fixture.query()).isEqualTo("foo(date: '" + in + "')"); + then(value).isEqualTo(Date.from(out)); + } }

['client/implementation/src/test/java/test/unit/ScalarBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java']

{'.java': 6}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/388/387

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/387

https://github.com/smallrye/smallrye-graphql/pull/388

https://github.com/smallrye/smallrye-graphql/pull/388

fix

NPE: some validation errors don't provide a query path

Some validation errors don't provide a query path, e.g. `LoneAnonymousOperation`. This results in a NPE in the call to `toJsonArray` in line 75 of the `ExecutionErrorsService`. Would it be better to provide an empty path or null?

8d00415f83912e5c5b222c90b298ec0e585ed8dd

c47f2ba2398ab9e8889b06d28d1c4d0f55cfc70f

https://github.com/smallrye/smallrye-graphql/compare/8d00415f83912e5c5b222c90b298ec0e585ed8dd...c47f2ba2398ab9e8889b06d28d1c4d0f55cfc70f

diff --git a/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java b/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java index a0df1b7f..372a08cf 100644 --- a/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java +++ b/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java @@ -117,9 +117,11 @@ public class ExecutionErrorsService { private JsonArray toJsonArray(List<?> list) { JsonArrayBuilder arrayBuilder = jsonBuilderFactory.createArrayBuilder(); - for (Object o : list) { - if (o != null) - arrayBuilder.add(o.toString()); + if (list != null && !list.isEmpty()) { + for (Object o : list) { + if (o != null) + arrayBuilder.add(o.toString()); + } } return arrayBuilder.build(); }

['server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java']

{'.java': 1}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/659/654

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/654

https://github.com/smallrye/smallrye-graphql/pull/659

https://github.com/smallrye/smallrye-graphql/pull/659

fix

Issue with GraphQLClientApi Mutation

I have a simple GraphQL server and a Kotlin client as follows: ``` @ApplicationScoped class PeopleService( @ConfigProperty(name = "people.graphql.url") private val peopleApiUrl: String ) { var peopleApi: PeopleApi = GraphQlClientBuilder.newBuilder() .endpoint(peopleApiUrl) .build(PeopleApi::class.java) fun getPerson(ssn: String): Person = peopleApi.person(ssn) fun createPerson(person: PeopleApi.PersonData): PeopleApi.PersonData = peopleApi.createPerson(person) } @GraphQlClientApi interface PeopleApi { @Query fun person( @Name("id") id: String, ): Person @Mutation(value = "createPerson") fun createPerson( @Name("personDetails") personDetails: PersonData ): PersonData @Input data class PersonData( var firstNames: String, var lastName: String, ) } ``` The server works when using the graphql-ui with the mutation: ``` mutation addKalle { createPerson(personDetails: { firstNames: "Kalervo", lastName: "Jankko" }) { firstNames lastName } } ``` But my Kotlin client does not send the same mutation. This is what comes to the server log: ``` 2021-02-24 20:12:36,859 DEBUG [not.gra.GraphQL] (vert.x-worker-thread-15) Executing request. operation name: 'createPerson'. query: 'mutation createPerson($personDetails: ) { createPerson(personDetails: $personDetails) {firstNames lastName} }'. variables '{personDetails={lastName=Jankko, firstNames=Kalervo}}' 2021-02-24 20:12:36,859 DEBUG [not.gra.GraphQL] (vert.x-worker-thread-15) Parsing query: 'mutation createPerson($personDetails: ) { createPerson(personDetails: $personDetails) {firstNames lastName} }'... 2021-02-24 20:12:36,860 WARN [not.gra.GraphQL] (vert.x-worker-thread-15) Query failed to parse : 'mutation createPerson($personDetails: ) { createPerson(personDetails: $personDetails) {firstNames lastName} }' ``` Why the name createPerson is there twice? When debugging the client I also noticed that in io.smallrye.graphql.client.typesafe.impl.QueryBuilder ``` private String declare(ParameterInfo parameter) { return "$" + parameter.getName() + ": " + parameter.graphQlInputTypeName(); } ``` graphQlInputTypeName is an empty string.. The query of my Kotlin client works fine against the server. How to make the mutation work?

fba8ff73cef0f6e559cbed2f45f21be257a11f4a

6e6400a41da883d6cb589e6895d44b9b4dedc0b7

https://github.com/smallrye/smallrye-graphql/compare/fba8ff73cef0f6e559cbed2f45f21be257a11f4a...6e6400a41da883d6cb589e6895d44b9b4dedc0b7

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java index 33c705a2..6c3715bc 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java @@ -44,8 +44,12 @@ public class ParameterInfo { } private String graphQlInputTypeName(TypeInfo type) { - if (type.isAnnotated(Input.class)) - return type.getAnnotation(Input.class).value(); + if (type.isAnnotated(Input.class)) { + String value = type.getAnnotation(Input.class).value(); + if (!value.isEmpty()) { + return value; + } + } if (type.isAnnotated(Name.class)) return type.getAnnotation(Name.class).value(); switch (type.getSimpleName()) { diff --git a/client/implementation/src/test/java/test/unit/ParametersBehavior.java b/client/implementation/src/test/java/test/unit/ParametersBehavior.java index 3384ead7..9d65da18 100644 --- a/client/implementation/src/test/java/test/unit/ParametersBehavior.java +++ b/client/implementation/src/test/java/test/unit/ParametersBehavior.java @@ -202,6 +202,39 @@ class ParametersBehavior { then(greeting.count).isEqualTo(3); } + @GraphQlClientApi + interface EmptyInputObjectParamApi { + EmptyInputGreeting say(EmptyInputGreeting greet); + } + + @Input + private static class EmptyInputGreeting { + String text; + int count; + + @SuppressWarnings("unused") + EmptyInputGreeting() { + } + + EmptyInputGreeting(String text, int count) { + this.text = text; + this.count = count; + } + } + + @Test + void shouldCallEmptyInputObjectParamQuery() { + fixture.returnsData("'say':{'text':'ho','count':3}"); + EmptyInputObjectParamApi api = fixture.build(EmptyInputObjectParamApi.class); + + EmptyInputGreeting greeting = api.say(new EmptyInputGreeting("hi", 5)); + + then(fixture.query()).isEqualTo("query say($greet: EmptyInputGreetingInput) { say(greet: $greet) {text count} }"); + then(fixture.variables()).isEqualTo("{'greet':{'text':'hi','count':5}}"); + then(greeting.text).isEqualTo("ho"); + then(greeting.count).isEqualTo(3); + } + @GraphQlClientApi interface NamedTypeObjectParamApi { NamedTypeGreeting say(NamedTypeGreeting greet);

['client/implementation/src/test/java/test/unit/ParametersBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java']

{'.java': 2}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/1103/1102

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/1102

https://github.com/smallrye/smallrye-graphql/pull/1103

https://github.com/smallrye/smallrye-graphql/pull/1103

fixes

Maven plugin does not work if implementation-cdi module is in the classpath

Because in that case, it picks up the `io.smallrye.graphql.cdi.CdiLookupService` and tries to use that for injection validation (the `Bootstrap` class validates that all operation classes are beans), but it does not work because the CDI container is not properly initialized. We need to skip injection validation in the Maven plugin. Workaround: set `test.skip.injection.validation=true` as a system property when executing the plugin

c68ae4a0758e6bd5fe8064fd991141618303b23d

b3ebdc314b15824962f9b7f751a78824fb4087d7

https://github.com/smallrye/smallrye-graphql/compare/c68ae4a0758e6bd5fe8064fd991141618303b23d...b3ebdc314b15824962f9b7f751a78824fb4087d7

diff --git a/server/implementation-cdi/src/test/java/io/smallrye/graphql/execution/SchemaTest.java b/server/implementation-cdi/src/test/java/io/smallrye/graphql/execution/SchemaTest.java index 24a4b48c..8801722d 100644 --- a/server/implementation-cdi/src/test/java/io/smallrye/graphql/execution/SchemaTest.java +++ b/server/implementation-cdi/src/test/java/io/smallrye/graphql/execution/SchemaTest.java @@ -9,7 +9,6 @@ import java.util.Scanner; import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,22 +29,14 @@ public class SchemaTest { @BeforeEach public void init() { - // in a unit test we don't have injection available, this is a hack needed to tell the Bootstrap class - // that it should not verify injection availability - System.setProperty("test.skip.injection.validation", "true"); IndexView index = Indexer.getTCKIndex(); this.schema = SchemaBuilder.build(index); assertNotNull(schema); } - @AfterEach - public void skipInjectionValidationCleanup() { - System.clearProperty("test.skip.injection.validation"); - } - @Test public void testSchemaModelCreation() { - GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema); + GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema, false, true); assertNotNull(graphQLSchema); String schemaString = new SchemaPrinter().print(graphQLSchema); assertNotNull(schemaString); diff --git a/server/implementation/src/main/java/io/smallrye/graphql/bootstrap/Bootstrap.java b/server/implementation/src/main/java/io/smallrye/graphql/bootstrap/Bootstrap.java index b73fe0b9..565e8e6f 100644 --- a/server/implementation/src/main/java/io/smallrye/graphql/bootstrap/Bootstrap.java +++ b/server/implementation/src/main/java/io/smallrye/graphql/bootstrap/Bootstrap.java @@ -99,12 +99,16 @@ public class Bootstrap { private final ClassloadingService classloadingService = ClassloadingService.get(); public static GraphQLSchema bootstrap(Schema schema) { - return bootstrap(schema, false); + return bootstrap(schema, false, false); } public static GraphQLSchema bootstrap(Schema schema, boolean allowMultipleDeployments) { + return bootstrap(schema, allowMultipleDeployments, false); + } + + public static GraphQLSchema bootstrap(Schema schema, boolean allowMultipleDeployments, boolean skipInjectionValidation) { if (schema != null && (schema.hasOperations())) { - Bootstrap bootstrap = new Bootstrap(schema, allowMultipleDeployments); + Bootstrap bootstrap = new Bootstrap(schema, allowMultipleDeployments, skipInjectionValidation); bootstrap.generateGraphQLSchema(); return bootstrap.graphQLSchema; } else { @@ -113,10 +117,12 @@ public class Bootstrap { } } - private Bootstrap(Schema schema, boolean allowMultipleDeployments) { + private Bootstrap(Schema schema, boolean allowMultipleDeployments, boolean skipInjectionValidation) { this.schema = schema; SmallRyeContext.setSchema(schema, allowMultipleDeployments); - if (!Boolean.getBoolean("test.skip.injection.validation")) { + // setting `skipInjectionValidation` through a system property is not recommended, + // but kept for backward compatibility for now + if (!Boolean.getBoolean("test.skip.injection.validation") && !skipInjectionValidation) { verifyInjectionIsAvailable(); } } diff --git a/server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java b/server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java index 0514d320..40308cfd 100644 --- a/server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java +++ b/server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java @@ -13,8 +13,6 @@ import java.util.stream.Stream; import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; import org.jboss.logging.Logger; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import graphql.schema.GraphQLArgument; @@ -30,25 +28,13 @@ import io.smallrye.graphql.schema.model.Schema; class SchemaTest { private static final Logger LOG = Logger.getLogger(SchemaTest.class.getName()); - @BeforeEach - public void skipInjectionValidation() { - // in a unit test we don't have injection available, this is a hack needed to tell the Bootstrap class - // that it should not verify injection availability - System.setProperty("test.skip.injection.validation", "true"); - } - - @AfterEach - public void skipInjectionValidationCleanup() { - System.clearProperty("test.skip.injection.validation"); - } - @Test void testSchemaWithDirectives() { Schema schema = SchemaBuilder .build(scan(Directive.class, IntArrayTestDirective.class, FieldDirective.class, TestTypeWithDirectives.class, DirectivesTestApi.class)); assertNotNull(schema); - GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema); + GraphQLSchema graphQLSchema = Bootstrap.bootstrap(schema, false, true); assertNotNull(graphQLSchema); GraphQLDirective typeDirective = graphQLSchema.getDirective("intArrayTestDirective"); diff --git a/tools/gradle-plugin/plugin/src/main/java/io/smallrye/graphql/gradle/tasks/GenerateSchemaTask.java b/tools/gradle-plugin/plugin/src/main/java/io/smallrye/graphql/gradle/tasks/GenerateSchemaTask.java index 3aac2b7a..26db9898 100644 --- a/tools/gradle-plugin/plugin/src/main/java/io/smallrye/graphql/gradle/tasks/GenerateSchemaTask.java +++ b/tools/gradle-plugin/plugin/src/main/java/io/smallrye/graphql/gradle/tasks/GenerateSchemaTask.java @@ -179,7 +179,6 @@ public class GenerateSchemaTask extends DefaultTask { @TaskAction public void generateSchema() throws Exception { this.config = new GradleConfig(includeScalars, includeDirectives, includeSchemaDefinition, includeIntrospectionTypes); - System.setProperty("test.skip.injection.validation", "true"); ClassLoader classLoader = getClassLoader(); Thread.currentThread().setContextClassLoader(classLoader); IndexView index = createIndex(); @@ -242,7 +241,7 @@ public class GenerateSchemaTask extends DefaultTask { private String generateSchema(IndexView index) { Schema internalSchema = SchemaBuilder.build(index); - GraphQLSchema graphQLSchema = Bootstrap.bootstrap(internalSchema); + GraphQLSchema graphQLSchema = Bootstrap.bootstrap(internalSchema, false, true); if(graphQLSchema!=null){ return new SchemaPrinter().print(graphQLSchema); } diff --git a/tools/maven-plugin/src/main/java/io/smallrye/graphql/mavenplugin/GenerateSchemaMojo.java b/tools/maven-plugin/src/main/java/io/smallrye/graphql/mavenplugin/GenerateSchemaMojo.java index 1337a2bf..f838a851 100644 --- a/tools/maven-plugin/src/main/java/io/smallrye/graphql/mavenplugin/GenerateSchemaMojo.java +++ b/tools/maven-plugin/src/main/java/io/smallrye/graphql/mavenplugin/GenerateSchemaMojo.java @@ -172,7 +172,7 @@ public class GenerateSchemaMojo extends AbstractMojo { private String generateSchema(IndexView index) { Schema internalSchema = SchemaBuilder.build(index, mavenConfig.typeAutoNameStrategy); - GraphQLSchema graphQLSchema = Bootstrap.bootstrap(internalSchema); + GraphQLSchema graphQLSchema = Bootstrap.bootstrap(internalSchema, false, true); if (graphQLSchema != null) { return new SchemaPrinter().print(graphQLSchema); }

['tools/maven-plugin/src/main/java/io/smallrye/graphql/mavenplugin/GenerateSchemaMojo.java', 'tools/gradle-plugin/plugin/src/main/java/io/smallrye/graphql/gradle/tasks/GenerateSchemaTask.java', 'server/implementation/src/test/java/io/smallrye/graphql/schema/SchemaTest.java', 'server/implementation/src/main/java/io/smallrye/graphql/bootstrap/Bootstrap.java', 'server/implementation-cdi/src/test/java/io/smallrye/graphql/execution/SchemaTest.java']

{'.java': 5}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/453/444

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/444

https://github.com/smallrye/smallrye-graphql/pull/453

https://github.com/smallrye/smallrye-graphql/pull/453

fix

Non-Ascii-Characters sent to server

When we send a non-ASCII character to the GraphQL server, the encoding is being mixed up. I've looked at the TCK and tried to add a `ö` to the `ScalarTestApi` string `123456789`, but when I add it to the `output.json` it doesn't accept the json.

276b731a32e67ab53a14ae4256065f95941a0cc5

cbcd9313009bf69ab4b33daed475e8d2f13c5c86

https://github.com/smallrye/smallrye-graphql/compare/276b731a32e67ab53a14ae4256065f95941a0cc5...cbcd9313009bf69ab4b33daed475e8d2f13c5c86

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java index df002a75..384b73b0 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java @@ -2,6 +2,7 @@ package io.smallrye.graphql.client.typesafe.impl; import static java.util.stream.Collectors.joining; import static javax.json.JsonValue.ValueType.ARRAY; +import static javax.ws.rs.client.Entity.entity; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; @@ -14,8 +15,8 @@ import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonReaderFactory; import javax.json.JsonValue; -import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.StatusType; @@ -31,6 +32,7 @@ import io.smallrye.graphql.client.typesafe.impl.reflection.TypeInfo; class GraphQlClientProxy { private static final Logger log = LoggerFactory.getLogger(GraphQlClientProxy.class); + private static final MediaType APPLICATION_JSON_UTF8 = APPLICATION_JSON_TYPE.withCharset("utf-8"); private static final JsonBuilderFactory jsonObjectFactory = Json.createBuilderFactory(null); private static final JsonReaderFactory jsonReaderFactory = Json.createReaderFactory(null); @@ -104,9 +106,9 @@ class GraphQlClientProxy { private String post(String request, MultivaluedMap<String, Object> headers) { Response response = target - .request(APPLICATION_JSON_TYPE) + .request(APPLICATION_JSON_UTF8) .headers(headers) - .post(Entity.json(request)); + .post(entity(request, APPLICATION_JSON_UTF8)); StatusType status = response.getStatusInfo(); if (status.getFamily() != SUCCESSFUL) throw new GraphQlClientException("expected successful status code but got " + diff --git a/client/implementation/src/test/java/test/unit/GraphQlClientFixture.java b/client/implementation/src/test/java/test/unit/GraphQlClientFixture.java index 434cb81f..26544db1 100644 --- a/client/implementation/src/test/java/test/unit/GraphQlClientFixture.java +++ b/client/implementation/src/test/java/test/unit/GraphQlClientFixture.java @@ -1,6 +1,5 @@ package test.unit; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static org.assertj.core.api.BDDAssertions.then; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; @@ -15,6 +14,7 @@ import javax.ws.rs.client.Client; import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation; import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; @@ -27,14 +27,14 @@ import io.smallrye.graphql.client.typesafe.impl.GraphQlClientBuilderImpl; class GraphQlClientFixture { private final Client mockClient = mock(Client.class); + private final WebTarget mockWebTarget = mock(WebTarget.class); private final Invocation.Builder mockInvocationBuilder = mock(Invocation.Builder.class); private Response response; + private Entity<String> entitySent; GraphQlClientFixture() { - WebTarget mockWebTarget = mock(WebTarget.class); - given(mockClient.target(any(URI.class))).willReturn(mockWebTarget); - given(mockWebTarget.request(APPLICATION_JSON_TYPE)).willReturn(mockInvocationBuilder); + given(mockWebTarget.request(any(MediaType.class))).willReturn(mockInvocationBuilder); given(mockInvocationBuilder.headers(any())).willReturn(mockInvocationBuilder); given(mockInvocationBuilder.post(any())).will(i -> response); } @@ -66,18 +66,21 @@ class GraphQlClientFixture { } String rawQuery() { - return queryBody(captureRequestEntity(), "query"); + return queryBody(entitySent().getEntity(), "query"); } String mutation() { - return queryBody(captureRequestEntity(), "mutation").replace('\\"', '\\''); + return queryBody(entitySent().getEntity(), "mutation").replace('\\"', '\\''); } - private String captureRequestEntity() { - @SuppressWarnings("unchecked") - ArgumentCaptor<Entity<String>> captor = ArgumentCaptor.forClass(Entity.class); - BDDMockito.then(mockInvocationBuilder).should().post(captor.capture()); - return captor.getValue().getEntity(); + private Entity<String> entitySent() { + if (entitySent == null) { + @SuppressWarnings("unchecked") + ArgumentCaptor<Entity<String>> captor = ArgumentCaptor.forClass(Entity.class); + BDDMockito.then(mockInvocationBuilder).should().post(captor.capture()); + entitySent = captor.getValue(); + } + return entitySent; } private String queryBody(String response, String operation) { @@ -100,10 +103,23 @@ class GraphQlClientFixture { } MultivaluedMap<String, Object> sentHeaders() { + MultivaluedMap<String, Object> map = captureExplicitHeaders(); + map.putSingle("Accept", captureAcceptHeader()); + map.putSingle("Content-Type", entitySent().getMediaType()); + return map; + } + + private MultivaluedMap<String, Object> captureExplicitHeaders() { @SuppressWarnings("unchecked") ArgumentCaptor<MultivaluedMap<String, Object>> captor = ArgumentCaptor.forClass(MultivaluedMap.class); BDDMockito.then(mockInvocationBuilder).should().headers(captor.capture()); MultivaluedMap<String, Object> map = captor.getValue(); return (map == null) ? new MultivaluedHashMap<>() : map; } + + private MediaType captureAcceptHeader() { + ArgumentCaptor<MediaType> captor = ArgumentCaptor.forClass(MediaType.class); + BDDMockito.then(mockWebTarget).should().request(captor.capture()); + return captor.getValue(); + } } diff --git a/client/implementation/src/test/java/test/unit/HeaderBehavior.java b/client/implementation/src/test/java/test/unit/HeaderBehavior.java index be8da39e..2dc58d75 100644 --- a/client/implementation/src/test/java/test/unit/HeaderBehavior.java +++ b/client/implementation/src/test/java/test/unit/HeaderBehavior.java @@ -561,4 +561,21 @@ public class HeaderBehavior { then(fixture.sentHeader("H5")).isEqualTo("V5"); then(fixture.sentHeader("overwrite")).isEqualTo("sub"); } + + @GraphQlClientApi + interface SimpleApi { + String greeting(String target); + } + + @Test + public void shouldAddCharsetRequestAndResponseHeaders() { + fixture.returnsData("'greeting':'dummy-greeting'"); + SimpleApi api = fixture.builder().build(SimpleApi.class); + + api.greeting("foo"); + + then(fixture.query()).isEqualTo("greeting(target: 'foo')"); + then(fixture.sentHeader("Content-Type")).hasToString("application/json;charset=utf-8"); + then(fixture.sentHeader("Accept")).hasToString("application/json;charset=utf-8"); + } }

['client/implementation/src/test/java/test/unit/HeaderBehavior.java', 'client/implementation/src/test/java/test/unit/GraphQlClientFixture.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java']

{'.java': 3}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/451/450

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/450

https://github.com/smallrye/smallrye-graphql/pull/451

https://github.com/smallrye/smallrye-graphql/pull/451

fix

ClassCastException with Set as parameter

Hello, as already discussed with @t1, there is an issue with GraphQl client. We try to create a GraphQl mutation (GraphQl version 1.0.11) which receives a Set as parameter. `void add(Set<AnyObjectType> values);` It seems the RequestBuilder#buildParam() method should not use the specific List type but a more general Collection type? This leads to the following stack: ``` java.lang.ClassCastException: class java.util.ImmutableCollections$SetN cannot be cast to class java.util.List (java.util.ImmutableCollections$SetN and java.util.List are in module java.base of loader 'bootstrap') at io.smallrye.graphql.client.typesafe.impl.RequestBuilder.buildParam(RequestBuilder.java:48) at io.smallrye.graphql.client.typesafe.impl.RequestBuilder.appendParam(RequestBuilder.java:39) at io.smallrye.graphql.client.typesafe.impl.RequestBuilder.build(RequestBuilder.java:30) at io.smallrye.graphql.client.typesafe.impl.GraphQlClientProxy.request(GraphQlClientProxy.java:60) at io.smallrye.graphql.client.typesafe.impl.GraphQlClientProxy.invoke(GraphQlClientProxy.java:46) at io.smallrye.graphql.client.typesafe.impl.GraphQlClientBuilderImpl.lambda$build$0(GraphQlClientBuilderImpl.java:47) at test.integration.customer.$Proxy26.addMarketingPermissions(Unknown Source) at test.integration.customer.GraphQlCustomerAT$WhenMarketingPermissions.shouldAddPermissionsForAuthorizedUser(GraphQlCustomerAT.java:117) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:688) at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:60) at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:131) at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:149) at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:140) at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:84) at org.junit.jupiter.engine.execution.ExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(ExecutableInvoker.java:115) at org.junit.jupiter.engine.execution.ExecutableInvoker.lambda$invoke$0(ExecutableInvoker.java:105) at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:106) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:64) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:45) at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:37) at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:104) at org.junit.jupiter.engine.execution.ExecutableInvoker.invoke(ExecutableInvoker.java:98) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$6(TestMethodTestDescriptor.java:210) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:206) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:131) at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:65) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:139) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:129) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:127) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:126) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:84) at java.base/java.util.ArrayList.forEach(ArrayList.java:1541) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:143) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:129) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:127) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:126) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:84) at java.base/java.util.ArrayList.forEach(ArrayList.java:1541) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:143) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:129) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:127) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:126) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:84) at java.base/java.util.ArrayList.forEach(ArrayList.java:1541) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:38) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$5(NodeTestTask.java:143) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$7(NodeTestTask.java:129) at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:137) at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$8(NodeTestTask.java:127) at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:73) at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:126) at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:84) at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:32) at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:57) at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:51) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:108) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:88) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:54) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:67) at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:52) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:96) at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:75) at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:69) at com.intellij.rt.execution.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:47) at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:242) at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:70) ```

5d752a165bd2199c00637accba67cb4c2e85e9ce

7a864830c7abbe2fff5c7192d32584eafb9073e3

https://github.com/smallrye/smallrye-graphql/compare/5d752a165bd2199c00637accba67cb4c2e85e9ce...7a864830c7abbe2fff5c7192d32584eafb9073e3

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java index bdbfe1cf..df002a75 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java @@ -1,6 +1,7 @@ package io.smallrye.graphql.client.typesafe.impl; import static java.util.stream.Collectors.joining; +import static javax.json.JsonValue.ValueType.ARRAY; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; @@ -8,7 +9,6 @@ import java.io.StringReader; import java.util.Stack; import javax.json.Json; -import javax.json.JsonArray; import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -123,13 +123,15 @@ class GraphQlClientProxy { private JsonObject readResponse(String request, String response) { JsonObject responseJson = jsonReaderFactory.createReader(new StringReader(response)).readObject(); - if (responseJson.containsKey("errors") && !isEmpty(responseJson.getJsonArray("errors"))) + if (hasErrors(responseJson)) throw new GraphQlClientException("errors from service: " + responseJson.getJsonArray("errors") + ":\\n " + request); return responseJson; } - private boolean isEmpty(JsonArray array) { - return array == null || array.isEmpty(); + private boolean hasErrors(JsonObject responseJson) { + return responseJson.containsKey("errors") + && responseJson.get("errors").getValueType() == ARRAY + && !responseJson.getJsonArray("errors").isEmpty(); } private JsonValue getData(MethodInfo method, JsonObject responseJson) { diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java index 4b01beee..338a8732 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java @@ -2,6 +2,9 @@ package io.smallrye.graphql.client.typesafe.impl; import static java.util.stream.Collectors.toList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import io.smallrye.graphql.client.typesafe.api.Header; @@ -45,11 +48,19 @@ class RequestBuilder { else if (type.isScalar()) buildScalarParam(type, value); else if (type.isCollection()) - buildArrayParam(type.getItemType(), (List<?>) value); + buildArrayParam(type.getItemType(), asList(value)); else buildObjectParam(type, value); } + private List<?> asList(Object value) { + if (value instanceof List) + return (List<?>) value; + if (value.getClass().isArray()) + return Arrays.asList((Object[]) value); + return new ArrayList<>((Collection<?>) value); + } + private void buildScalarParam(TypeInfo type, Object value) { boolean quoted = !unquoted(type); if (quoted) diff --git a/client/implementation/src/test/java/test/unit/ParametersBehavior.java b/client/implementation/src/test/java/test/unit/ParametersBehavior.java index 5035171b..e5047772 100644 --- a/client/implementation/src/test/java/test/unit/ParametersBehavior.java +++ b/client/implementation/src/test/java/test/unit/ParametersBehavior.java @@ -3,8 +3,13 @@ package test.unit; import static java.util.Arrays.asList; import static org.assertj.core.api.BDDAssertions.then; +import java.util.ArrayDeque; +import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Objects; +import java.util.Queue; +import java.util.Set; import org.junit.jupiter.api.Test; @@ -135,7 +140,7 @@ public class ParametersBehavior { @GraphQlClientApi interface ArrayParamApi { - boolean greetings(List<String> greets); + boolean greetings(String[] greets); } @Test @@ -143,6 +148,70 @@ public class ParametersBehavior { fixture.returnsData("'greetings':true"); ArrayParamApi api = fixture.builder().build(ArrayParamApi.class); + boolean success = api.greetings(new String[] { "hi", "ho" }); + + then(fixture.query()).isEqualTo("greetings(greets: ['hi', 'ho'])"); + then(success).isTrue(); + } + + @GraphQlClientApi + interface ListParamApi { + boolean greetings(List<String> greets); + } + + @Test + public void shouldCallListParamQuery() { + fixture.returnsData("'greetings':true"); + ListParamApi api = fixture.builder().build(ListParamApi.class); + + boolean success = api.greetings(asList("hi", "ho")); + + then(fixture.query()).isEqualTo("greetings(greets: ['hi', 'ho'])"); + then(success).isTrue(); + } + + @GraphQlClientApi + interface SetParamApi { + boolean greetings(Set<String> greets); + } + + @Test + public void shouldCallSetParamQuery() { + fixture.returnsData("'greetings':true"); + SetParamApi api = fixture.builder().build(SetParamApi.class); + + boolean success = api.greetings(new HashSet<>(asList("hi", "ho"))); + + then(fixture.query()).isEqualTo("greetings(greets: ['hi', 'ho'])"); + then(success).isTrue(); + } + + @GraphQlClientApi + interface QueueParamApi { + boolean greetings(Queue<String> greets); + } + + @Test + public void shouldCallQueueParamQuery() { + fixture.returnsData("'greetings':true"); + QueueParamApi api = fixture.builder().build(QueueParamApi.class); + + boolean success = api.greetings(new ArrayDeque<>(asList("hi", "ho"))); + + then(fixture.query()).isEqualTo("greetings(greets: ['hi', 'ho'])"); + then(success).isTrue(); + } + + @GraphQlClientApi + interface CollectionParamApi { + boolean greetings(Collection<String> greets); + } + + @Test + public void shouldCallCollectionParamQuery() { + fixture.returnsData("'greetings':true"); + CollectionParamApi api = fixture.builder().build(CollectionParamApi.class); + boolean success = api.greetings(asList("hi", "ho")); then(fixture.query()).isEqualTo("greetings(greets: ['hi', 'ho'])"); @@ -150,14 +219,14 @@ public class ParametersBehavior { } @GraphQlClientApi - interface ObjectArrayParamApi { + interface ObjectListParamApi { boolean greetings(List<Greeting> greets); } @Test - public void shouldCallObjectArrayParamQuery() { + public void shouldCallObjectListParamQuery() { fixture.returnsData("'greetings':true"); - ObjectArrayParamApi api = fixture.builder().build(ObjectArrayParamApi.class); + ObjectListParamApi api = fixture.builder().build(ObjectListParamApi.class); boolean success = api.greetings(asList(new Greeting("hi", 5), new Greeting("ho", 3))); @@ -166,26 +235,26 @@ public class ParametersBehavior { } @GraphQlClientApi - interface ArrayObjectParamApi { - boolean foo(ArrayObject bar); + interface ListObjectParamApi { + boolean foo(ListObject bar); } - private static class ArrayObject { + private static class ListObject { List<String> texts; int count; - ArrayObject(List<String> texts, int count) { + ListObject(List<String> texts, int count) { this.texts = texts; this.count = count; } } @Test - public void shouldCallArrayObjectParamQuery() { + public void shouldCallListObjectParamQuery() { fixture.returnsData("'foo':true"); - ArrayObjectParamApi api = fixture.builder().build(ArrayObjectParamApi.class); + ListObjectParamApi api = fixture.builder().build(ListObjectParamApi.class); - boolean success = api.foo(new ArrayObject(asList("hi", "ho"), 3)); + boolean success = api.foo(new ListObject(asList("hi", "ho"), 3)); then(fixture.query()).isEqualTo("foo(bar: {texts: ['hi', 'ho'], count: 3})"); then(success).isTrue();

['client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java', 'client/implementation/src/test/java/test/unit/ParametersBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java']

{'.java': 3}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/395/394

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/394

https://github.com/smallrye/smallrye-graphql/pull/395

https://github.com/smallrye/smallrye-graphql/pull/395

fix

Typesafe Client: send Booleans not as String

E.g. mutations containing a `Boolean` non-primitive results in a String `true` or `false` but not in the proper literals.

9b81d85734bf837fbeaeb9361034176f887e0920

38acf28b7373c3ce0a68acbc137178d181fcfaa2

https://github.com/smallrye/smallrye-graphql/compare/9b81d85734bf837fbeaeb9361034176f887e0920...38acf28b7373c3ce0a68acbc137178d181fcfaa2

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java index 3b6b5efb..4b01beee 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java @@ -61,6 +61,7 @@ class RequestBuilder { public boolean unquoted(TypeInfo type) { return type.isPrimitive() + || Boolean.class.isAssignableFrom(type.getRawType()) || Number.class.isAssignableFrom(type.getRawType()) || type.isEnum(); } diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java index b9cc7915..127e7247 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java @@ -126,6 +126,7 @@ public class TypeInfo { public boolean isScalar() { return isPrimitive() || Number.class.isAssignableFrom(getRawType()) + || Boolean.class.isAssignableFrom(getRawType()) || isEnum() || CharSequence.class.isAssignableFrom(getRawType()) || Character.class.equals(getRawType()) // has a valueOf(char), not valueOf(String) diff --git a/client/implementation/src/test/java/test/unit/MutationBehavior.java b/client/implementation/src/test/java/test/unit/MutationBehavior.java index 026cd11c..532da821 100644 --- a/client/implementation/src/test/java/test/unit/MutationBehavior.java +++ b/client/implementation/src/test/java/test/unit/MutationBehavior.java @@ -239,4 +239,106 @@ public class MutationBehavior { then(fixture.mutation()).isEqualTo("say(greeting: {text: 'one', someEnum: ONE}) {text count}"); then(greeting).isEqualTo(new Greeting("ho", 3)); } + + private static class PrimitiveTypesClass { + boolean b = true; + char c = 'a'; + byte y = 0x7; + short s = 0xff; + int i = 123456; + long l = 987654321L; + float f = 12.34f; + double d = 56.78d; + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + PrimitiveTypesClass that = (PrimitiveTypesClass) o; + return this.b == that.b + && this.c == that.c + && this.y == that.y + && this.s == that.s + && this.i == that.i + && this.l == that.l + && this.f == that.f + && this.d == that.d; + } + + @Override + public int hashCode() { + return Objects.hash(b, c, y, s, i, l, f, d); + } + } + + @GraphQlClientApi + interface MutationWithPrimitivesApi { + @Mutation + String run(PrimitiveTypesClass primitives); + } + + @Test + public void shouldCallMutationWithPrimitives() { + fixture.returnsData("'run':'okay'"); + MutationWithPrimitivesApi api = fixture.builder().build(MutationWithPrimitivesApi.class); + + String result = api.run(new PrimitiveTypesClass()); + + then(fixture.mutation()) + .isEqualTo("run(primitives: {b: true, c: a, y: 7, s: 255, i: 123456, l: 987654321, f: 12.34, d: 56.78})"); + then(result).isEqualTo("okay"); + } + + private static class PrimitiveWrapperTypesClass { + Boolean b = true; + Character c = 'a'; + Byte y = 0x7; + Short s = 0xff; + Integer i = 123456; + Long l = 987654321L; + Float f = 12.34f; + Double d = 56.78d; + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + PrimitiveWrapperTypesClass that = (PrimitiveWrapperTypesClass) o; + return this.b.equals(that.b) + && this.c.equals(that.c) + && this.y.equals(that.y) + && this.s.equals(that.s) + && this.i.equals(that.i) + && this.l.equals(that.l) + && this.f.equals(that.f) + && this.d.equals(that.d); + } + + @Override + public int hashCode() { + return Objects.hash(b, c, y, s, i, l, f, d); + } + } + + @GraphQlClientApi + interface MutationWithPrimitiveWrappersApi { + @Mutation + String run(PrimitiveWrapperTypesClass primitives); + } + + @Test + public void shouldCallMutationWithPrimitiveWrappers() { + fixture.returnsData("'run':'okay'"); + MutationWithPrimitiveWrappersApi api = fixture.builder().build(MutationWithPrimitiveWrappersApi.class); + + String result = api.run(new PrimitiveWrapperTypesClass()); + + then(fixture.mutation()) + .isEqualTo("run(primitives: {b: true, c: 'a', y: 7, s: 255, i: 123456, l: 987654321, f: 12.34, d: 56.78})"); + then(result).isEqualTo("okay"); + } } diff --git a/client/implementation/src/test/java/test/unit/NestedBehavior.java b/client/implementation/src/test/java/test/unit/NestedBehavior.java index ef6867bd..e072d238 100644 --- a/client/implementation/src/test/java/test/unit/NestedBehavior.java +++ b/client/implementation/src/test/java/test/unit/NestedBehavior.java @@ -145,14 +145,16 @@ public class NestedBehavior { private static class Greeting { String text; int code; + Boolean successful; @SuppressWarnings("unused") Greeting() { } - Greeting(String text, int code) { + Greeting(String text, int code, Boolean successful) { this.text = text; this.code = code; + this.successful = successful; } @Override @@ -162,24 +164,24 @@ public class NestedBehavior { if (o == null || getClass() != o.getClass()) return false; Greeting greeting = (Greeting) o; - return code == greeting.code && text.equals(greeting.text); + return code == greeting.code && text.equals(greeting.text) && successful == greeting.successful; } @Override public int hashCode() { - return Objects.hash(text, code); + return Objects.hash(text, code, successful); } } @Test public void shouldCallObjectQuery() { - fixture.returnsData("'greeting':{'text':'foo','code':5}"); + fixture.returnsData("'greeting':{'text':'foo','code':5, 'successful':true}"); ObjectApi api = fixture.builder().build(ObjectApi.class); Greeting greeting = api.greeting(); - then(fixture.query()).isEqualTo("greeting {text code}"); - then(greeting).isEqualTo(new Greeting("foo", 5)); + then(fixture.query()).isEqualTo("greeting {text code successful}"); + then(greeting).isEqualTo(new Greeting("foo", 5, true)); } @Test @@ -222,15 +224,19 @@ public class NestedBehavior { @Test public void shouldCallObjectListQuery() { - fixture.returnsData("'greetings':[{'text':'a','code':1},{'text':'b','code':2}]"); + fixture.returnsData("'greetings':[" + + "{'text':'a','code':1}," + + "{'text':'b','code':2,'successful':true}," + + "{'text':'c','code':3,'successful':false}]"); ObjectListApi api = fixture.builder().build(ObjectListApi.class); List<Greeting> greeting = api.greetings(); - then(fixture.query()).isEqualTo("greetings {text code}"); + then(fixture.query()).isEqualTo("greetings {text code successful}"); then(greeting).containsExactly( - new Greeting("a", 1), - new Greeting("b", 2)); + new Greeting("a", 1, null), + new Greeting("b", 2, true), + new Greeting("c", 3, false)); } @Test @@ -318,9 +324,9 @@ public class NestedBehavior { GreetingContainer container = api.container(); - then(fixture.query()).isEqualTo("container {greeting {text code} count}"); + then(fixture.query()).isEqualTo("container {greeting {text code successful} count}"); then(container).isEqualTo(new GreetingContainer( - new Greeting("a", 1), 3)); + new Greeting("a", 1, null), 3)); } @GraphQlClientApi @@ -366,9 +372,9 @@ public class NestedBehavior { GreetingsContainer container = api.container(); - then(fixture.query()).isEqualTo("container {greetings {text code} count}"); + then(fixture.query()).isEqualTo("container {greetings {text code successful} count}"); then(container).isEqualTo(new GreetingsContainer( - asList(new Greeting("a", 1), new Greeting("b", 2)), 3)); + asList(new Greeting("a", 1, null), new Greeting("b", 2, null)), 3)); } @GraphQlClientApi @@ -442,9 +448,9 @@ public class NestedBehavior { WrappedGreetingContainer container = api.container(); - then(fixture.query()).isEqualTo("container {greeting {value {text code}} count}"); + then(fixture.query()).isEqualTo("container {greeting {value {text code successful}} count}"); then(container).isEqualTo(new WrappedGreetingContainer( - new Wrapper<>(new Greeting("a", 1)), 3)); + new Wrapper<>(new Greeting("a", 1, null)), 3)); } @GraphQlClientApi @@ -611,8 +617,8 @@ public class NestedBehavior { Sub sub = api.call(); - then(fixture.query()).isEqualTo("call {greeting {text code} count}"); - then(sub.greeting).isEqualTo(new Greeting("a", 1)); + then(fixture.query()).isEqualTo("call {greeting {text code successful} count}"); + then(sub.greeting).isEqualTo(new Greeting("a", 1, null)); then(sub.count).isEqualTo(3); } diff --git a/client/implementation/src/test/java/test/unit/ParametersBehavior.java b/client/implementation/src/test/java/test/unit/ParametersBehavior.java index 064c83f4..5035171b 100644 --- a/client/implementation/src/test/java/test/unit/ParametersBehavior.java +++ b/client/implementation/src/test/java/test/unit/ParametersBehavior.java @@ -57,10 +57,26 @@ public class ParametersBehavior { } @GraphQlClientApi - interface BooleanParamApi { + interface BoolParamApi { String greeting(boolean really); } + @Test + public void shouldCallBoolParamQuery() { + fixture.returnsData("'greeting':'ho'"); + BoolParamApi api = fixture.builder().build(BoolParamApi.class); + + String greeting = api.greeting(true); + + then(fixture.query()).isEqualTo("greeting(really: true)"); + then(greeting).isEqualTo("ho"); + } + + @GraphQlClientApi + interface BooleanParamApi { + String greeting(Boolean really); + } + @Test public void shouldCallBooleanParamQuery() { fixture.returnsData("'greeting':'ho'");

['client/implementation/src/test/java/test/unit/MutationBehavior.java', 'client/implementation/src/test/java/test/unit/ParametersBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/RequestBuilder.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java', 'client/implementation/src/test/java/test/unit/NestedBehavior.java']

{'.java': 5}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/487/486

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/486

https://github.com/smallrye/smallrye-graphql/pull/487

https://github.com/smallrye/smallrye-graphql/pull/487

fixes

Servlet module does not scan WEB-INF/lib JARs for MP GraphQL components

If annotated POJOs are located in a WAR's WEB-INF/classes directory, then everything works fine. But when running in Open Liberty with a WAR file that contains query/mutation/entity classes, etc in a JAR file in the WEB-INF/lib directory, those classes are not processed. Since these JARs are part of the classpath of the web application, they should also be scanned for MP GraphQL components.

7ae2014bef6f8f808aecfc7e2a1d8d36f1b758e6

8a3aac8e1d9bd55986a26b616e7d1009ba82fbb9

https://github.com/smallrye/smallrye-graphql/compare/7ae2014bef6f8f808aecfc7e2a1d8d36f1b758e6...8a3aac8e1d9bd55986a26b616e7d1009ba82fbb9

diff --git a/server/implementation-servlet/src/main/java/io/smallrye/graphql/servlet/IndexInitializer.java b/server/implementation-servlet/src/main/java/io/smallrye/graphql/servlet/IndexInitializer.java index fe13a935..272751c4 100644 --- a/server/implementation-servlet/src/main/java/io/smallrye/graphql/servlet/IndexInitializer.java +++ b/server/implementation-servlet/src/main/java/io/smallrye/graphql/servlet/IndexInitializer.java @@ -133,7 +133,7 @@ public class IndexInitializer { if (fileName.endsWith(DOT_CLASS)) { SmallRyeGraphQLServletLogging.log.processingFile(fileName); indexer.index(is); - } else if (fileName.endsWith(DOT_WAR)) { + } else if (fileName.endsWith(DOT_WAR) || fileName.endsWith(DOT_JAR)) { // necessary because of the thorntail arquillian adapter processJar(is, indexer); }

['server/implementation-servlet/src/main/java/io/smallrye/graphql/servlet/IndexInitializer.java']

{'.java': 1}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/333/332

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/332

https://github.com/smallrye/smallrye-graphql/pull/333

https://github.com/smallrye/smallrye-graphql/pull/333

fix

Typesafe client: inherit `@Header`/`@AuthorizationHeader` annotations

Annotations on the parent of a `@GraphQlClientApi` interface are not recognized.

c179e7bae6371a5ef258aaabe52946274693b33c

16ddf61f0ef7c27b27cdaf903450c4a4e529d003

https://github.com/smallrye/smallrye-graphql/compare/c179e7bae6371a5ef258aaabe52946274693b33c...16ddf61f0ef7c27b27cdaf903450c4a4e529d003

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java index b0674489..e27f5bd3 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java @@ -42,7 +42,7 @@ public class GraphQlClientBuilderImpl implements GraphQlClientBuilder { WebTarget webTarget = client.target(resolveEndpoint(apiClass)); GraphQlClientProxy graphQlClient = new GraphQlClientProxy(webTarget); return apiClass.cast(Proxy.newProxyInstance(apiClass.getClassLoader(), new Class<?>[] { apiClass }, - (proxy, method, args) -> graphQlClient.invoke(MethodInfo.of(method, args)))); + (proxy, method, args) -> graphQlClient.invoke(apiClass, MethodInfo.of(method, args)))); } private void readConfig(GraphQlClientApi annotation) { diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java index c6e3b6a2..bd200d63 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java @@ -41,8 +41,8 @@ class GraphQlClientProxy { this.target = target; } - Object invoke(MethodInfo method) { - MultivaluedMap<String, Object> headers = new HeaderBuilder(method).build(); + Object invoke(Class<?> api, MethodInfo method) { + MultivaluedMap<String, Object> headers = new HeaderBuilder(api, method).build(); String request = request(method); log.info("request graphql: {}", request); diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/HeaderBuilder.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/HeaderBuilder.java index 84ff32fa..85d7d721 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/HeaderBuilder.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/HeaderBuilder.java @@ -20,14 +20,16 @@ import io.smallrye.graphql.client.typesafe.impl.reflection.MethodResolver; import io.smallrye.graphql.client.typesafe.impl.reflection.TypeInfo; public class HeaderBuilder { + private final Class<?> api; private final MethodInfo method; - public HeaderBuilder(MethodInfo method) { + public HeaderBuilder(Class<?> api, MethodInfo method) { + this.api = api; this.method = method; } public MultivaluedMap<String, Object> build() { - MultivaluedMap<String, Object> headers = method.getResolvedAnnotations(Header.class) + MultivaluedMap<String, Object> headers = method.getResolvedAnnotations(api, Header.class) .map(header -> new SimpleEntry<>(header.name(), resolveValue(header))) .collect(toMultivaluedMap()); method.parameters() @@ -36,7 +38,7 @@ public class HeaderBuilder { Header header = parameter.getAnnotations(Header.class)[0]; headers.add(header.name(), parameter.getValue()); }); - method.getResolvedAnnotations(AuthorizationHeader.class) + method.getResolvedAnnotations(api, AuthorizationHeader.class) .findFirst() .map(header -> resolveAuthHeader(method.getDeclaringType(), header)) .ifPresent(auth -> headers.add("Authorization", auth)); diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/MethodInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/MethodInfo.java index 71a6d0c2..4b5dbbab 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/MethodInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/MethodInfo.java @@ -104,12 +104,20 @@ public class MethodInfo { return type; } - public <A extends Annotation> Stream<A> getResolvedAnnotations(Class<A> type) { + public <A extends Annotation> Stream<A> getResolvedAnnotations(Class<?> declaring, Class<A> type) { return Stream.concat(resolveAnnotations(method, type), - resolveAnnotations(method.getDeclaringClass(), type)) + resolveInheritedAnnotations(declaring, type)) .filter(Objects::nonNull); } + private <A extends Annotation> Stream<A> resolveInheritedAnnotations(Class<?> declaring, Class<A> type) { + Stream<A> stream = resolveAnnotations(declaring, type); + for (Class<?> i : declaring.getInterfaces()) { + stream = Stream.concat(stream, resolveInheritedAnnotations(i, type)); + } + return stream; + } + private static <A extends Annotation> Stream<A> resolveAnnotations(AnnotatedElement annotatedElement, Class<A> type) { return Stream.concat(Stream.of(annotatedElement.getAnnotationsByType(type)), resolveStereotypes(annotatedElement.getAnnotations(), type)); diff --git a/client/implementation/src/test/java/test/unit/AuthorizationHeaderBehavior.java b/client/implementation/src/test/java/test/unit/AuthorizationHeaderBehavior.java index d062450d..eed17cdb 100644 --- a/client/implementation/src/test/java/test/unit/AuthorizationHeaderBehavior.java +++ b/client/implementation/src/test/java/test/unit/AuthorizationHeaderBehavior.java @@ -85,7 +85,10 @@ public class AuthorizationHeaderBehavior { @GraphQlClientApi @AuthorizationHeader(confPrefix = "*") - public interface InheritedAuthorizationHeadersApi { + public interface InheritedAuthorizationHeadersApi extends BaseAuthorizationHeadersApi { + } + + public interface BaseAuthorizationHeadersApi { @SuppressWarnings("UnusedReturnValue") String greeting(); } @@ -104,7 +107,7 @@ public class AuthorizationHeaderBehavior { @GraphQlClientApi(configKey = "foo") @AuthorizationHeader - public interface InheritedConfigKeyAuthorizationHeadersApi { + public interface ConfigKeyAuthorizationHeadersApi { @SuppressWarnings("UnusedReturnValue") String greeting(); } @@ -113,8 +116,8 @@ public class AuthorizationHeaderBehavior { public void shouldAddInheritedConfigKeyAuthorizationHeader() { withCredentials("foo/mp-graphql/", () -> { fixture.returnsData("'greeting':'dummy-greeting'"); - InheritedConfigKeyAuthorizationHeadersApi api = fixture.builder() - .build(InheritedConfigKeyAuthorizationHeadersApi.class); + ConfigKeyAuthorizationHeadersApi api = fixture.builder() + .build(ConfigKeyAuthorizationHeadersApi.class); api.greeting(); @@ -136,7 +139,7 @@ public class AuthorizationHeaderBehavior { } @Test - public void shouldAddAuthenticatedHeader() { + public void shouldAddStereotypedHeader() { withCredentials("", () -> { fixture.returnsData("'greeting':'dummy-greeting'"); AuthenticatedHeaderApi api = fixture.builder().build(AuthenticatedHeaderApi.class); diff --git a/client/implementation/src/test/java/test/unit/HeaderBehavior.java b/client/implementation/src/test/java/test/unit/HeaderBehavior.java index 0d66e5f1..be8da39e 100644 --- a/client/implementation/src/test/java/test/unit/HeaderBehavior.java +++ b/client/implementation/src/test/java/test/unit/HeaderBehavior.java @@ -525,4 +525,40 @@ public class HeaderBehavior { then(fixture.sentHeader("H")).isEqualTo("V"); } + + @GraphQlClientApi + @Header(name = "H1", constant = "V1") + @Header(name = "overwrite", constant = "sub") + interface InheritingHeadersApi extends Base, SideBase { + } + + @Header(name = "H2", constant = "V2") + @Header(name = "overwrite", constant = "super") + interface Base extends SuperBase { + @Header(name = "H3", constant = "V3") + String greeting(); + } + + @Header(name = "H4", constant = "V4") + interface SideBase { + } + + @Header(name = "H5", constant = "V5") + interface SuperBase { + } + + @Test + public void shouldAddExtendedHeaders() { + fixture.returnsData("'greeting':'dummy-greeting'"); + InheritingHeadersApi api = fixture.builder().build(InheritingHeadersApi.class); + + api.greeting(); + + then(fixture.sentHeader("H1")).isEqualTo("V1"); + then(fixture.sentHeader("H2")).isEqualTo("V2"); + then(fixture.sentHeader("H3")).isEqualTo("V3"); + then(fixture.sentHeader("H4")).isEqualTo("V4"); + then(fixture.sentHeader("H5")).isEqualTo("V5"); + then(fixture.sentHeader("overwrite")).isEqualTo("sub"); + } }

['client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientBuilderImpl.java', 'client/implementation/src/test/java/test/unit/AuthorizationHeaderBehavior.java', 'client/implementation/src/test/java/test/unit/HeaderBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/HeaderBuilder.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/MethodInfo.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/GraphQlClientProxy.java']

{'.java': 6}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

smallrye/smallrye-graphql/548/545

smallrye

smallrye-graphql

https://github.com/smallrye/smallrye-graphql/issues/545

https://github.com/smallrye/smallrye-graphql/pull/548

https://github.com/smallrye/smallrye-graphql/pull/548

fix

Graphql client handle UUID

Hi, I am writing tests for my graphql endpoint like follows Endpoint ```java package graphql import types.Organization; import io.quarkus.security.Authenticated; @GraphQLApi public class OrganizationResource { @Authenticated @Query public Organization organization(@NonNull UUID id) { return Organization.builder().id(id).value("test").build() } } ``` Graphql type ```java package types; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import java.util.UUID; @AllArgsConstructor @Data @Builder @JsonIgnoreProperties(ignoreUnknown = true) public class Organization { private UUID id; private String value; } ``` Graphql client ```java @GraphQlClientApi interface Client { Organization organization(@NonNull @Name("id") String id); } ``` Test ```java public class OrganizationResourceTest { @Test public void testOrganizationQuery() { var id = UUID.randomUUID() var response = graphql.organization(organization.getId().toString()); assertEquals(id, response.getId()); } } ``` but I receive this error ``` io.smallrye.graphql.client.typesafe.api.GraphQlClientException: errors from service: - {"message":"Validation error of type SubSelectionNotAllowed: Sub selection not allowed on leaf type String of field id @ 'organization/id'","locations":[{"line":1,"column":59}],"extensions":{"description":"Sub selection not allowed on leaf type String of field id","validationErrorType":"SubSelectionNotAllowed","queryPath":["organization","id"],"classification":"ValidationError"}} query: query organization($id: String!) { organization(id: $id) {id {mostSigBits leastSigBits} value } } ``` It seems like the client is not mapping the UUID field to a String field which is how the graphql endpoint is returning fields of that type. Any suggestion on how to handle this case? Version: smallrye-graphql-client : 1.0.15

f1a58345a19344ed6487d0ba92aca9e30348eaed

4b8e47a19d723c6d4af339c27acda2fd78b0add2

https://github.com/smallrye/smallrye-graphql/compare/f1a58345a19344ed6487d0ba92aca9e30348eaed...4b8e47a19d723c6d4af339c27acda2fd78b0add2

diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java index 3364d70a..24335f2d 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java @@ -27,6 +27,8 @@ class JsonStringReader extends Reader<JsonString> { if (java.util.Date.class.equals(this.type.getRawType())) return java.util.Date.from(Instant.parse(value.getString())); + if (java.util.UUID.class.equals(this.type.getRawType())) + return java.util.UUID.fromString(value.getString()); ConstructionInfo constructor = type.scalarConstructor() .orElseThrow(() -> new GraphQlClientValueException(location, value)); diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java index 6a1ddf9a..418ad1e6 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java @@ -63,6 +63,7 @@ public class ParameterInfo { case "String": case "char": case "Character": + case "UUID": return "String"; case "boolean": case "Boolean": diff --git a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java index 6b9cbbcf..1173d8ed 100644 --- a/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java +++ b/client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java @@ -126,7 +126,12 @@ public class TypeInfo { } private boolean isGraphQlField(Field field) { - return !isStatic(field.getModifiers()) && !isTransient(field.getModifiers()); + return !isStatic(field.getModifiers()) && !isSynthetic(field.getModifiers()) && !isTransient(field.getModifiers()); + } + + /** Modifier.isSynthetic is package private */ + private static boolean isSynthetic(int mod) { + return (mod & 0x00001000) != 0; } public boolean isOptional() { @@ -146,6 +151,7 @@ public class TypeInfo { || CharSequence.class.isAssignableFrom(getRawType()) || Character.class.equals(getRawType()) // has a valueOf(char), not valueOf(String) || java.util.Date.class.equals(getRawType()) + || java.util.UUID.class.equals(getRawType()) || scalarConstructor().isPresent(); } diff --git a/client/implementation/src/test/java/test/unit/ScalarBehavior.java b/client/implementation/src/test/java/test/unit/ScalarBehavior.java index 5a763b11..53047498 100644 --- a/client/implementation/src/test/java/test/unit/ScalarBehavior.java +++ b/client/implementation/src/test/java/test/unit/ScalarBehavior.java @@ -15,6 +15,7 @@ import java.time.OffsetTime; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.Date; +import java.util.UUID; import org.eclipse.microprofile.graphql.Id; import org.eclipse.microprofile.graphql.NonNull; @@ -581,14 +582,26 @@ class ScalarBehavior { @GraphQlClientApi interface IdApi { @Id - String idea(@Id String in); + String idea( + @Id String stringId, + @Id long primitiveLongId, + @Id int primitiveIntId, + @Id Long longId, + @Id Integer intId, + @Id UUID uuidId); } @GraphQlClientApi interface NonNullIdApi { @NonNull @Id - String idea(@NonNull @Id String in); + String idea( + @NonNull @Id String stringId, + @NonNull @Id long primitiveLongId, + @NonNull @Id int primitiveIntId, + @NonNull @Id Long longId, + @NonNull @Id Integer intId, + @NonNull @Id UUID uuidId); } @GraphQlClientApi @@ -706,9 +719,22 @@ class ScalarBehavior { fixture.returnsData("'idea':'out'"); IdApi api = fixture.builder().build(IdApi.class); - String out = api.idea("in"); - - then(fixture.query()).isEqualTo("query idea($in: ID) { idea(in: $in) }"); + String out = api.idea("stringId", 1L, 2, 3L, 4, UUID.randomUUID()); + + then(fixture.query()).isEqualTo("query idea(" + + "$stringId: ID, " + + "$primitiveLongId: ID!, " + + "$primitiveIntId: ID!, " + + "$longId: ID, " + + "$intId: ID, " + + "$uuidId: ID) " + + "{ idea(" + + "stringId: $stringId, " + + "primitiveLongId: $primitiveLongId, " + + "primitiveIntId: $primitiveIntId, " + + "longId: $longId, " + + "intId: $intId, " + + "uuidId: $uuidId) }"); then(out).isEqualTo("out"); } @@ -717,9 +743,22 @@ class ScalarBehavior { fixture.returnsData("'idea':'out'"); NonNullIdApi api = fixture.builder().build(NonNullIdApi.class); - String out = api.idea("in"); - - then(fixture.query()).isEqualTo("query idea($in: ID!) { idea(in: $in) }"); + String out = api.idea("stringId", 1L, 2, 3L, 4, UUID.randomUUID()); + + then(fixture.query()).isEqualTo("query idea(" + + "$stringId: ID!, " + + "$primitiveLongId: ID!, " + + "$primitiveIntId: ID!, " + + "$longId: ID!, " + + "$intId: ID!, " + + "$uuidId: ID!) " + + "{ idea(" + + "stringId: $stringId, " + + "primitiveLongId: $primitiveLongId, " + + "primitiveIntId: $primitiveIntId, " + + "longId: $longId, " + + "intId: $intId, " + + "uuidId: $uuidId) }"); then(out).isEqualTo("out"); } @@ -1015,4 +1054,53 @@ class ScalarBehavior { then(value).isEqualTo(Date.from(out)); } } + + @GraphQlClientApi + interface UuidApi { + UUID foo(UUID uuid, @Id UUID id); + } + + @GraphQlClientApi + interface NestedUuidIdApi { + NestedUuidId foo(NestedUuidId uuid); + } + + static class NestedUuidId { + @Id + UUID id; + } + + @Nested + class UuidBehavior { + @Test + void shouldCallUuidQuery() { + UUID in1 = UUID.randomUUID(); + UUID in2 = UUID.randomUUID(); + UUID out = UUID.randomUUID(); + fixture.returnsData("'foo':'" + out + "'"); + UuidApi api = fixture.build(UuidApi.class); + + UUID value = api.foo(in1, in2); + + then(fixture.query()).isEqualTo("query foo($uuid: String, $id: ID) { foo(uuid: $uuid, id: $id) }"); + then(fixture.variables()).isEqualTo("{'uuid':'" + in1 + "','id':'" + in2 + "'}"); + then(value).isEqualTo(out); + } + + @Test + void shouldCallNestedUuidIdQuery() { + NestedUuidId in = new NestedUuidId(); + in.id = UUID.randomUUID(); + NestedUuidId out = new NestedUuidId(); + out.id = UUID.randomUUID(); + fixture.returnsData("'foo':{'id':'" + out.id + "'}"); + NestedUuidIdApi api = fixture.build(NestedUuidIdApi.class); + + NestedUuidId value = api.foo(in); + + then(fixture.query()).isEqualTo("query foo($uuid: NestedUuidIdInput) { foo(uuid: $uuid) {id} }"); + then(fixture.variables()).isEqualTo("{'uuid':{'id':'" + in.id + "'}}"); + then(value.id).isEqualTo(out.id); + } + } }

['client/implementation/src/test/java/test/unit/ScalarBehavior.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/json/JsonStringReader.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/TypeInfo.java', 'client/implementation/src/main/java/io/smallrye/graphql/client/typesafe/impl/reflection/ParameterInfo.java']

{'.java': 4}

Java

{'Java': 2081470, 'JavaScript': 4025, 'Shell': 1757, 'Kotlin': 1745, 'HTML': 1357, 'CSS': 737}

Apache License 2.0

gluufederation/oxtrust/1054/1053

gluufederation

oxtrust

https://github.com/GluuFederation/oxTrust/issues/1053

https://github.com/GluuFederation/oxTrust/pull/1054

https://github.com/GluuFederation/oxTrust/pull/1054

fix

Fix duplicate source server name:

# Description The fix is already in master branch just need to move it to 3.1.4 as that is required for the next release The corresponding issue was here https://github.com/GluuFederation/oxTrust/issues/1043.

83ce8d6f0bce2317eca50640ed2555743f71d1e4

664eeed5b50503602a462364b1e12b1ebbe59325

https://github.com/gluufederation/oxtrust/compare/83ce8d6f0bce2317eca50640ed2555743f71d1e4...664eeed5b50503602a462364b1e12b1ebbe59325

diff --git a/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java b/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java index 8faa9ef45..7918e6e68 100644 --- a/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java +++ b/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java @@ -278,22 +278,17 @@ public class ManagePersonAuthenticationAction public boolean updateAuthConf(GluuAppliance appliance) { try { - String configId = null; List<OxIDPAuthConf> idpConf = new ArrayList<OxIDPAuthConf>(); for (GluuLdapConfiguration ldapConfig : this.sourceConfigs) { - if (idpConf.isEmpty()) { - configId = ldapConfig.getConfigId(); - } if (ldapConfig.isUseAnonymousBind()) { ldapConfig.setBindDN(null); } OxIDPAuthConf ldapConfigIdpAuthConf = new OxIDPAuthConf(); - ldapConfig.setConfigId(configId); ldapConfig.updateStringsLists(); ldapConfigIdpAuthConf.setType("auth"); ldapConfigIdpAuthConf.setVersion(ldapConfigIdpAuthConf.getVersion() + 1); - ldapConfigIdpAuthConf.setName(configId); + ldapConfigIdpAuthConf.setName(ldapConfig.getConfigId()); ldapConfigIdpAuthConf.setEnabled(ldapConfig.isEnabled()); ldapConfigIdpAuthConf.setConfig(objectToJson(ldapConfig));

['server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java']

{'.java': 1}

Java

{'Java': 2357692, 'HTML': 870626, 'JavaScript': 658438, 'CSS': 538961, 'SCSS': 28392, 'Handlebars': 5806, 'Python': 3149, 'Ruby': 1078}

MIT License

smallrye/smallrye-config/177/176

smallrye

smallrye-config

https://github.com/smallrye/smallrye-config/issues/176

https://github.com/smallrye/smallrye-config/pull/177

https://github.com/smallrye/smallrye-config/pull/177

fixes

1.3.10 started returning Optional[false] for non existent boolean properties

In 1.3.9, `config.getOptionalValue("NON_EXISTENT_PROPERTY", Boolean.class)`, returns `Optional.empty` In 1.3.10, the same call started returning `Optional[false]` instead. This is a backward incompatible change in behavior and is not consistent with the behavior for types other than boolean, for which this call still returns `Optional.empty`.

7b2258f9f7b494252b2db6d4dcb6d9428d44ff66

bc2ab1199ecba8f9212a4a1197cfcdee90961cc2

https://github.com/smallrye/smallrye-config/compare/7b2258f9f7b494252b2db6d4dcb6d9428d44ff66...bc2ab1199ecba8f9212a4a1197cfcdee90961cc2

diff --git a/implementation/src/main/java/io/smallrye/config/Converters.java b/implementation/src/main/java/io/smallrye/config/Converters.java index 6ffc789b..f5bac62e 100644 --- a/implementation/src/main/java/io/smallrye/config/Converters.java +++ b/implementation/src/main/java/io/smallrye/config/Converters.java @@ -55,7 +55,7 @@ public final class Converters { @SuppressWarnings("unchecked") static final Converter<Boolean> BOOLEAN_CONVERTER = BuiltInConverter.of(1, (Converter & Serializable) value -> { - if (value != null) { + if (value != null && !value.isEmpty()) { return "TRUE".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value) || "YES".equalsIgnoreCase(value) @@ -72,19 +72,19 @@ public final class Converters { @SuppressWarnings("unchecked") static final Converter<Double> DOUBLE_CONVERTER = BuiltInConverter.of(2, - (Converter & Serializable) value -> value != null ? Double.valueOf(value) : null); + (Converter & Serializable) value -> value != null && !value.isEmpty() ? Double.valueOf(value) : null); @SuppressWarnings("unchecked") static final Converter<Float> FLOAT_CONVERTER = BuiltInConverter.of(3, - (Converter & Serializable) value -> value != null ? Float.valueOf(value) : null); + (Converter & Serializable) value -> value != null && !value.isEmpty() ? Float.valueOf(value) : null); @SuppressWarnings("unchecked") static final Converter<Long> LONG_CONVERTER = BuiltInConverter.of(4, - (Converter & Serializable) value -> value != null ? Long.valueOf(value) : null); + (Converter & Serializable) value -> value != null && !value.isEmpty() ? Long.valueOf(value) : null); @SuppressWarnings("unchecked") static final Converter<Integer> INTEGER_CONVERTER = BuiltInConverter.of(5, - (Converter & Serializable) value -> value != null ? Integer.valueOf(value) : null); + (Converter & Serializable) value -> value != null && !value.isEmpty() ? Integer.valueOf(value) : null); @SuppressWarnings("unchecked") static final Converter<Class<?>> CLASS_CONVERTER = BuiltInConverter.of(6, (Converter & Serializable) value -> { @@ -121,7 +121,7 @@ public final class Converters { @SuppressWarnings("unchecked") static final Converter<Character> CHARACTER_CONVERTER = BuiltInConverter.of(11, (Converter & Serializable) value -> { - if (value != null) { + if (value != null && !value.isEmpty()) { if (value.length() == 1) { return Character.valueOf(value.charAt(0)); } diff --git a/implementation/src/test/java/io/smallrye/config/ConvertersTestCase.java b/implementation/src/test/java/io/smallrye/config/ConvertersTestCase.java index ab5e63e6..add365a5 100644 --- a/implementation/src/test/java/io/smallrye/config/ConvertersTestCase.java +++ b/implementation/src/test/java/io/smallrye/config/ConvertersTestCase.java @@ -26,6 +26,9 @@ import java.util.Collection; import java.util.Collections; import java.util.NoSuchElementException; import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; import org.eclipse.microprofile.config.spi.Converter; import org.junit.Test; @@ -203,6 +206,103 @@ public class ConvertersTestCase { assertEquals(LocalDate.of(1950, 1, 1), config.getValue("when", dateConv4)); } + @Test + public void testEmpty() { + SmallRyeConfig config = buildConfig("int.key", "1234", "boolean.key", "true", "empty.key", ""); + assertTrue(config.getOptionalValue("int.key", Integer.class).isPresent()); + assertEquals(1234, config.getOptionalValue("int.key", Integer.class).get().intValue()); + assertTrue(config.getValue("int.key", OptionalInt.class).isPresent()); + assertFalse(config.getValue("int.missing.key", OptionalInt.class).isPresent()); + assertFalse(config.getValue("empty.key", OptionalInt.class).isPresent()); + assertEquals(1234, config.getValue("int.key", OptionalInt.class).getAsInt()); + assertFalse(config.getOptionalValue("int.missing.key", Integer.class).isPresent()); + assertFalse(config.getOptionalValue("empty.key", Integer.class).isPresent()); + + try { + config.getValue("empty.key", Integer.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + try { + config.getValue("int.missing.key", Integer.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + + assertTrue(config.getOptionalValue("int.key", Long.class).isPresent()); + assertEquals(1234, config.getOptionalValue("int.key", Long.class).get().intValue()); + assertTrue(config.getValue("int.key", OptionalLong.class).isPresent()); + assertEquals(1234, config.getValue("int.key", OptionalLong.class).getAsLong()); + assertFalse(config.getValue("int.missing.key", OptionalLong.class).isPresent()); + assertFalse(config.getValue("empty.key", OptionalLong.class).isPresent()); + assertFalse(config.getOptionalValue("int.missing.key", Long.class).isPresent()); + assertFalse(config.getOptionalValue("empty.key", Long.class).isPresent()); + + try { + config.getValue("empty.key", Long.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + try { + config.getValue("int.missing.key", Long.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + + assertTrue(config.getOptionalValue("int.key", Double.class).isPresent()); + assertEquals(1234, config.getOptionalValue("int.key", Double.class).get().intValue()); + assertTrue(config.getValue("int.key", OptionalDouble.class).isPresent()); + assertEquals(1234, config.getValue("int.key", OptionalDouble.class).getAsDouble(), 0.0); + assertFalse(config.getValue("int.missing.key", OptionalDouble.class).isPresent()); + assertFalse(config.getValue("empty.key", OptionalDouble.class).isPresent()); + assertFalse(config.getOptionalValue("int.missing.key", Double.class).isPresent()); + assertFalse(config.getOptionalValue("empty.key", Double.class).isPresent()); + + try { + config.getValue("empty.key", Double.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + try { + config.getValue("int.missing.key", Double.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + + assertTrue(config.getOptionalValue("int.key", Float.class).isPresent()); + assertEquals(1234, config.getOptionalValue("int.key", Float.class).get().intValue()); + + try { + config.getValue("empty.key", Float.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + try { + config.getValue("int.missing.key", Float.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + + assertTrue(config.getOptionalValue("boolean.key", Boolean.class).isPresent()); + assertTrue(config.getValue("boolean.key", Boolean.class).booleanValue()); + assertFalse(config.getOptionalValue("boolean.missing.key", Boolean.class).isPresent()); + assertFalse(config.getOptionalValue("empty.key", Boolean.class).isPresent()); + try { + config.getValue("empty.key", Boolean.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + try { + config.getValue("boolean.missing.key", Boolean.class); + fail("Expected exception"); + } catch (NoSuchElementException expected) { + } + + assertFalse(config.getOptionalValue("empty.key", String.class).isPresent()); + + assertFalse(config.getOptionalValue("empty.key", Character.class).isPresent()); + } + @SafeVarargs private static <T> T[] array(T... items) { return items;

['implementation/src/test/java/io/smallrye/config/ConvertersTestCase.java', 'implementation/src/main/java/io/smallrye/config/Converters.java']

{'.java': 2}

Java

{'Java': 1275680, 'Shell': 1439, 'Kotlin': 1341}

Apache License 2.0

gluufederation/oxtrust/550/545

gluufederation

oxtrust

https://github.com/GluuFederation/oxTrust/issues/545

https://github.com/GluuFederation/oxTrust/pull/550

https://github.com/GluuFederation/oxTrust/pull/550#issuecomment-303082148

resolve

Update Grant Types

We need to add the following grant types: - password - client_credentials - urn:ietf:params:oauth:grant-type:uma-ticket

5f788cd2337e0b3ed75b0c9007d8a0ce3d2652f8

2caf57076da501050745b60dbbacf514c2011d07

https://github.com/gluufederation/oxtrust/compare/5f788cd2337e0b3ed75b0c9007d8a0ce3d2652f8...2caf57076da501050745b60dbbacf514c2011d07

diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java index 878d46cd1..ebb513eef 100644 --- a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java +++ b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java @@ -790,7 +790,10 @@ public class UpdateClientAction implements Serializable { tmpAvailableGrantTypes.add(new SelectableEntity<GrantType>(GrantType.AUTHORIZATION_CODE)); tmpAvailableGrantTypes.add(new SelectableEntity<GrantType>(GrantType.IMPLICIT)); tmpAvailableGrantTypes.add(new SelectableEntity<GrantType>(GrantType.REFRESH_TOKEN)); - + tmpAvailableGrantTypes.add(new SelectableEntity<GrantType>(GrantType.CLIENT_CREDENTIALS)); + tmpAvailableGrantTypes.add(new SelectableEntity<GrantType>(GrantType.RESOURCE_OWNER_PASSWORD_CREDENTIALS)); + tmpAvailableGrantTypes.add(new SelectableEntity<GrantType>(GrantType.OXAUTH_UMA_TICKET)); + this.availableGrantTypes = tmpAvailableGrantTypes; selectAddedGrantTypes(); }

['server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java']

{'.java': 1}

Java

{'Java': 2357692, 'HTML': 870626, 'JavaScript': 658438, 'CSS': 538961, 'SCSS': 28392, 'Handlebars': 5806, 'Python': 3149, 'Ruby': 1078}

MIT License

rundeck/rundeck-cli/459/458

rundeck

rundeck-cli

https://github.com/rundeck/rundeck-cli/issues/458

https://github.com/rundeck/rundeck-cli/pull/459

https://github.com/rundeck/rundeck-cli/pull/459

fix

RUN-1002: rd projects scm perform project-commit issue

I seem to be unable to perform a project commit for multiple jobs using the cli. Fail for multiple jobs that are surrounded by quotes: ``` rd projects scm perform --project=MyProject --integration="export" --field="message='Daily sync'" --action="project-commit" \\ --job="221533ab-6d50-4345-adda-1c2a5408ffae 15a8b7f4-3bc3-4783-b1b4-eebf6679269e" Action project-commit failed No jobs were selected ``` Pass for single job surrounded by quotes: ``` rd projects scm perform --project=MyProject --integration="export" --field="message='Daily sync'" --action="project-commit" \\ --job="15a8b7f4-3bc3-4783-b1b4-eebf6679269e" # Action project-commit was successful. # Result: SCM export Action was Successful: project-commit ``` Fail for multiple jobs without quotes: ``` rd projects scm perform --project=MyProject --integration="export" --field="message='Daily sync'" --action="project-commit" \\ --job=221533ab-6d50-4345-adda-1c2a5408ffae 15a8b7f4-3bc3-4783-b1b4-eebf6679269e Unmatched argument at index 8: '15a8b7f4-3bc3-4783-b1b4-eebf6679269e' ``` According to the cli/docs, I can pass in space separate job ids. ``` $ rd --version 2.0.0 ``` Rundeck version 4.3.1

2b4d3d44a52847227e774ed09ca285d0414d378a

6240fecb9b889846357d7888d80e068eb66411af

https://github.com/rundeck/rundeck-cli/compare/2b4d3d44a52847227e774ed09ca285d0414d378a...6240fecb9b889846357d7888d80e068eb66411af

diff --git a/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java index 8648aff..0bc4eac 100644 --- a/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java +++ b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java @@ -284,10 +284,10 @@ public class SCM extends BaseCommand { @Getter @Setter public static class ActionPerformOptions extends ActionInputsOptions { - @CommandLine.Option(names = {"--field", "-f"}, description = "Field input values, space separated key=value list") + @CommandLine.Option(names = {"--field", "-f"}, arity = "1..*", description = "Field input values, space separated key=value list") private List<String> fields; - @CommandLine.Option(names = {"--item", "-I"}, description = "Items to include, space separated list") + @CommandLine.Option(names = {"--item", "-I"}, arity = "1..*", description = "Items to include, space separated list") private List<String> item; @CommandLine.Option(names = {"-A", "--allitems"}, @@ -314,11 +314,12 @@ public class SCM extends BaseCommand { "(import only)") boolean allUntrackedItems; - @CommandLine.Option(names = {"--job", "-j"}, description = "Job IDs to include, space separated list") + @CommandLine.Option(names = {"--job", "-j"}, arity = "1..*", description = "Job IDs to include, space separated list") List<String> job; @CommandLine.Option(names = {"--delete", "-d"}, + arity = "1..*", description = "Job IDs or Item Ids to delete, space separated list") List<String> delete;

['rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java']

{'.java': 1}

Java

{'Java': 657161, 'Groovy': 193234, 'Shell': 3366, 'Dockerfile': 2799}

Apache License 2.0

hapifhir/org.hl7.fhir.core/885/884

hapifhir

org.hl7.fhir.core

https://github.com/hapifhir/org.hl7.fhir.core/issues/884

https://github.com/hapifhir/org.hl7.fhir.core/pull/885

https://github.com/hapifhir/org.hl7.fhir.core/pull/885

fixes

"5.0.0-snapshot2" is missing from enumerations class

The new version: "5.0.0-snapshot2" was introduced ([In Constants](https://github.com/hapifhir/org.hl7.fhir.core/blob/master/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java)), but the version wasn't added to [Enumerations](https://github.com/hapifhir/org.hl7.fhir.core/blob/master/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java)

f3fa8cae2452336c06775de90eb8dd2d0a225c94

1441141d95c8a89da068ac3463648c6687078d3e

https://github.com/hapifhir/org.hl7.fhir.core/compare/f3fa8cae2452336c06775de90eb8dd2d0a225c94...1441141d95c8a89da068ac3463648c6687078d3e

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java index 163e96d32..7c205f623 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java @@ -3490,8 +3490,8 @@ public class Enumerations { */ MEDICATIONREQUEST, /** - * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. - + * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. + The primary difference between a medicationusage and a medicationadministration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medicationusage is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Usage information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ MEDICATIONUSAGE, @@ -6699,8 +6699,12 @@ The primary difference between a medicationusage and a medicationadministration /** * R5 Snapshot1 */ - _5_0_0SNAPSHOT1, + _5_0_0SNAPSHOT1, /** + * R5 Snapshot2 + */ + _5_0_0SNAPSHOT2, + /** * added to help the parsers */ NULL; @@ -6813,6 +6817,8 @@ The primary difference between a medicationusage and a medicationadministration return _5_0_0CIBUILD; if ("5.0.0-snapshot1".equals(codeString)) return _5_0_0SNAPSHOT1; + if ("5.0.0-snapshot2".equals(codeString)) + return _5_0_0SNAPSHOT2; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode() { @@ -6870,6 +6876,7 @@ The primary difference between a medicationusage and a medicationadministration case _5_0_0: return "5.0.0"; case _5_0_0CIBUILD: return "5.0.0-cibuild"; case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; + case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; case NULL: return null; default: return "?"; } @@ -6929,6 +6936,7 @@ The primary difference between a medicationusage and a medicationadministration case _5_0_0: return "http://hl7.org/fhir/FHIR-version"; case _5_0_0CIBUILD: return "http://hl7.org/fhir/FHIR-version"; case _5_0_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0SNAPSHOT2: return "http://hl7.org/fhir/FHIR-version"; case NULL: return null; default: return "?"; } @@ -6988,6 +6996,7 @@ The primary difference between a medicationusage and a medicationadministration case _5_0_0: return "R5"; case _5_0_0CIBUILD: return "R5 CIBuild"; case _5_0_0SNAPSHOT1: return "R5 Snapshot1"; + case _5_0_0SNAPSHOT2: return "R5 Snapshot2"; case NULL: return null; default: return "?"; } @@ -7047,6 +7056,7 @@ The primary difference between a medicationusage and a medicationadministration case _5_0_0: return "5.0.0"; case _5_0_0CIBUILD: return "5.0.0-cibuild"; case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; + case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; case NULL: return null; default: return "?"; } @@ -7064,7 +7074,7 @@ The primary difference between a medicationusage and a medicationadministration public static boolean isValidCode(String codeString) { return Utilities.existsInList(codeString, "0.01", "0.05", "0.06", "0.11", "0.0.80", "0.0.81" ,"0.0.82", "0.4.0", "0.5.0", "1.0.0", "1.0.1", "1.0.2", "1.1.0", "1.4.0", "1.6.0", "1.8.0", "3.0.0", "3.0.1", "3.0.2", "3.3.0", "3.5.0", - "4.0.0", "4.0.1", "4.1.0" ,"4.2.0" ,"4.3.0-snapshot1" ,"4.3.0-cibuild" ,"4.3.0", "5.0.0", "5.0.0-cibuild", "5.0.0-snapshot1"); + "4.0.0", "4.0.1", "4.1.0" ,"4.2.0" ,"4.3.0-snapshot1" ,"4.3.0-cibuild" ,"4.3.0", "5.0.0", "5.0.0-cibuild", "5.0.0-snapshot1", "5.0.0-snapshot2"); } @@ -7192,6 +7202,8 @@ The primary difference between a medicationusage and a medicationadministration return FHIRVersion._5_0_0CIBUILD; if ("5.0.0-snapshot1".equals(codeString)) return FHIRVersion._5_0_0SNAPSHOT1; + if ("5.0.0-snapshot2".equals(codeString)) + return FHIRVersion._5_0_0SNAPSHOT2; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration<FHIRVersion> fromType(Base code) throws FHIRException { @@ -7308,6 +7320,8 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD); if ("5.0.0-snapshot1".equals(codeString)) return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1); + if ("5.0.0-snapshot2".equals(codeString)) + return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT2); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -7417,6 +7431,8 @@ The primary difference between a medicationusage and a medicationadministration return "5.0.0-cibuild"; if (code == FHIRVersion._5_0_0SNAPSHOT1) return "5.0.0-snapshot1"; + if (code == FHIRVersion._5_0_0SNAPSHOT2) + return "5.0.0-snapshot2"; return "?"; } public String toSystem(FHIRVersion code) { @@ -9913,8 +9929,8 @@ The primary difference between a medicationusage and a medicationadministration */ MEDICATIONREQUEST, /** - * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. - + * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. + The primary difference between a medicationusage and a medicationadministration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medicationusage is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Usage information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ MEDICATIONUSAGE, diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceTests.java index f4d97151a..e29bd0ed7 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceTests.java @@ -12,6 +12,7 @@ import org.hl7.fhir.r5.model.CapabilityStatement; import org.hl7.fhir.r5.model.CodeSystem; import org.hl7.fhir.r5.model.CompartmentDefinition; import org.hl7.fhir.r5.model.ConceptMap; +import org.hl7.fhir.r5.model.Constants; import org.hl7.fhir.r5.model.ExampleScenario; import org.hl7.fhir.r5.model.GraphDefinition; import org.hl7.fhir.r5.model.ImplementationGuide; @@ -70,4 +71,11 @@ class ResourceTests { String output = xml.composeString(res); assertEquals(TGT, output); } + + @Test + void testCapabilityStatementFhirVersion() { + CapabilityStatement cap = new CapabilityStatement(); + cap.getFhirVersionElement().setValueAsString(Constants.VERSION); + assertEquals(Constants.VERSION, cap.getFhirVersion().getDisplay()); + } }

['org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceTests.java', 'org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java']

{'.java': 2}

Java

{'Java': 225424124, 'Batchfile': 790}

Apache License 2.0

hapifhir/org.hl7.fhir.core/968/967

hapifhir

org.hl7.fhir.core

https://github.com/hapifhir/org.hl7.fhir.core/issues/967

https://github.com/hapifhir/org.hl7.fhir.core/pull/968

https://github.com/hapifhir/org.hl7.fhir.core/pull/968

fixes

maxValue contraint on decimal values is ignored and doesn't produce errors

### Problem description It seems, that the validator doesn't evaluate the maxValue constraint for decimal data types in profiles (**maxValueDecimal**). If the constraint is violated, no errors are produced. The following minimal example ([MedicationRequestWithDispenseRequestQuantityLimit.zip](https://github.com/hapifhir/org.hl7.fhir.core/files/9888003/MedicationRequestWithDispenseRequestQuantityLimit.zip)) demonstrates the behavior (take notice of the profile constraint maxValueDecimal = 999 and the actual value of 1000): #### Profile `{ "resourceType": "StructureDefinition", "id": "MedicationRequestWithDispenseRequestQuantityLimit", "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", "valueString": "Clinical.Medications" }, { "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", "valueCode": "patient" } ], "url": "http://example.org/StructureDefinition/MedicationRequestWithDispenseRequestQuantityLimit", "version": "1.0.0", "name": "MedicationRequestWithDispenseRequestQuantityLimit", "title": "Example of MedicationRequest profile for demonstration of HL7 Java Validator Bug with maxValueDecimal-Evaluation", "status": "active", "description": "Validator doesn't throw any errors for instances with MedicationRequest.dispenseRequest.quantity.value > specified maxValueDecimal", "fhirVersion": "4.0.1", "mapping": [ { "identity": "workflow", "uri": "http://hl7.org/fhir/workflow", "name": "Workflow Pattern" }, { "identity": "script10.6", "uri": "http://ncpdp.org/SCRIPT10_6", "name": "Mapping to NCPDP SCRIPT 10.6" }, { "identity": "rim", "uri": "http://hl7.org/v3", "name": "RIM Mapping" }, { "identity": "w5", "uri": "http://hl7.org/fhir/fivews", "name": "FiveWs Pattern Mapping" }, { "identity": "v2", "uri": "http://hl7.org/v2", "name": "HL7 v2 Mapping" } ], "kind": "resource", "abstract": false, "type": "MedicationRequest", "baseDefinition": "http://hl7.org/fhir/StructureDefinition/MedicationRequest", "derivation": "constraint", "differential": { "element": [ { "id": "MedicationRequest.dispenseRequest", "path": "MedicationRequest.dispenseRequest", "min": 1, "mustSupport": true }, { "id": "MedicationRequest.dispenseRequest.quantity", "path": "MedicationRequest.dispenseRequest.quantity", "min": 1, "mustSupport": true }, { "id": "MedicationRequest.dispenseRequest.quantity.value", "path": "MedicationRequest.dispenseRequest.quantity.value", "min": 1, "maxValueDecimal": 999, "mustSupport": true } ] } }` #### Instance `<MedicationRequest xmlns="http://hl7.org/fhir"> <id value="medrx0304" /> <meta> <profile value="http://example.org/StructureDefinition/MedicationRequestWithDispenseRequestQuantityLimit" /> </meta> <contained> <Medication> <id value="med0312" /> <code> <coding> <system value="http://snomed.info/sct" /> <code value="324689003" /> <display value="Nystatin 100000 unit/mL oral suspension" /> </coding> </code> </Medication> </contained> <status value="completed" /> <intent value="order" /> <medicationReference> <reference value="#med0312" /> <display value="Nystatin 100,000 u/ml oral suspension" /> </medicationReference> <subject> <reference value="http://example.org/Patient/pat1" /> <display value="Donald Duck" /> </subject> <authoredOn value="2015-01-15" /> <dispenseRequest> <quantity> <value value="1000" /> </quantity> </dispenseRequest> </MedicationRequest>` #### Call to validator `java -jar .\\validator_cli.jar .\\MedicationRequest.xml -ig .\\StructureDefinition-MedicationRequestWithDispenseRequestQuantityLimit.json -profile http://example.org/StructureDefinition/MedicationRequestWithDispenseRequestQuantityLimit` #### Output > FHIR Validation tool Version 5.6.74 (Git# 325fd0736d48). Built 2022-10-25T09:35:43.821Z (3 days old) > Java: 11.0.14.1 from C:\\Program Files\\OpenJDK\\openjdk-11.0.14.1_1 on amd64 (64bit). 8136MB available > > WARNING: Default file encoding is windows-1252 which may cause unexpected results. > To fix this issue, run this program with the parameter '-Dfile.encoding=UTF-8' > Future releases may not be able to run at all with encoding windows-1252 > > Paths: Current = C:\\Dev\\fhir validator, Package Cache = C:\\Users\\...\\.fhir\\packages > Params: .\\MedicationRequest.xml -ig .\\StructureDefinition-MedicationRequestWithDispenseRequestQuantityLimit.json -profile http://example.org/StructureDefinition/MedicationRequestWithDispenseRequestQuantityLimit > Scanning for versions (no -version parameter): > fhirVersion in .\\StructureDefinition-MedicationRequestWithDispenseRequestQuantityLimit.json: 4.0 > -> use version 4.0 > Jurisdiction: No Jurisdiction > Loading > Load FHIR v4.0 from hl7.fhir.r4.core#4.0.1 Load hl7.terminology.r4#4.0.0 - 4164 resources (00:04.884) > - 7383 resources (00:00.000) > Load hl7.terminology#4.0.0 - 4164 resources (00:00.724) > Load R5 Extensions - 123 resources (00:06.213) > Terminology server http://tx.fhir.org - Version 2.0.14 (00:01.082) > Load .\\StructureDefinition-MedicationRequestWithDispenseRequestQuantityLimit.json - 1 resources (00:00.002) > Get set... go (00:00.014) > Validating > Profiles: [http://example.org/StructureDefinition/MedicationRequestWithDispenseRequestQuantityLimit] > Validate .\\MedicationRequest.xml > Validate MedicationRequest against http://example.org/StructureDefinition/MedicationRequestWithDispenseRequestQuantityLimit..........20..........40..........60..........80.........| > 00:00.405 > Done. Times: Loading: 00:13.215, validation: 00:00.405. Memory = 526Mb > > Success: 0 errors, 0 warnings, 1 notes > Information: All OK #### Expected output > *FAILURE*: 1 errors, 0 warnings, 0 notes > Error @ MedicationRequest.dispenseRequest.quantity.value (line 31, col35): value is greater than permitted maximum value of DecimalType[999] ### Possible fix The error seems to locate in InstanceValidator:2415 and InstanceValidator:2416 which assume an integer datatype instead of a decimal one. A fix can be: `ok = rule(errors, IssueType.INVALID, e.line(), e.col(), path, !context.hasMaxValueDecimalType() || !context.getMaxValueDecimalType().hasValue() || checkDecimalMaxValue(v, context.getMaxValueDecimalType().getValue()), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_GT, (context.hasMaxValueDecimalType() ? context.getMaxValueDecimalType() : "")) && ok;`

f0c53bd7a9968a410671e706ab322551485fbdd0

413f3a35430f83b8cd3e93b45a74efd792c9e369

https://github.com/hapifhir/org.hl7.fhir.core/compare/f0c53bd7a9968a410671e706ab322551485fbdd0...413f3a35430f83b8cd3e93b45a74efd792c9e369

diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index b0f084daa..069635dcc 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -2412,8 +2412,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat warning(errors, IssueType.VALUE, e.line(), e.col(), path, ds != DecimalStatus.RANGE, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_RANGE, e.primitiveValue()); try { Decimal v = new Decimal(e.getValue()); - ok = rule(errors, IssueType.INVALID, e.line(), e.col(), path, !context.hasMaxValueIntegerType() || - !context.getMaxValueIntegerType().hasValue() || checkDecimalMaxValue(v, context.getMaxValueDecimalType().getValue()), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_GT, (context.hasMaxValueIntegerType() ? context.getMaxValueIntegerType() : "")) && ok; + ok = rule(errors, IssueType.INVALID, e.line(), e.col(), path, !context.hasMaxValueDecimalType() || + !context.getMaxValueDecimalType().hasValue() || checkDecimalMaxValue(v, context.getMaxValueDecimalType().getValue()), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_GT, (context.hasMaxValueDecimalType() ? context.getMaxValueDecimalType() : "")) && ok; ok = rule(errors, IssueType.INVALID, e.line(), e.col(), path, !context.hasMinValueIntegerType() || !context.getMinValueIntegerType().hasValue() || checkDecimalMinValue(v, context.getMaxValueDecimalType().getValue()), I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_LT, (context.hasMinValueIntegerType() ? context.getMinValueIntegerType() : "")) && ok; } catch (Exception ex) {

['org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java']

{'.java': 1}

Java

{'Java': 225424124, 'Batchfile': 790}

Apache License 2.0

hapifhir/org.hl7.fhir.core/1041/1040

hapifhir

org.hl7.fhir.core

https://github.com/hapifhir/org.hl7.fhir.core/issues/1040

https://github.com/hapifhir/org.hl7.fhir.core/pull/1041

https://github.com/hapifhir/org.hl7.fhir.core/pull/1041

fixes

NullPointerException while comparing profiles

### Problem Description The validator throws an exception while comparing profiles, which constraint meta.profile to some fixed values. ### Steps to reproduce Call the CLI version of validator as follows: `java -jar validator_cli.jar -compare -dest "c:\\Dev\\fhir validator\\compare_results" -version 4.0.1 -ig kbv.ita.for#1.1.0 ig kbv.basis#1.3.0 -left "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient" -right "https://fhir.kbv.de/StructureDefinition/KBV_PR_Base_Patient"` Output: FHIR Validation tool Version 5.6.87 (Git# 6d8cd59f1ee0). Built 2022-12-14T03:25:37.265Z (60 hours old) Java: 11.0.14.1 from C:\\Program Files\\OpenJDK\\openjdk-11.0.14.1_1 on amd64 (64bit). 8136MB available WARNING: Default file encoding is windows-1252 which may cause unexpected results. To fix this issue, run this program with the parameter '-Dfile.encoding=UTF-8' Future releases may not be able to run at all with encoding windows-1252 Valid destination directory provided: "c:\\Dev\\fhir validator\\compare_results") Paths: Current = c:\\Dev\\fhir validator, Package Cache = C:\\Users\\...\\.fhir\\packages Params: -compare -dest "c:\\Dev\\fhir validator\\compare_results" -version 4.0.1 -ig kbv.ita.for#1.1.0 ig kbv.basis#1.3.0 -left https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient -right https://fhir.kbv.de/StructureDefinition/KBV_PR_Base_Patient Load FHIR v4.0 from hl7.fhir.r4.core#4.0.1.: - 4576 resources (00:05.145) Load hl7.terminology#4.0.0 - 4164 resources (00:02.725) Load R5 Extensions - 127 resources (00:02.379) Terminology server http://tx.fhir.org - Version 2.0.14 (00:01.121) Load de.basisprofil.r4#1.3.2 - 177 resources (00:00.219) Load KBV.Basis#1.3.0 - 146 resources (00:01.981) Load kbv.ita.for#1.1.0 - 20 resources (00:00.099) Package Summary: [hl7.fhir.r4.core#4.0.1, hl7.fhir.xver-extensions#0.0.11, hl7.terminology#4.0.0, de.basisprofil.r4#1.3.2, KBV.Basis#1.3.0, kbv.ita.for#1.1.0] Get set... go (00:01.393) Load hl7.fhir.pubpack#0.1.4 - 0 resources (00:00.718) Comparing StructureDefinitions https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient to https://fhir.kbv.de/StructureDefinition/KBV_PR_Base_Patient Generating output to c:\\Dev\\fhir validator\\compare_results... Exception rendering https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient|1.1.0||https://fhir.kbv.de/StructureDefinition/KBV_PR_Base_Patient|1.3.0: null java.lang.NullPointerException at org.hl7.fhir.r5.conformance.ProfileUtilities.generateDescription(ProfileUtilities.java:4151) at org.hl7.fhir.r5.conformance.ProfileUtilities.generateDescription(ProfileUtilities.java:3882) at org.hl7.fhir.r5.conformance.ProfileUtilities.genElementCells(ProfileUtilities.java:3575) at org.hl7.fhir.r5.comparison.ProfileComparer.genElementComp(ProfileComparer.java:1002) at org.hl7.fhir.r5.comparison.ProfileComparer.genElementComp(ProfileComparer.java:1014) at org.hl7.fhir.r5.comparison.ProfileComparer.genElementComp(ProfileComparer.java:1014) at org.hl7.fhir.r5.comparison.ProfileComparer.renderStructure(ProfileComparer.java:937) at org.hl7.fhir.r5.comparison.ComparisonRenderer.renderProfile(ComparisonRenderer.java:224) at org.hl7.fhir.r5.comparison.ComparisonRenderer.renderComparison(ComparisonRenderer.java:144) at org.hl7.fhir.r5.comparison.ComparisonRenderer.processList(ComparisonRenderer.java:111) at org.hl7.fhir.r5.comparison.ComparisonRenderer.render(ComparisonRenderer.java:87) at org.hl7.fhir.validation.cli.services.ComparisonService.compareStructureDefinitions(ComparisonService.java:74) at org.hl7.fhir.validation.cli.services.ComparisonService.doLeftRightComparison(ComparisonService.java:37) at org.hl7.fhir.validation.ValidatorCli.doLeftRightComparison(ValidatorCli.java:265) at org.hl7.fhir.validation.ValidatorCli.main(ValidatorCli.java:131) Done Details of comparison in file:///C:/Dev/fhir%20validator/compare_results/sd-KBV-PR-FOR-Patient-KBV-PR-Base-Patient.html do not exist ### Expected output ``` FHIR Validation tool Version 5.6.89-SNAPSHOT (Git# aaa5c9d6a409). Built 2022-12-16T16:31:11.232+01:00 (8 mins old) Java: 11.0.14.1 from C:\\Program Files\\OpenJDK\\openjdk-11.0.14.1_1 on amd64 (64bit). 8136MB available WARNING: Default file encoding is windows-1252 which may cause unexpected results. To fix this issue, run this program with the parameter '-Dfile.encoding=UTF-8' Future releases may not be able to run at all with encoding windows-1252 Valid destination directory provided: "c:\\Dev\\fhir validator\\compare_results") Paths: Current = c:\\Dev\\fhir validator, Package Cache = C:\\Users\\...\\.fhir\\packages Params: -compare -dest "c:\\Dev\\fhir validator\\compare_results" -version 4.0.1 -ig kbv.ita.for#1.1.0 ig kbv.basis#1.1.3 -left https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient -right https://fhir.kbv.de/StructureDefinition/KBV_PR_Base_Patient Load FHIR v4.0 from hl7.fhir.r4.core#4.0.1.: - 4576 resources (00:04.293) Load hl7.terminology#4.0.0 - 4164 resources (00:01.632) Load R5 Extensions - 127 resources (00:02.129) Terminology server http://tx.fhir.org - Version 2.0.14 (00:01.177) Load de.basisprofil.r4#1.3.2 - 177 resources (00:00.211) Load KBV.Basis#1.3.0 - 146 resources (00:01.896) Load kbv.ita.for#1.1.0 - 20 resources (00:00.092) Package Summary: [hl7.fhir.r4.core#4.0.1, hl7.fhir.xver-extensions#0.0.11, hl7.terminology#4.0.0, de.basisprofil.r4#1.3.2, KBV.Basis#1.3.0, kbv.ita.for#1.1.0] Get set... go (00:01.515) Load hl7.fhir.pubpack#0.1.4 - 0 resources (00:00.753) Comparing StructureDefinitions https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Patient to https://fhir.kbv.de/StructureDefinition/KBV_PR_Base_Patient Generating output to c:\\Dev\\fhir validator\\compare_results... Done ``` Comparison details at file:///C:/Dev/fhir%20validator/compare_results/sd-KBV-PR-FOR-Patient-KBV-PR-Base-Patient.html should exist

aaa5c9d6a4093ec3152a82a9ccd40be7966993fe

84508415efc75a8d17924704870c9272965f2b9e

https://github.com/hapifhir/org.hl7.fhir.core/compare/aaa5c9d6a4093ec3152a82a9ccd40be7966993fe...84508415efc75a8d17924704870c9272965f2b9e

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index 89d0e134a..151a12ad5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -4147,7 +4147,7 @@ public class ProfileUtilities extends TranslatingUtilities { if (!useTableForFixedValues || !allowSubRows || definition.getFixed().isPrimitive()) { String s = buildJson(definition.getFixed()); String link = null; - if (Utilities.isAbsoluteUrl(s)) + if (Utilities.isAbsoluteUrl(s) && pkp != null) link = pkp.getLinkForUrl(corePath, s); c.getPieces().add(checkForNoChange(definition.getFixed(), gen.new Piece(link, s, null).addStyle("color: darkgreen"))); } else {

['org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java']

{'.java': 1}

Java

{'Java': 225424124, 'Batchfile': 790}

Apache License 2.0

hapifhir/org.hl7.fhir.core/1098/1091

hapifhir

org.hl7.fhir.core

https://github.com/hapifhir/org.hl7.fhir.core/issues/1091

https://github.com/hapifhir/org.hl7.fhir.core/pull/1098

https://github.com/hapifhir/org.hl7.fhir.core/pull/1098

fixes

Pluralization code returning constant name instead of template for HAPI-FHIR test

The following test in HAPI-FHIR fails with the new pluralization error message: FhirPathFilterInterceptorTest It is now returning `org.hl7.fhir.exceptions.PathEngineException: FHIRPATH_LEFT_VALUE` where it previously gave the templated message: `org.hl7.fhir.exceptions.PathEngineException: Error performing *: left operand has more than one value`

61e63b128a4c10f29bba4e07beb5b2a277ae46ff

f8fa68cc4a193383f43f6e551280e7323dc84e82

https://github.com/hapifhir/org.hl7.fhir.core/compare/61e63b128a4c10f29bba4e07beb5b2a277ae46ff...f8fa68cc4a193383f43f6e551280e7323dc84e82

diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/IWorkerContext.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/IWorkerContext.java index 0e420ebf6..db92e864a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/IWorkerContext.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/IWorkerContext.java @@ -299,6 +299,8 @@ public interface IWorkerContext { String formatMessage(String theMessage, Object... theMessageArguments); + String formatMessagePlural(Integer pl, String theMessage, Object... theMessageArguments); + void setValidationMessageLanguage(Locale locale); public class ValidationResult { diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java index 2c865e49d..5e55e6401 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java @@ -575,7 +575,7 @@ public class FHIRPathEngine { } private FHIRException makeExceptionPlural(Integer num, ExpressionNode holder, String constName, Object... args) { - String fmt = worker.formatMessage(constName, args); + String fmt = worker.formatMessagePlural(num, constName, args); if (location != null) { fmt = fmt + " "+worker.formatMessage(I18nConstants.FHIRPATH_LOCATION, location); }

['org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/IWorkerContext.java', 'org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java']

{'.java': 2}

Java

{'Java': 225424124, 'Batchfile': 790}

Apache License 2.0

openliberty/ci.maven/1498/1497

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/1497

https://github.com/OpenLiberty/ci.maven/pull/1498

https://github.com/OpenLiberty/ci.maven/pull/1498

fixes

FeatureModifiedException occurring often with multi-module project

Using https://github.ibm.com/was-svt/acme-ee Most attempts to generate features result in two calls to the binary scanner and a FeatureModifiedException. This especially does not make sense for the initial call to the binary scanner as there are no current features passed to the binary scanner. And on calls made afterwards, the current features were all determined by binary scanner from the initial call. Below is some debug output from running `mvn liberty:dev` (including changes from https://github.com/OpenLiberty/ci.common/pull/361 - also confirmed this error occurs without these changes) Initial generate features on startup ``` [DEBUG] Calling binary-app-scanner-22.0.0.2-SNAPSHOT.jar with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m2\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m1\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs20\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityPojoWSes\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityWeb\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS_CDI\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3MDB\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA [DEBUG] Recalling binary scanner with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m2\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m1\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs20\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityPojoWSes\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityWeb\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS_CDI\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3MDB\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA [DEBUG] FeatureModifiedException, modifiedSet containsAll userFeatures, pass modifiedSet on to generateFeatures [DEBUG] User defined features:[] [DEBUG] Features detected by binary scanner which are not in server.xml[ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] ... ... ... [DEBUG] Created file C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\configDropins\\overrides\\generated-features.xml [INFO] Generated the following features: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] ``` Generate features after change to `acme-ee-main\\AcmeCommon\\src\\main\\java\\com\\ibm\\wssvt\\acme\\common\\bean\\StringConfigrable.java` **FeatureModifiedException did not occur in this instance** ``` [DEBUG] Calling binary-app-scanner-22.0.0.2-SNAPSHOT.jar with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeCommon\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA ... ... ... [DEBUG] Parsing the server file for features and includes: config\\server.xml [DEBUG] User defined features:null [DEBUG] Features detected by binary scanner which are not in server.xml[ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] [DEBUG] Xml document we'll try to update after generate features doc=io.openliberty.tools.common.plugins.config.ServerConfigXmlDocument@63e7de46 file=C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\server.xml ... ... ... [DEBUG] Created file C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\configDropins\\overrides\\generated-features.xml [INFO] Generated the following features: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] ``` Generate features after change to `acme-ee-main\\AcmeAnnuityJAXRSCommon\\src\\main\\java\\com\\ibm\\wssvt\\acme\\annuity\\common\\business\\jaxrs\\MyJAXBResolver.java` ``` [DEBUG] Calling binary-app-scanner-22.0.0.2-SNAPSHOT.jar with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSCommon\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA [DEBUG] Recalling binary scanner with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m2\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m1\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs20\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityPojoWSes\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityWeb\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS_CDI\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3MDB\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA [DEBUG] Parsing the server file for features and includes: config\\server.xml [DEBUG] FeatureModifiedException, modifiedSet containsAll userFeatures, pass modifiedSet on to generateFeatures [DEBUG] Parsing the server file for features and includes: config\\server.xml [DEBUG] User defined features:null [DEBUG] Features detected by binary scanner which are not in server.xml[ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] [DEBUG] Xml document we'll try to update after generate features doc=io.openliberty.tools.common.plugins.config.ServerConfigXmlDocument@617cafc6 file=C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\server.xml ... ... ... [DEBUG] Created file C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\configDropins\\overrides\\generated-features.xml [INFO] Generated the following features: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] ``` Generate features after change to `acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs20\\src\\main\\java\\com\\ibm\\wssvt\\acme\\annuity\\business\\impl\\jaxrs\\AnnuityMgmtSvcJAXRS.java` ``` [DEBUG] Calling binary-app-scanner-22.0.0.2-SNAPSHOT.jar with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs20\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA [DEBUG] Recalling binary scanner with the following inputs... binaryInputs: [C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m2\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs11_m1\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSWSes_jaxrs20\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityJAXRSCommon\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityPojoWSes\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityWeb\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3JAXWS_CDI\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3MDB\\target\\classes, C:\\Projects\\acme-ee-main\\AcmeAnnuityEJB3\\target\\classes] targetJavaEE: ee7 targetMicroP: null currentFeatures: [] logLocation: C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\target logLevel: *=FINE locale: en_CA [DEBUG] Parsing the server file for features and includes: config\\server.xml [DEBUG] FeatureModifiedException, modifiedSet containsAll userFeatures, pass modifiedSet on to generateFeatures [DEBUG] Parsing the server file for features and includes: config\\server.xml [DEBUG] User defined features:null [DEBUG] Features detected by binary scanner which are not in server.xml[ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] [DEBUG] Xml document we'll try to update after generate features doc=io.openliberty.tools.common.plugins.config.ServerConfigXmlDocument@ba05f301 file=C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\server.xml ... ... ... [DEBUG] Created file C:\\Projects\\acme-ee-main\\AcmeWebEjbEar\\src\\main\\liberty\\config\\configDropins\\overrides\\generated-features.xml [INFO] Generated the following features: [ejbLite-3.2, servlet-3.1, beanValidation-1.1, jndi-1.0, jaxws-2.2, jms-2.0, samlWeb-2.0, appSecurity-2.0, jaxrs-2.0, socialLogin-1.0, ejbRemote-3.2, jaxb-2.2, openidConnectServer-1.0, mdb-3.2, cdi-1.2, jpa-2.1] ``` Full debug output: [debugOutput.txt](https://github.com/OpenLiberty/ci.maven/files/8584560/debugOutput.txt)

3ac9f7471d908f25776044e63821800b6a982cea

2271d29bb9905cfca8c705a0b49c826d628511fa

https://github.com/openliberty/ci.maven/compare/3ac9f7471d908f25776044e63821800b6a982cea...2271d29bb9905cfca8c705a0b49c826d628511fa

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java index dea8e295..52bb2cc3 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java @@ -200,16 +200,20 @@ public class GenerateFeaturesMojo extends ServerFeatureSupport { Set<String> userFeatures = (optimize) ? existingFeatures : getServerFeatures(servUtil, generatedFiles, true); // user features excludes generatedFiles Set<String> modifiedSet = featuresModified.getFeatures(); // a set that works after being modified by the scanner - if (modifiedSet.containsAll(userFeatures)) { // none of the user features were modified, only features which were generated earlier. - log.debug("FeatureModifiedException, modifiedSet containsAll userFeatures, pass modifiedSet on to generateFeatures"); + log.debug( + "FeatureModifiedException, modifiedSet containsAll userFeatures, pass modifiedSet on to generateFeatures"); + // features were modified to get a working set with the application's API usage, display warning to users and use modified set + log.warn(featuresModified.getMessage()); scannedFeatureList = modifiedSet; } else { Set<String> allAppFeatures = featuresModified.getSuggestions(); // suggestions are scanned from binaries allAppFeatures.addAll(userFeatures); // scanned plus configured features were detected to be in conflict log.debug("FeatureModifiedException, combine suggestions from scanner with user features in error msg"); - throw new MojoExecutionException(String.format(BinaryScannerUtil.BINARY_SCANNER_CONFLICT_MESSAGE1, allAppFeatures, modifiedSet)); + throw new MojoExecutionException( + String.format(BinaryScannerUtil.BINARY_SCANNER_CONFLICT_MESSAGE1, allAppFeatures, modifiedSet)); + } } catch (BinaryScannerUtil.RecommendationSetException showRecommendation) { if (showRecommendation.isExistingFeaturesConflict()) {

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

openliberty/ci.maven/588/584

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/584

https://github.com/OpenLiberty/ci.maven/pull/588

https://github.com/OpenLiberty/ci.maven/pull/588

fixes

Issuing using `serverXmlFile` config parm in dev mode; parms with 'alias' don't propagate via mojo executor

Using a config parm like: `<configFile>src/main/liberty/config/server.xml</configFile>` leads to this failure in dev mode: > [ERROR] Failed to execute goal io.openliberty.tools:liberty-maven-plugin:3.0.1:dev (default-cli) on project demo: Unable to execute mojo: Unable to parse configuration of mojo io.openliberty.tools:liberty-maven-plugin:3.0.1:create for parameter configFile: Cannot find 'configFile' in class io.openliberty.tools.maven.server.CreateServerMojo -> [Help 1] The problem seems to be either a limitation (or bug?) with mojo-executor for parameters defined with an alias. The alias value cannot be used in the way it's being used, it seems. So the parameter with alias is defined here: public class StartDebugMojoSupport extends BasicSupport { @Parameter(alias="configFile", property = "serverXmlFile") protected File serverXmlFile; and DevMojo is using the alias like this: elements.add(element(name("configFile"), serverXmlFile.getCanonicalPath())); A simple change to use the regular (non-alias property name) seems to fix this: elements.add(element(name("configFile"), serverXmlFile.getCanonicalPath())); -------- It suggests there could be other issues to at least watch out for in the code, if not to fix now. E.g. there is at least one other alias: @Parameter(property = "deployPackages", defaultValue = "project", alias = "installAppPackages") private String deployPackages;

4af2bd99885e79aed550a0a97a65985df7e76a17

f60e03e9989a348a9667b1c8c0bc92516262c0f3

https://github.com/openliberty/ci.maven/compare/4af2bd99885e79aed550a0a97a65985df7e76a17...f60e03e9989a348a9667b1c8c0bc92516262c0f3

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java index d1ec8439..c12637f8 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java @@ -791,11 +791,11 @@ public class DevMojo extends StartDebugMojoSupport { elements.add(element(name("stripVersion"), "true")); elements.add(element(name("deployPackages"), "project")); if (serverXmlFile != null) { - elements.add(element(name("configFile"), serverXmlFile.getCanonicalPath())); + elements.add(element(name("serverXmlFile"), serverXmlFile.getCanonicalPath())); } } else if (goal.equals("create")) { if (serverXmlFile != null) { - elements.add(element(name("configFile"), serverXmlFile.getCanonicalPath())); + elements.add(element(name("serverXmlFile"), serverXmlFile.getCanonicalPath())); } if (assemblyArtifact != null) { Element[] featureElems = new Element[4];

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

openliberty/ci.maven/576/575

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/575

https://github.com/OpenLiberty/ci.maven/pull/576

https://github.com/OpenLiberty/ci.maven/pull/576

fixes

Dev mode misses configuration for deploy

Dev mode includes configuration for `install-apps`, but since that is now called `deploy`, dev mode needs to set that configuration properly.

40acae091a517cb2777a85be57c195ad73a48e54

ea58e53a4cd7d9c3aa1002ef0cd06ae491d309d0

https://github.com/openliberty/ci.maven/compare/40acae091a517cb2777a85be57c195ad73a48e54...ea58e53a4cd7d9c3aa1002ef0cd06ae491d309d0

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java index d011934c..f8e5ef3b 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java @@ -780,7 +780,7 @@ public class DevMojo extends StartDebugMojoSupport { featureElems[i] = element(name("feature"), dependencies.get(i)); } elements.add(element(name("features"), featureElems)); - } else if (goal.equals("install-apps")) { + } else if (goal.equals("deploy")) { String appsDirectory = MavenProjectUtil.getPluginExecutionConfiguration(project, LIBERTY_MAVEN_PLUGIN_GROUP_ID, LIBERTY_MAVEN_PLUGIN_ARTIFACT_ID, "deploy", "appsDirectory"); if (appsDirectory != null) {

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

openliberty/ci.maven/913/909

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/909

https://github.com/OpenLiberty/ci.maven/pull/913

https://github.com/OpenLiberty/ci.maven/pull/913

fixes

compile-jsp does not honor skip parameter

The compile-jsp goal does not honor the skip parameter. I think it probably should.

e01e137637b8d6c4b349a715329b96b14b0fb0be

15e27c85f53f565462e4a470667d19c2d449e1a0

https://github.com/openliberty/ci.maven/compare/e01e137637b8d6c4b349a715329b96b14b0fb0be...15e27c85f53f565462e4a470667d19c2d449e1a0

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/jsp/CompileJspMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/jsp/CompileJspMojo.java index 241a6fd8..62899ffa 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/jsp/CompileJspMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/jsp/CompileJspMojo.java @@ -57,6 +57,11 @@ public class CompileJspMojo extends InstallFeatureSupport { @Override protected void doExecute() throws Exception { + if (skip) { + getLog().info("\\nSkipping compile-jsp goal.\\n"); + return; + } + CompileJSPs compile = (CompileJSPs) ant.createTask("antlib:io/openliberty/tools/ant:compileJSPs"); if (compile == null) { throw new IllegalStateException(

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/jsp/CompileJspMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

openliberty/ci.maven/1308/1301

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/1301

https://github.com/OpenLiberty/ci.maven/pull/1308

https://github.com/OpenLiberty/ci.maven/pull/1308

fixes

In some cases blank lines are added to server.xml

The generateFeatures mojo adds a comment to server.xml indicating that a new file has been created to handle Liberty features generated by the mojo. In some cases adding that comment incorrectly adds multiple extra blank lines. We need to find out what triggers this behaviour and either fix it or stop adding the comment until we do.

990f2db1e14b3d69c1bd98791f6de931deb27d3e

1a4a49dc33110088753911d5b9ce0102623d0eba

https://github.com/openliberty/ci.maven/compare/990f2db1e14b3d69c1bd98791f6de931deb27d3e...1a4a49dc33110088753911d5b9ce0102623d0eba

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java index 06428ada..ac686422 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java @@ -39,6 +39,7 @@ import org.apache.maven.project.MavenProject; import org.xml.sax.SAXException; import io.openliberty.tools.common.plugins.config.ServerConfigXmlDocument; +import io.openliberty.tools.common.plugins.config.XmlDocument; import io.openliberty.tools.common.plugins.util.InstallFeatureUtil; import io.openliberty.tools.common.plugins.util.PluginExecutionException; import io.openliberty.tools.maven.BasicSupport; @@ -273,9 +274,9 @@ public class GenerateFeaturesMojo extends InstallFeatureSupport { return; } try { - if (doc.findFMComment(FEATURES_FILE_MESSAGE) == null) { - doc.createFMComment(FEATURES_FILE_MESSAGE); - doc.writeXMLDocument(serverXml); + if (doc.createFMComment(FEATURES_FILE_MESSAGE)) { + doc.writeXMLDocument(serverXml); + XmlDocument.addNewlineBeforeFirstElement(serverXml); } } catch (IOException | TransformerException e) { log.debug("Exception adding comment to server.xml", e);

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

openliberty/ci.maven/1378/1355

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/1355

https://github.com/OpenLiberty/ci.maven/pull/1378

https://github.com/OpenLiberty/ci.maven/pull/1378

fixes

Generate features, standalone goal with conflict throws RequiredFeatureModifiedException

Requires some investigation. Running the generate-features goal standalone with a conflict, ie. on the demo-devmode project (https://github.com/OpenLiberty/demo-devmode/tree/main) with setting only feature specified in server.xml: `webProfile-7.0` the following exception is thrown: com.ibm.ws.report.exceptions.RequiredFeatureModifiedException Running the dev goal, once in the inner loop and adding the `webProfile-7.0` feature to the server.xml, the following conflict exception is thrown: https://github.com/OpenLiberty/ci.common/blob/main/src/main/java/io/openliberty/tools/common/plugins/util/BinaryScannerUtil.java#L32 Would have expected that both cases would throw the same error. Also observed with Liberty Gradle Plugin

a595c9a9bc90e4f6a7823725ec73223f6dcac3b8

d987dd900958a2990b9f7a7090f5f1b5e64cc721

https://github.com/openliberty/ci.maven/compare/a595c9a9bc90e4f6a7823725ec73223f6dcac3b8...d987dd900958a2990b9f7a7090f5f1b5e64cc721

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java index cce72745..a6eb3ddc 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java @@ -17,7 +17,6 @@ package io.openliberty.tools.maven.server; import java.io.File; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -158,19 +157,11 @@ public class GenerateFeaturesMojo extends ServerFeatureSupport { // get existing server features from source directory ServerFeatureUtil servUtil = getServerFeatureUtil(); - servUtil.setLowerCaseFeatures(false); Set<String> generatedFiles = new HashSet<String>(); generatedFiles.add(GENERATED_FEATURES_FILE_NAME); - // if optimizing, ignore generated files when passing in existing features to - // binary scanner - Set<String> existingFeatures = servUtil.getServerFeatures(configDirectory, serverXmlFile, - new HashMap<String, File>(), optimize ? generatedFiles : null); - if (existingFeatures == null) { - existingFeatures = new HashSet<String>(); - } - servUtil.setLowerCaseFeatures(true); + Set<String> existingFeatures = getServerFeatures(servUtil, generatedFiles, optimize); Set<String> scannedFeatureList = null; try { @@ -180,6 +171,21 @@ public class GenerateFeaturesMojo extends ServerFeatureSupport { scannedFeatureList = binaryScannerHandler.runBinaryScanner(existingFeatures, classFiles, directories, eeVersion, mpVersion, optimize); } catch (BinaryScannerUtil.NoRecommendationException noRecommendation) { throw new MojoExecutionException(String.format(BinaryScannerUtil.BINARY_SCANNER_CONFLICT_MESSAGE3, noRecommendation.getConflicts())); + } catch (BinaryScannerUtil.FeatureModifiedException featuresModified) { + Set<String> userFeatures = (optimize) ? existingFeatures : + getServerFeatures(servUtil, generatedFiles, true); // user features excludes generatedFiles + Set<String> modifiedSet = featuresModified.getFeatures(); // a set that works after being modified by the scanner + + if (modifiedSet.containsAll(userFeatures)) { + // none of the user features were modified, only features which were generated earlier. + log.debug("FeatureModifiedException, modifiedSet containsAll userFeatures, pass modifiedSet on to generateFeatures"); + scannedFeatureList = modifiedSet; + } else { + Set<String> allAppFeatures = featuresModified.getSuggestions(); // suggestions are scanned from binaries + allAppFeatures.addAll(userFeatures); // scanned plus configured features were detected to be in conflict + log.debug("FeatureModifiedException, combine suggestions from scanner with user features in error msg"); + throw new MojoExecutionException(String.format(BinaryScannerUtil.BINARY_SCANNER_CONFLICT_MESSAGE1, allAppFeatures, modifiedSet)); + } } catch (BinaryScannerUtil.RecommendationSetException showRecommendation) { if (showRecommendation.isExistingFeaturesConflict()) { throw new MojoExecutionException(String.format(BinaryScannerUtil.BINARY_SCANNER_CONFLICT_MESSAGE2, showRecommendation.getConflicts(), showRecommendation.getSuggestions())); @@ -259,6 +265,20 @@ public class GenerateFeaturesMojo extends ServerFeatureSupport { } } + // Get the features from the server config and optionally exclude the specified config files from the search. + private Set<String> getServerFeatures(ServerFeatureUtil servUtil, Set<String> generatedFiles, boolean excludeGenerated) { + servUtil.setLowerCaseFeatures(false); + // if optimizing, ignore generated files when passing in existing features to + // binary scanner + Set<String> existingFeatures = servUtil.getServerFeatures(configDirectory, serverXmlFile, + new HashMap<String, File>(), excludeGenerated ? generatedFiles : null); // pass generatedFiles to exclude them + if (existingFeatures == null) { + existingFeatures = new HashSet<String>(); + } + servUtil.setLowerCaseFeatures(true); + return existingFeatures; + } + /** * Gets the binary scanner jar file from the local cache. * Downloads it first from connected repositories such as Maven Central if a newer release is available than the cached version.

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

openliberty/ci.maven/1351/1350

openliberty

ci.maven

https://github.com/OpenLiberty/ci.maven/issues/1350

https://github.com/OpenLiberty/ci.maven/pull/1351

https://github.com/OpenLiberty/ci.maven/pull/1351

fixes

Check correct dependencies for Java EE version

We currently check 'io.openliberty.features' but we should check 'javax.javaee-api' - [x] Maven - [x] Gradle

c64cdf1dfa268bb96e98c4fc2af305789f02f34c

44058dafe800c9b65c2f99c1def749a7774a4762

https://github.com/openliberty/ci.maven/compare/c64cdf1dfa268bb96e98c4fc2af305789f02f34c...44058dafe800c9b65c2f99c1def749a7774a4762

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java index a0997a82..0cac1f55 100644 --- a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java +++ b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java @@ -356,22 +356,17 @@ public class GenerateFeaturesMojo extends ServerFeatureSupport { continue; } log.debug("getEEVersion, dep="+d.getGroupId()+":"+d.getArtifactId()+":"+d.getVersion()); - if (d.getGroupId().equals("io.openliberty.features")) { - String id = d.getArtifactId(); - if (id.equals("javaee-7.0")) { - return "ee7"; - } else if (id.equals("javaee-8.0")) { + if (d.getGroupId().equals("javax") && d.getArtifactId().equals("javaee-api")) { + if (d.getVersion().startsWith("8.")) { return "ee8"; - } else if (id.equals("javaeeClient-7.0")) { + } else if (d.getVersion().startsWith("7.")) { return "ee7"; - } else if (id.equals("javaeeClient-8.0")) { - return "ee8"; - } else if (id.equals("jakartaee-8.0")) { - return "ee8"; + } else if (d.getVersion().startsWith("6.")) { + return "ee6"; } } else if (d.getGroupId().equals("jakarta.platform") && d.getArtifactId().equals("jakarta.jakartaee-api") && - d.getVersion().equals("8.0.0")) { + d.getVersion().startsWith("8.")) { return "ee8"; } }

['liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/GenerateFeaturesMojo.java']

{'.java': 1}

Java

{'Java': 1252613, 'Dockerfile': 4974, 'HTML': 1606, 'Shell': 473, 'Batchfile': 12}

Apache License 2.0

apache/incubator-wayang/226/225

apache

incubator-wayang

https://github.com/apache/incubator-wayang/issues/225

https://github.com/apache/incubator-wayang/pull/226

https://github.com/apache/incubator-wayang/pull/226

close

Operator Distinct One value

The distinct operator just shows one value independent of the value that could have

5840b1de654804db5d0ad9ff6333c19ec2e64492

54046d6561cb24408ee393a4b402fd8970b5d2bb

https://github.com/apache/incubator-wayang/compare/5840b1de654804db5d0ad9ff6333c19ec2e64492...54046d6561cb24408ee393a4b402fd8970b5d2bb

diff --git a/wayang-platforms/wayang-flink/code/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java b/wayang-platforms/wayang-flink/code/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java index 732c7453..38d33f8e 100644 --- a/wayang-platforms/wayang-flink/code/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java +++ b/wayang-platforms/wayang-flink/code/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java @@ -18,6 +18,7 @@ package org.apache.wayang.flink.compiler; +import java.io.IOException; import org.apache.flink.api.java.functions.KeySelector; import java.io.ByteArrayOutputStream; @@ -36,7 +37,7 @@ public class KeySelectorDistinct<T> implements KeySelector<T, String>, Serializa ObjectOutputStream objStream = new ObjectOutputStream(b); objStream.writeObject(value); return Base64.getEncoder().encodeToString(b.toByteArray()); - }finally { + }catch (IOException e) { return ""; } } diff --git a/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkDistinctOperatorTest.java b/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkDistinctOperatorTest.java index 6edb68ea..80f749f7 100644 --- a/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkDistinctOperatorTest.java +++ b/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkDistinctOperatorTest.java @@ -54,11 +54,10 @@ public class FlinkDistinctOperatorTest extends FlinkOperatorTestBase{ // Verify the outcome. final List<Integer> result = ((DataSetChannel.Instance) outputs[0]).<Integer>provideDataSet().collect(); - for(Object e : result){ - System.out.println(e); - } + Assert.assertEquals(4, result.size()); - Assert.assertEquals(Arrays.asList(0, 1, 6, 2), result); + result.sort((a, b) -> a - b); + Assert.assertEquals(Arrays.asList(0, 1, 2, 6), result); } } diff --git a/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkJoinOperatorTest.java b/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkJoinOperatorTest.java index d4b0e4be..75313b45 100644 --- a/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkJoinOperatorTest.java +++ b/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkJoinOperatorTest.java @@ -25,17 +25,26 @@ import org.apache.wayang.core.types.DataSetType; import org.apache.wayang.core.types.DataUnitType; import org.apache.wayang.flink.channels.DataSetChannel; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Disabled; import java.util.Arrays; import java.util.List; + //problematic /** * Test suite for {@link FlinkJoinOperator}. */ public class FlinkJoinOperatorTest extends FlinkOperatorTestBase{ + + //TODO: Validate FlinkJoinOperator implementation + // it is required to validate the implementation of FlinkJoinOperator + // because trigger an exception in the test and looks like is a problem in the + // implementation of the implementation in the operator + // labels:flink,bug @Test + @Disabled("until validation of implementation of the FlinkJoinOperator") public void testExecution() throws Exception { // Prepare test data. DataSetChannel.Instance input0 = this.createDataSetChannelInstance(Arrays.asList( diff --git a/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkReduceByOperatorTest.java b/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkReduceByOperatorTest.java index cf68d357..63157809 100644 --- a/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkReduceByOperatorTest.java +++ b/wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkReduceByOperatorTest.java @@ -26,7 +26,8 @@ import org.apache.wayang.core.types.DataSetType; import org.apache.wayang.core.types.DataUnitType; import org.apache.wayang.flink.channels.DataSetChannel; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Disabled; import java.util.Arrays; import java.util.HashSet; @@ -38,7 +39,14 @@ import java.util.stream.Collectors; * Test suite for {@link FlinkReduceByOperator}. */ public class FlinkReduceByOperatorTest extends FlinkOperatorTestBase{ + + //TODO: Validate FlinkReduceByOperator implementation + // it is required to validate the implementation of FlinkReduceByOperator + // because trigger an exception in the test and looks like is a problem in the + // implementation of the implementation in the operator + // labels:flink,bug @Test + @Disabled("until validation of implementation of the FlinkReduceByOperator") public void testExecution() throws Exception { // Prepare test data. List<Tuple2<String, Integer>> inputList = Arrays.stream("aaabbccccdeefff".split(""))

['wayang-platforms/wayang-flink/code/main/java/org/apache/wayang/flink/compiler/KeySelectorDistinct.java', 'wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkJoinOperatorTest.java', 'wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkDistinctOperatorTest.java', 'wayang-platforms/wayang-flink/code/test/java/org/apache/wayang/flink/operators/FlinkReduceByOperatorTest.java']

{'.java': 4}

Java

{'Java': 4320410, 'Scala': 316955, 'Python': 242747, 'Vue': 46457, 'Shell': 32312, 'HTML': 17437, 'JavaScript': 15009, 'CSS': 13475, 'Groovy': 7176, 'Dockerfile': 2399, 'ANTLR': 1965, 'SCSS': 1094, 'Ruby': 1089}

Apache License 2.0

mzmine/mzmine3/625/575

mzmine

mzmine3

https://github.com/mzmine/mzmine3/issues/575

https://github.com/mzmine/mzmine3/pull/625

https://github.com/mzmine/mzmine3/pull/625

fixes

[Bug] Ion Identity: Cannot import custom adducts/modifications list from csv

### Basic information * My operating system: MacOS 12.3 * My MZmine version: 3.0.0-beta ### What happened * Please describe what happened and how it differs from what you expected to happen. I tried importing a custom adducts.csv file but it does not load desired adducts. * Please include all parameter values for the MZmine modules you used. No parameters used, just did: `Feature list methods > Feature grouping > Add more ion identities` You can try exporting the default list and re-importing while adding a single dummy line it does not work * Please upload screenshots of any errors and your log/mzmine.log file. ``` 2022-03-07 18:24:51 WARNING io.github.mzmine.parameters.parametertypes.MultiChoiceComponent loadChoices Line length is different to header length: 5 to 5 ``` * Please upload an MZmine project file that demonstrates the problem you are reporting. NA

de589e62b0e2c57cd2e6d84f833f99b2f0d913fc

6cc2e4606411d854b05a0bb76008ba866ff43602

https://github.com/mzmine/mzmine3/compare/de589e62b0e2c57cd2e6d84f833f99b2f0d913fc...6cc2e4606411d854b05a0bb76008ba866ff43602

diff --git a/src/main/java/io/github/mzmine/parameters/parametertypes/MultiChoiceComponent.java b/src/main/java/io/github/mzmine/parameters/parametertypes/MultiChoiceComponent.java index d361e3ec4..803a86a59 100644 --- a/src/main/java/io/github/mzmine/parameters/parametertypes/MultiChoiceComponent.java +++ b/src/main/java/io/github/mzmine/parameters/parametertypes/MultiChoiceComponent.java @@ -1,19 +1,19 @@ /* - * Copyright 2006-2018 The MZmine 2 Development Team - * - * This file is part of MZmine 2. - * - * MZmine 2 is free software; you can redistribute it and/or modify it under the terms of the GNU + * Copyright 2006-2021 The MZmine Development Team + * + * This file is part of MZmine. + * + * MZmine is free software; you can redistribute it and/or modify it under the terms of the GNU * General Public License as published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. - * - * MZmine 2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * + * MZmine is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with MZmine 2; if not, - * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA + * + * You should have received a copy of the GNU General Public License along with MZmine; if not, + * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * */ package io.github.mzmine.parameters.parametertypes; @@ -25,7 +25,19 @@ import io.github.mzmine.main.MZmineCore; import io.github.mzmine.parameters.ParameterSet; import io.github.mzmine.util.ExitCode; import io.github.mzmine.util.StringMapParser; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; @@ -37,37 +49,23 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; import org.controlsfx.control.CheckListView; - -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; +import org.controlsfx.control.IndexedCheckModel; /** + * */ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPane { - private final Logger logger = Logger.getLogger(getClass().getName()); - // Filename extension. - private static final FileChooser.ExtensionFilter csvFilter = - new FileChooser.ExtensionFilter("Comma-separated values files", "*.csv"); - private final CheckListView<T> adductsView = - new CheckListView<>(FXCollections.observableArrayList()); + // Filename extension. + private static final FileChooser.ExtensionFilter csvFilter = new FileChooser.ExtensionFilter( + "Comma-separated values files", "*.csv"); + private final Logger logger = Logger.getLogger(getClass().getName()); + private final CheckListView<T> adductsView = new CheckListView<>( + FXCollections.observableArrayList()); private final Label lbTitle; - private final Button addButton = new Button("Add..."); - private final Button importButton = new Button("Import..."); - private final Button exportButton = new Button("Export..."); - private final Button defaultButton = new Button("Reset"); private final VBox buttonBar = new VBox(); - - private final List<T> defaultChoices; - - private StringMapParser<T> parser; - + private final StringMapParser<T> parser; /** * Create the component. @@ -75,45 +73,79 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa * @param choices the adduct choices. */ public MultiChoiceComponent(List<T> choices, List<T> defaultChoices, Supplier<T> addChoiceParam, - StringMapParser<T> parser) { - this(choices, defaultChoices, addChoiceParam, parser, true, true, true, true); + StringMapParser<T> parser) { + this(choices, defaultChoices, addChoiceParam, parser, true, true, true, true, true, true); } + /** * Create the component. * - * @param choices the adduct choices. + * @param choices the adduct choices. * @param addChoiceParam usually a ParameterSet as ObjectGenerator to add new choices */ - public MultiChoiceComponent(List<T> choices, List<T> defaultChoices, Supplier<T> addChoiceParam, StringMapParser<T> parser, - boolean btnAdd, boolean btnImport, boolean btnExport, boolean btnDefault) { - this.defaultChoices = defaultChoices; + public MultiChoiceComponent(List<T> choices, List<T> defaultChoices, Supplier<T> addChoiceParam, + StringMapParser<T> parser, boolean btnToggleSelect, boolean btnClear, boolean btnAdd, + boolean btnImport, boolean btnExport, boolean btnDefault) { this.parser = parser; setChoices(choices); buttonBar.setSpacing(10.0); - if(btnAdd) - buttonBar.getChildren().addAll(addButton); - if(btnImport) + Button importButton = new Button("Import..."); + if (btnImport) { buttonBar.getChildren().addAll(importButton); - if(btnExport) + } + Button exportButton = new Button("Export..."); + if (btnExport) { buttonBar.getChildren().addAll(exportButton); - if(btnDefault) + } + Button toggleSelectButton = new Button("(De)select"); + if (btnToggleSelect) { + buttonBar.getChildren().addAll(toggleSelectButton); + } + Button clearButton = new Button("Clear"); + if (btnClear) { + buttonBar.getChildren().addAll(clearButton); + } + Button addButton = new Button("Add..."); + if (btnAdd) { + buttonBar.getChildren().addAll(addButton); + } + Button defaultButton = new Button("Reset"); + if (btnDefault) { buttonBar.getChildren().addAll(defaultButton); + } lbTitle = new Label(""); setTop(lbTitle); setCenter(adductsView); setRight(buttonBar); + clearButton.setTooltip(new Tooltip("Remove all items")); + clearButton.setOnAction(e -> adductsView.getItems().clear()); + + toggleSelectButton.setTooltip(new Tooltip("Toggle selection")); + toggleSelectButton.setOnAction(e -> { + final IndexedCheckModel<T> model = adductsView.getCheckModel(); + final ObservableList<T> items = adductsView.getItems(); + if (items.size() > 0) { + boolean newState = !model.isChecked(items.get(0)); + model.clearChecks(); + if (newState) { + for (T adduct : items) { + model.check(adduct); + } + } + } + }); + addButton.setTooltip(new Tooltip("Add a custom choice to the set of choices")); addButton.setOnAction(e -> { - if(addChoiceParam==null) { + if (addChoiceParam == null) { return; } // Show dialog. - if(addChoiceParam instanceof ParameterSet) { - final ParameterSet parameters = ((ParameterSet)addChoiceParam); + if (addChoiceParam instanceof final ParameterSet parameters) { if (parameters.showSetupDialog(true) == ExitCode.OK) { // Add to list of choices (if not already present). T choice = addChoiceParam.get(); @@ -122,15 +154,14 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa currentChoices.add(choice); } } - } - else { + } else { try { T choice = addChoiceParam.get(); final Collection<T> currentChoices = adductsView.getItems(); if (!currentChoices.contains(choice)) { currentChoices.add(choice); } - } catch(Exception ex) { + } catch (Exception ex) { logger.warning("Cannot create new choice"); } } @@ -145,8 +176,9 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa final File file = fileChooser.showOpenDialog(this.getScene().getWindow()); // Select a file. - if (file == null) + if (file == null) { return; + } // Read the CSV file into a string array. String[][] csvLines = null; @@ -159,8 +191,9 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa } // Read the adducts data. - if (csvLines == null) + if (csvLines == null) { return; + } // Load adducts from CSV data into parent choices. loadChoices(csvLines, adductsView.getItems()); @@ -174,8 +207,9 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa fileChooser.getExtensionFilters().add(csvFilter); final File file = fileChooser.showSaveDialog(this.getScene().getWindow()); - if (file == null) + if (file == null) { return; + } // Export the adducts. try { @@ -199,14 +233,26 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa return new ArrayList<>(adductsView.getItems()); } + public void setChoices(List<T> choices) { + adductsView.getItems().clear(); + adductsView.getItems().addAll(choices); + } + + @SafeVarargs + public final void setChoices(T... choices) { + adductsView.getItems().clear(); + adductsView.getItems().addAll(choices); + } + public List<T> getValue() { return new ArrayList<>(adductsView.getCheckModel().getCheckedItems()); } public void setValue(List<T> newValue) { - adductsView.getCheckModel().clearChecks();; - for (T adduct : newValue) + adductsView.getCheckModel().clearChecks(); + for (T adduct : newValue) { adductsView.getCheckModel().check(adduct); + } } public String getTitle() { @@ -230,46 +276,47 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa /** * Load the adducts into the list of adduct choices. * - * @param lines CSV lines to parse. + * @param lines CSV lines to parse. * @param choices the current adduct choices. * @return a new list of adduct choices that includes the original choices plus any new ones found - * by parsing the CSV lines. + * by parsing the CSV lines. */ private void loadChoices(final String[][] lines, final Collection<T> choices) { - if(lines.length<2) + if (lines.length < 2) { return; + } // load a list of choices. String[] header = lines[0]; - for (int l=1; l<lines.length; l++) { + for (int l = 1; l < lines.length; l++) { String[] line = lines[l]; - if(lines.length!=header.length) { - logger.warning("Line length is different to header length: "+line.length+" to "+header.length); + if (line.length != header.length) { + logger.warning( + "Line length is different to header length: " + line.length + " to " + header.length); continue; } // map with values - Map<String,String> map = new HashMap<>(); - for(int f=0; f<line.length; f++) { + Map<String, String> map = new HashMap<>(); + for (int f = 0; f < line.length; f++) { map.put(header[f], line[f]); } try { // Create new choice - if(parser!=null) { + if (parser != null) { final T choice = parser.parseDataMap(map); if (!choices.contains(choice)) { choices.add(choice); } } } catch (Exception ignored) { - logger.warning("Cannot parse new choice: "+line); + logger.warning("Cannot parse new choice: " + Arrays.toString(line)); } } } - /** * Writes the choices to a CSV file. * - * @param file the destination file. + * @param file the destination file. * @param choices the choices to export. * @throws IOException if there are i/o problems. */ @@ -287,13 +334,4 @@ public class MultiChoiceComponent<T extends StringMapParser<T>> extends BorderPa writer.writeln(map.values().toArray(String[]::new)); } } - - public void setChoices(List<T> choices) { - adductsView.getItems().clear(); - adductsView.getItems().addAll(choices); - } - public void setChoices(T... choices) { - adductsView.getItems().clear(); - adductsView.getItems().addAll(choices); - } } diff --git a/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationComponent.java b/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationComponent.java index 92f907b48..e09a27c41 100644 --- a/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationComponent.java +++ b/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationComponent.java @@ -30,7 +30,6 @@ import javafx.scene.layout.HBox; /** * A component for selecting adducts. - * */ public class IonModificationComponent extends HBox { @@ -42,26 +41,29 @@ public class IonModificationComponent extends HBox { * * @param choicesAdducts the adduct choices. */ - public IonModificationComponent(List<IonModification> choicesAdducts, List<IonModification> choicesMods) { + public IonModificationComponent(List<IonModification> choicesAdducts, + List<IonModification> choicesMods) { setFillHeight(true); setSpacing(5); - adducts = new MultiChoiceComponent<>(choicesAdducts, List.of(IonModification.getDefaultValuesPos()), null, - IonModification.H, // just any object as a parser - false, true, true, false - ); + adducts = new MultiChoiceComponent<>(choicesAdducts, + List.of(IonModification.getDefaultValuesPos()), null, IonModification.H, + // just any object as a parser + true, true, false, true, true, false); // add top label adducts.setTitle("Adducts"); // add buttons adducts.addButton("Add", new AddIonModificationAction(adducts)); adducts.addButton("Combine", new CombineESIAdductsAction(adducts)); - adducts.addButton("Reset positive", (e) -> adducts.setChoices(IonModification.getDefaultValuesPos())); - adducts.addButton("Reset negative", (e) -> adducts.setChoices(IonModification.getDefaultValuesNeg())); + adducts.addButton("Reset positive", + (e) -> adducts.setChoices(IonModification.getDefaultValuesPos())); + adducts.addButton("Reset negative", + (e) -> adducts.setChoices(IonModification.getDefaultValuesNeg())); - mods = new MultiChoiceComponent<IonModification>(choicesMods, List.of(IonModification.getDefaultModifications()), null, - IonModification.H, // just any object as a parser - false, true, true, false - ); + mods = new MultiChoiceComponent<>(choicesMods, + List.of(IonModification.getDefaultModifications()), null, IonModification.H, + // just any object as a parser + true, true, false, true, true, false); // add top label mods.setTitle("Modifications"); // add buttons @@ -75,8 +77,7 @@ public class IonModificationComponent extends HBox { public IonModification[][] getChoices() { IonModification[] ad = adducts.getChoices().toArray(IonModification[]::new); IonModification[] md = mods.getChoices().toArray(IonModification[]::new); - IonModification[][] all = {ad, md}; - return all; + return new IonModification[][]{ad, md}; } /** @@ -89,8 +90,7 @@ public class IonModificationComponent extends HBox { .toArray(IonModification[]::new); IonModification[] md = mods.getValue().stream().filter(Objects::nonNull) .toArray(IonModification[]::new); - IonModification[][] all = {ad, md}; - return all; + return new IonModification[][]{ad, md}; } public void setValue(final IonModification[][] values) { diff --git a/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationParameter.java b/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationParameter.java index 97a87a5bd..41cf5a456 100644 --- a/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationParameter.java +++ b/src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationParameter.java @@ -16,30 +16,6 @@ * */ -/* - * Copyright 2006-2015 The MZmine 2 Development Team - * - * This file is part of MZmine 2. - * - * MZmine 2 is free software; you can redistribute it and/or modify it under the terms of the GNU - * General Public License as published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * MZmine 2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with MZmine 2; if not, - * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA - */ - -/* - * Code created was by or on behalf of Syngenta and is released under the open source license in use - * for the pre-existing code or project. Syngenta does not assert ownership or copyright any over - * pre-existing work. - */ - package io.github.mzmine.parameters.parametertypes.ionidentity; import io.github.mzmine.datamodel.identities.iontype.CombinedIonModification; @@ -47,13 +23,16 @@ import io.github.mzmine.datamodel.identities.iontype.IonModification; import io.github.mzmine.datamodel.identities.iontype.IonModificationType; import io.github.mzmine.parameters.UserParameter; import io.github.mzmine.parameters.parametertypes.MultiChoiceParameter; -import org.w3c.dom.*; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.logging.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * Adducts parameter. @@ -65,7 +44,7 @@ public class IonModificationParameter implements UserParameter<IonModification[][], IonModificationComponent> { // Logger. - private static final Logger LOG = Logger.getLogger(IonModificationParameter.class.getName()); + private static final Logger logger = Logger.getLogger(IonModificationParameter.class.getName()); // XML tags. private static final String MODIFICTAION_TAG = "modification_type"; @@ -165,7 +144,8 @@ public class IonModificationParameter adducts.add(add); } catch (NumberFormatException ex) { // Ignore. - LOG.warning("Illegal mass difference attribute in " + childAdduct.getNodeValue()); + logger.warning( + "Illegal mass difference attribute in " + childAdduct.getNodeValue()); } } }

['src/main/java/io/github/mzmine/parameters/parametertypes/MultiChoiceComponent.java', 'src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationComponent.java', 'src/main/java/io/github/mzmine/parameters/parametertypes/ionidentity/IonModificationParameter.java']

{'.java': 3}

Java

{'Java': 13983394, 'HTML': 212691, 'CSS': 76094, 'C++': 42644, 'C': 445}

MIT License

pgpainless/pgpainless/144/143

pgpainless

pgpainless

https://github.com/pgpainless/pgpainless/issues/143

https://github.com/pgpainless/pgpainless/pull/144

https://github.com/pgpainless/pgpainless/pull/144

fixes

addSubkey() ignores key flags

PGPainless ignores the user set key flags when adding a subkey like follows: ``` secretKey = PGPainless.modifyKeyRing(secretKey) .addSubKey( KeySpec.getBuilder(KeyType.ECDH(EllipticCurve._BRAINPOOLP512R1)) .withKeyFlags(KeyFlag.ENCRYPT_COMMS, KeyFlag.ENCRYPT_STORAGE) .withDefaultAlgorithms(), subkeyPassphrase, protector) .done(); ``` Instead of `ENCRYPT_COMMS, ENCRYPT_STORAGE`, the subkey is carrying the flag `CERTIFY_OTHER`, as it erroneously inherits the key flags from the primary key. This is a problem with the API.

8fffa3079a87e88621f138f728e979ca1b235415

548bfff93f6794ce36891b2466f36922a0e59086

https://github.com/pgpainless/pgpainless/compare/8fffa3079a87e88621f138f728e979ca1b235415...548bfff93f6794ce36891b2466f36922a0e59086

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java b/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java index 60639849..4ecce7be 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java @@ -42,7 +42,7 @@ public class KeySpec { } @Nullable - PGPSignatureSubpacketVector getSubpackets() { + public PGPSignatureSubpacketVector getSubpackets() { return subpacketGenerator != null ? subpacketGenerator.generate() : null; } diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java index ee8fca9f..7a86c875 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java @@ -167,12 +167,16 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface { PGPSecretKey secretSubKey = generateSubKey(keySpec, subKeyPassphrase); SecretKeyRingProtector subKeyProtector = PasswordBasedSecretKeyRingProtector .forKey(secretSubKey, subKeyPassphrase); + PGPSignatureSubpacketVector hashedSubpackets = keySpec.getSubpackets(); + PGPSignatureSubpacketVector unhashedSubpackets = null; - return addSubKey(secretSubKey, subKeyProtector, secretKeyRingProtector); + return addSubKey(secretSubKey, hashedSubpackets, unhashedSubpackets, subKeyProtector, secretKeyRingProtector); } @Override public SecretKeyRingEditorInterface addSubKey(PGPSecretKey secretSubKey, + PGPSignatureSubpacketVector hashedSubpackets, + PGPSignatureSubpacketVector unhashedSubpackets, SecretKeyRingProtector subKeyProtector, SecretKeyRingProtector keyRingProtector) throws PGPException { @@ -196,7 +200,7 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface { PGPKeyRingGenerator keyRingGenerator = new PGPKeyRingGenerator( secretKeyRing, ringDecryptor, digestCalculator, contentSignerBuilder, subKeyEncryptor); - keyRingGenerator.addSubKey(subKeyPair); + keyRingGenerator.addSubKey(subKeyPair, hashedSubpackets, unhashedSubpackets); secretKeyRing = keyRingGenerator.generateSecretKeyRing(); return this; diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java index b5ce6723..8f936636 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java +++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java @@ -25,6 +25,7 @@ import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSignature; +import org.bouncycastle.openpgp.PGPSignatureSubpacketVector; import org.pgpainless.key.OpenPgpV4Fingerprint; import org.pgpainless.key.generation.KeySpec; import org.pgpainless.key.protection.KeyRingProtectionSettings; @@ -99,7 +100,10 @@ public interface SecretKeyRingEditorInterface { SecretKeyRingProtector secretKeyRingProtector) throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException; - SecretKeyRingEditorInterface addSubKey(PGPSecretKey subKey, SecretKeyRingProtector subKeyProtector, SecretKeyRingProtector keyRingProtector) + SecretKeyRingEditorInterface addSubKey(PGPSecretKey subKey, + PGPSignatureSubpacketVector hashedSubpackets, + PGPSignatureSubpacketVector unhashedSubpackets, + SecretKeyRingProtector subKeyProtector, SecretKeyRingProtector keyRingProtector) throws PGPException; /** diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddSubKeyTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddSubKeyTest.java index 814f0d65..bb2dca10 100644 --- a/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddSubKeyTest.java +++ b/pgpainless-core/src/test/java/org/pgpainless/key/modification/AddSubKeyTest.java @@ -15,12 +15,14 @@ */ package org.pgpainless.key.modification; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.io.IOException; import java.security.InvalidAlgorithmParameterException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -38,6 +40,7 @@ import org.pgpainless.key.TestKeys; import org.pgpainless.key.generation.KeySpec; import org.pgpainless.key.generation.type.ecc.EllipticCurve; import org.pgpainless.key.generation.type.ecc.ecdsa.ECDSA; +import org.pgpainless.key.info.KeyRingInfo; import org.pgpainless.key.protection.PasswordBasedSecretKeyRingProtector; import org.pgpainless.key.protection.SecretKeyRingProtector; import org.pgpainless.key.protection.UnlockSecretKey; @@ -78,5 +81,8 @@ public class AddSubKeyTest { SecretKeyRingProtector protector = SecretKeyRingProtector.unlockAllKeysWith( Passphrase.fromPassword("subKeyPassphrase"), secretKeys); PGPPrivateKey privateKey = UnlockSecretKey.unlockSecretKey(subKey, protector); + + KeyRingInfo info = new KeyRingInfo(secretKeys); + assertEquals(Collections.singletonList(KeyFlag.SIGN_DATA), info.getKeyFlagsOf(subKeyId)); } }

['pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java', 'pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java', 'pgpainless-core/src/test/java/org/pgpainless/key/modification/AddSubKeyTest.java', 'pgpainless-core/src/main/java/org/pgpainless/key/generation/KeySpec.java']

{'.java': 4}

Java

{'Java': 2966256, 'Roff': 28531, 'HTML': 2502, 'Shell': 1768}

Apache License 2.0

jenkinsci/code-coverage-api-plugin/703/689

jenkinsci

code-coverage-api-plugin

https://github.com/jenkinsci/code-coverage-api-plugin/issues/689

https://github.com/jenkinsci/code-coverage-api-plugin/pull/703

https://github.com/jenkinsci/code-coverage-api-plugin/pull/703

fixes

Computing Negative Deltas Doesn't Seem to Work

### Jenkins and plugins versions report Code Coverage API Version 4.4.0 ### What Operating System are you using (both controller, and any agents involved in the problem)? Linux Ubuntu Agent and Controller ### Reproduction steps 1. Have a project setup where code coverage is dropping when a pull request is opened. 2. Run `recordCoverage` with the following configuration ``` recordCoverage( checksAnnotationScope: 'MODIFIED_LINES', checksName: 'Code Coverage', failOnError: true, name: 'Code Coverage', qualityGates: [ [baseline: 'PROJECT_DELTA', metric: 'LINE', threshold: -1.0, criticality: 'UNSTABLE'], [baseline: 'PROJECT_DELTA', metric: 'BRANCH', threshold: -1.0, criticality: 'UNSTABLE'] ], sourceDirectories: [[path: 'src']], scm: 'code-repo', sourceCodeRetention: 'LAST_BUILD', tools: [[parser: 'JACOCO', pattern: '**/reports/jacoco/**/jacocoTestReport.xml']] ) ``` ### Expected Results ``` 13:21:49 [Coverage] Evaluating quality gates 13:21:49 [Coverage] -> Some quality gates have been missed: overall result is UNSTABLE 13:21:49 [Coverage] -> Details for each quality gate: 13:21:49 [Coverage] -> [Overall project (difference to reference job) - Line Coverage]: ≪Success≫ - (Actual value: +0.33%, Quality gate: -1.00) 13:21:49 [Coverage] -> [Overall project (difference to reference job) - Branch Coverage]: ≪Unstable≫ - (Actual value: -1.37%, Quality gate: -1.00) ``` ### Actual Results ``` 13:21:49 [Coverage] Evaluating quality gates 13:21:49 [Coverage] -> All quality gates have been passed 13:21:49 [Coverage] -> Details for each quality gate: 13:21:49 [Coverage] -> [Overall project (difference to reference job) - Line Coverage]: ≪Success≫ - (Actual value: +0.33%, Quality gate: -1.00) 13:21:49 [Coverage] -> [Overall project (difference to reference job) - Branch Coverage]: ≪Success≫ - (Actual value: -1.37%, Quality gate: -1.00) ``` ### Anything else? To add a bit more information, as I'm not sure if this is a bug or expected behaviour that negative threshold delta values aren't checked properly. I'm wondering if there's something I'm missing, as it seems like the plugin should be able to accommodate something like this. My use case is to prevent a Delta drop in the quality gate by more than 1%. It seems like providing a `-` threshold value doesn't do what I'd expect it to. I expect that any threshold value that's < -1 would fail; in my case the value is `-1.37`. The inverse case of using positive threshold values works as expected, but doesn't fit my use case. If I were to use `1` instead of `-1`, both my quality gates would fail as the `Line Coverage` < 1.

74a32a770930fd54edc7398b8b37c6b1e61bd2bd

2c5fefa4a661af731c97c8b3f3cc802a16da9226

https://github.com/jenkinsci/code-coverage-api-plugin/compare/74a32a770930fd54edc7398b8b37c6b1e61bd2bd...2c5fefa4a661af731c97c8b3f3cc802a16da9226

diff --git a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluator.java b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluator.java index 146213f9..082ce456 100644 --- a/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluator.java +++ b/plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluator.java @@ -3,6 +3,13 @@ package io.jenkins.plugins.coverage.metrics.steps; import java.util.Collection; import java.util.Locale; +import org.apache.commons.lang3.math.Fraction; + +import edu.hm.hafner.coverage.FractionValue; +import edu.hm.hafner.coverage.Metric; +import edu.hm.hafner.coverage.SafeFraction; +import edu.hm.hafner.coverage.Value; + import io.jenkins.plugins.coverage.metrics.model.CoverageStatistics; import io.jenkins.plugins.coverage.metrics.model.ElementFormatter; import io.jenkins.plugins.util.QualityGateEvaluator; @@ -15,10 +22,13 @@ import io.jenkins.plugins.util.QualityGateStatus; * @author Johannes Walter */ class CoverageQualityGateEvaluator extends QualityGateEvaluator<CoverageQualityGate> { + private static final Fraction HUNDRED = Fraction.getFraction("100.0"); + private static final ElementFormatter FORMATTER = new ElementFormatter(); private final CoverageStatistics statistics; - CoverageQualityGateEvaluator(final Collection<? extends CoverageQualityGate> qualityGates, final CoverageStatistics statistics) { + CoverageQualityGateEvaluator(final Collection<? extends CoverageQualityGate> qualityGates, + final CoverageStatistics statistics) { super(qualityGates); this.statistics = statistics; @@ -29,14 +39,41 @@ class CoverageQualityGateEvaluator extends QualityGateEvaluator<CoverageQualityG var baseline = qualityGate.getBaseline(); var possibleValue = statistics.getValue(baseline, qualityGate.getMetric()); if (possibleValue.isPresent()) { - var actualValue = possibleValue.get(); + var actualValue = convertActualValue(possibleValue.get()); var status = actualValue.isOutOfValidRange( qualityGate.getThreshold()) ? qualityGate.getStatus() : QualityGateStatus.PASSED; - result.add(qualityGate, status, FORMATTER.format(actualValue, Locale.ENGLISH)); + result.add(qualityGate, status, FORMATTER.format(possibleValue.get(), Locale.ENGLISH)); } else { result.add(qualityGate, QualityGateStatus.INACTIVE, "n/a"); } } + + /** + * Converts the actual value to a percentage if necessary. Delta values are internally stored as fractions, but + * users expect percentages when they are displayed or used in thresholds. + * + * @param value + * the actual stored value + * + * @return the converted value + */ + private Value convertActualValue(final Value value) { + var metric = value.getMetric(); + if (metric.equals(Metric.COMPLEXITY) + || metric.equals(Metric.COMPLEXITY_MAXIMUM) + || metric.equals(Metric.LOC)) { + return value; // ignore integer based metrics + } + if (value instanceof FractionValue) { // delta percentage + return new FractionValue(metric, covertToPercentage((FractionValue) value)); + } + + return value; + } + + private Fraction covertToPercentage(final FractionValue value) { + return new SafeFraction(value.getFraction()).multiplyBy(HUNDRED); + } } diff --git a/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluatorTest.java b/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluatorTest.java index 53561661..9d28b1fd 100644 --- a/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluatorTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluatorTest.java @@ -5,6 +5,8 @@ import java.util.Collection; import java.util.List; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import edu.hm.hafner.coverage.Metric; @@ -137,6 +139,51 @@ class CoverageQualityGateEvaluatorTest extends AbstractCoverageTest { "-> [Modified files (difference to overall project) - Line Coverage]: ≪Success≫ - (Actual value: +5.00%, Quality gate: 0.00)"); } + @ParameterizedTest(name = "A quality gate of {0} should not be passed if the coverage drops by 10%") + @ValueSource(ints = {8, 1, 0, -1, -8}) + void shouldHandleNegativeValues(final double minimum) { + Collection<CoverageQualityGate> qualityGates = new ArrayList<>(); + + qualityGates.add(new CoverageQualityGate(minimum, Metric.FILE, Baseline.PROJECT_DELTA, QualityGateCriticality.UNSTABLE)); + + CoverageQualityGateEvaluator evaluator = new CoverageQualityGateEvaluator(qualityGates, createStatistics()); + QualityGateResult result = evaluator.evaluate(); + + assertThat(result).hasOverallStatus(QualityGateStatus.WARNING).isNotSuccessful().isNotInactive().hasMessages( + String.format( + "-> [Overall project (difference to reference job) - File Coverage]: ≪Unstable≫ - (Actual value: -10.00%%, Quality gate: %.2f)", minimum)); + } + + @ParameterizedTest(name = "A quality gate of {0} should be passed if the coverage is at 50%") + @ValueSource(ints = {-10, 0, 10, 50}) + void shouldPassAllThresholds(final double minimum) { + Collection<CoverageQualityGate> qualityGates = new ArrayList<>(); + + qualityGates.add(new CoverageQualityGate(minimum, Metric.LINE, Baseline.PROJECT, QualityGateCriticality.UNSTABLE)); + + CoverageQualityGateEvaluator evaluator = new CoverageQualityGateEvaluator(qualityGates, createStatistics()); + QualityGateResult result = evaluator.evaluate(); + + assertThat(result).hasOverallStatus(QualityGateStatus.PASSED).isSuccessful().isNotInactive().hasMessages( + String.format( + "-> [Overall project - Line Coverage]: ≪Success≫ - (Actual value: 50.00%%, Quality gate: %.2f)", minimum)); + } + + @ParameterizedTest(name = "A quality gate of {0} should not be passed if the coverage is at 50%") + @ValueSource(ints = {51, 60, 70, 200}) + void shouldFailAllThresholds(final double minimum) { + Collection<CoverageQualityGate> qualityGates = new ArrayList<>(); + + qualityGates.add(new CoverageQualityGate(minimum, Metric.LINE, Baseline.PROJECT, QualityGateCriticality.UNSTABLE)); + + CoverageQualityGateEvaluator evaluator = new CoverageQualityGateEvaluator(qualityGates, createStatistics()); + QualityGateResult result = evaluator.evaluate(); + + assertThat(result).hasOverallStatus(QualityGateStatus.WARNING).isNotSuccessful().isNotInactive().hasMessages( + String.format( + "-> [Overall project - Line Coverage]: ≪Unstable≫ - (Actual value: 50.00%%, Quality gate: %.2f)", minimum)); + } + @Test void shouldReportUnstableIfLargerThanThreshold() { Collection<CoverageQualityGate> qualityGates = new ArrayList<>(); @@ -155,7 +202,7 @@ class CoverageQualityGateEvaluatorTest extends AbstractCoverageTest { } @Test - void shouldReportUnstableIfWorseAndSuccessIfBetter2() { + void shouldReportUnstableIfWorseAndSuccessIfLargerThanThreshold() { Collection<CoverageQualityGate> qualityGates = new ArrayList<>(); var minimum = 0;

['plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluatorTest.java', 'plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageQualityGateEvaluator.java']

{'.java': 2}

Java

{'Java': 1412733, 'JavaScript': 52828, 'HTML': 46388, 'XSLT': 19148, 'CSS': 5275, 'Shell': 1119}

MIT License

gradle/native-platform/258/259

gradle

native-platform

https://github.com/gradle/native-platform/issues/259

https://github.com/gradle/native-platform/pull/258

https://github.com/gradle/native-platform/pull/258

fixes

Stopping the watching causes a `timeout value is negative` exception

When we try to stop the watching, it is currently possible to end up with a negative timeout when trying to join the watcher thread. When this happens, we `join` method throws an `IllegalArgumentException`. We should that the timeout to join the thread is always positive. This is where we stop watching: https://github.com/gradle/native-platform/blob/master/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java#L220-L232 And here is a stacktrace from a build failure on the Gradle side: ``` Caused by: java.lang.IllegalArgumentException: timeout value is negative at net.rubygrapefruit.platform.internal.jni.AbstractFileEventFunctions$NativeFileWatcher.awaitTermination(AbstractFileEventFunctions.java:227) at org.gradle.internal.watch.registry.impl.DefaultFileWatcherRegistry.close(DefaultFileWatcherRegistry.java:198) at org.gradle.internal.watch.vfs.impl.WatchingVirtualFileSystem.stopWatchingAndInvalidateHierarchy(WatchingVirtualFileSystem.java:357) at org.gradle.internal.watch.vfs.impl.WatchingVirtualFileSystem.withWatcherChangeErrorHandling(WatchingVirtualFileSystem.java:323) at org.gradle.internal.watch.vfs.impl.WatchingVirtualFileSystem.withWatcherChangeErrorHandling(WatchingVirtualFileSystem.java:312) at org.gradle.internal.watch.vfs.impl.WatchingVirtualFileSystem.updateRootNotifyingWatchers(WatchingVirtualFileSystem.java:90) at org.gradle.internal.watch.vfs.impl.WatchingVirtualFileSystem.lambda$update$0(WatchingVirtualFileSystem.java:81) at org.gradle.internal.vfs.impl.VfsRootReference.update(VfsRootReference.java:40) at org.gradle.internal.watch.vfs.impl.WatchingVirtualFileSystem.update(WatchingVirtualFileSystem.java:81) at org.gradle.internal.vfs.impl.DefaultFileSystemAccess.record(DefaultFileSystemAccess.java:190) at org.gradle.caching.internal.controller.impl.DefaultBuildCacheCommandFactory$LoadCommand.lambda$snapshotUnpackedData$2(DefaultBuildCacheCommandFactory.java:144) at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter$TaskExecution.visitOutputTrees(ExecuteActionsTaskExecuter.java:345) at org.gradle.caching.internal.controller.impl.DefaultBuildCacheCommandFactory$LoadCommand.snapshotUnpackedData(DefaultBuildCacheCommandFactory.java:122) at org.gradle.caching.internal.controller.impl.DefaultBuildCacheCommandFactory$LoadCommand.load(DefaultBuildCacheCommandFactory.java:95) at org.gradle.caching.internal.controller.DefaultBuildCacheController$Unpack$1.run(DefaultBuildCacheController.java:149) at org.gradle.internal.operations.DefaultBuildOperationRunner$1.execute(DefaultBuildOperationRunner.java:29) at org.gradle.internal.operations.DefaultBuildOperationRunner$1.execute(DefaultBuildOperationRunner.java:26) at org.gradle.internal.operations.DefaultBuildOperationRunner$3.execute(DefaultBuildOperationRunner.java:75) at org.gradle.internal.operations.DefaultBuildOperationRunner$3.execute(DefaultBuildOperationRunner.java:68) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:153) at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:68) at org.gradle.internal.operations.DefaultBuildOperationRunner.run(DefaultBuildOperationRunner.java:56) at org.gradle.internal.operations.DefaultBuildOperationExecutor.lambda$run$1(DefaultBuildOperationExecutor.java:71) at org.gradle.internal.operations.UnmanagedBuildOperationWrapper.runWithUnmanagedSupport(UnmanagedBuildOperationWrapper.java:45) at org.gradle.internal.operations.DefaultBuildOperationExecutor.run(DefaultBuildOperationExecutor.java:71) at org.gradle.caching.internal.controller.DefaultBuildCacheController$Unpack.execute(DefaultBuildCacheController.java:145) at org.gradle.caching.internal.controller.DefaultBuildCacheController$Unpack.execute(DefaultBuildCacheController.java:134) at org.gradle.caching.local.internal.DirectoryBuildCacheService.loadInsideLock(DirectoryBuildCacheService.java:117) at org.gradle.caching.local.internal.DirectoryBuildCacheService.access$200(DirectoryBuildCacheService.java:42) at org.gradle.caching.local.internal.DirectoryBuildCacheService$1.run(DirectoryBuildCacheService.java:99) at org.gradle.internal.Factories$1.create(Factories.java:26) at org.gradle.cache.internal.LockOnDemandCrossProcessCacheAccess.withFileLock(LockOnDemandCrossProcessCacheAccess.java:90) at org.gradle.cache.internal.DefaultCacheAccess.withFileLock(DefaultCacheAccess.java:196) at org.gradle.cache.internal.DefaultPersistentDirectoryStore.withFileLock(DefaultPersistentDirectoryStore.java:182) at org.gradle.cache.internal.DefaultCacheFactory$ReferenceTrackingCache.withFileLock(DefaultCacheFactory.java:206) at org.gradle.caching.local.internal.DirectoryBuildCacheService.loadLocally(DirectoryBuildCacheService.java:94) at org.gradle.caching.internal.controller.service.DefaultLocalBuildCacheServiceHandle.load(DefaultLocalBuildCacheServiceHandle.java:49) at org.gradle.caching.internal.controller.DefaultBuildCacheController.load(DefaultBuildCacheController.java:100) at org.gradle.internal.execution.steps.CacheStep.lambda$executeWithCache$0(CacheStep.java:78) at org.gradle.internal.Try.ofFailable(Try.java:39) ```

6b26ec90012cc7fc0670c64a72c6274f7dfab8fd

fbaaf84713e3afe9c3a0e4dec08afc5dd671894a

https://github.com/gradle/native-platform/compare/6b26ec90012cc7fc0670c64a72c6274f7dfab8fd...fbaaf84713e3afe9c3a0e4dec08afc5dd671894a

diff --git a/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java b/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java index b777c80..7d1a10b 100644 --- a/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java +++ b/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java @@ -224,7 +224,9 @@ public abstract class AbstractFileEventFunctions implements NativeIntegration { if (successful) { long endTime = System.currentTimeMillis(); long remainingTimeout = timeoutInMillis - (endTime - startTime); - processorThread.join(remainingTimeout); + if (remainingTimeout > 0) { + processorThread.join(remainingTimeout); + } return !processorThread.isAlive(); } else { return false;

['file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java']

{'.java': 1}

Java

{'Java': 346938, 'C++': 165077, 'Groovy': 162970, 'C': 5237, 'Kotlin': 285}

Apache License 2.0

gradle/native-platform/261/260

gradle

native-platform

https://github.com/gradle/native-platform/issues/260

https://github.com/gradle/native-platform/pull/261

https://github.com/gradle/native-platform/pull/261

fixes

Report an error when the file watching thread stops

When `executeRunLoop0` throws an error in the file watcher thread, this goes unnoticed and the watching thread stops. That means that the watcher does not look for changes any more, even though it did not notify the client about this. This causes changes to go undetected, as for example shown in this Gradle issue: https://github.com/gradle/gradle/issues/15115.

02fe1981f03befe54e48824e46c7d9bccb680009

2968564cb7a97e822d0ac4a68f087e1427caf3d2

https://github.com/gradle/native-platform/compare/02fe1981f03befe54e48824e46c7d9bccb680009...2968564cb7a97e822d0ac4a68f087e1427caf3d2

diff --git a/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java b/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java index 7d1a10b..7db30b1 100644 --- a/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java +++ b/file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java @@ -64,8 +64,9 @@ public abstract class AbstractFileEventFunctions implements NativeIntegration { * @see FileWatcher#startWatching(Collection) */ public FileWatcher start(long startTimeout, TimeUnit startTimeoutUnit) throws InterruptedException, InsufficientResourcesForWatchingException { - Object server = startWatcher(new NativeFileWatcherCallback(eventQueue)); - return new NativeFileWatcher(server, startTimeout, startTimeoutUnit); + NativeFileWatcherCallback callback = new NativeFileWatcherCallback(eventQueue); + Object server = startWatcher(callback); + return new NativeFileWatcher(server, startTimeout, startTimeoutUnit, callback); } protected abstract Object startWatcher(NativeFileWatcherCallback callback); @@ -158,7 +159,7 @@ public abstract class AbstractFileEventFunctions implements NativeIntegration { private final Thread processorThread; private boolean shutdown; - public NativeFileWatcher(final Object server, long startTimeout, TimeUnit startTimeoutUnit) throws InterruptedException { + public NativeFileWatcher(final Object server, long startTimeout, TimeUnit startTimeoutUnit, final NativeFileWatcherCallback callback) throws InterruptedException { this.server = server; final CountDownLatch runLoopInitialized = new CountDownLatch(1); this.processorThread = new Thread("File watcher server") { @@ -166,7 +167,14 @@ public abstract class AbstractFileEventFunctions implements NativeIntegration { public void run() { initializeRunLoop0(server); runLoopInitialized.countDown(); - executeRunLoop0(server); + try { + executeRunLoop0(server); + if (!shutdown) { + callback.reportFailure(new FileWatcherException("File watcher server did exit without being shutdown")); + } + } catch (Throwable e) { + callback.reportFailure(e); + } } }; this.processorThread.setDaemon(true);

['file-events/src/main/java/net/rubygrapefruit/platform/internal/jni/AbstractFileEventFunctions.java']

{'.java': 1}

Java

{'Java': 346938, 'C++': 165077, 'Groovy': 162970, 'C': 5237, 'Kotlin': 285}

Apache License 2.0

hashgraph/hedera-mirror-node/234/195

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/195

https://github.com/hashgraph/hedera-mirror-node/pull/234

https://github.com/hashgraph/hedera-mirror-node/pull/234

fixes

Record file hash mismatch with previous

**Detailed Description** `File Hash Mismatch with previous` error still occurs even after the fix for #157. **Actual Behavior** 1. Run record downloader 2. Run record parser Wait until hash mismatch occurs. **Expected Behavior** Records download, verified and moved to valid with no errors. **Environment:** - Environment: staging - Java: OpenJDK 11.0.4 - Version: 0.1.0 **Additional Context** Logs when it happened (reverse order): ```console Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,896 WARN [main ] c.h.d.RecordFileDownloader File Hash Mismatch with previous : /var/lib/mirror-node/recordstreams/valid/2019-09-03T20_43_40.116069Z.rcd Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,896 TRACE [main ] c.h.d.ApplicationStatus Returning application status for : RECORD_HASH_MISMATCH_BYPASS_UNTIL_AFTER, Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,895 TRACE [main ] c.h.d.ApplicationStatus Getting application status for : RECORD_HASH_MISMATCH_BYPASS_UNTIL_AFTER Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,894 TRACE [main ] c.h.p.RecordFileParser Read previous file hash a092fd020847f6b2206b29e7d50283c0f820e4244691eed75e4b19c301d7c97c0a7f5d1f0a24c227c84e6ee67b06b033 for file /var/lib/mirror-node/recordstreams/valid/2019-09-03T20_43_40.116069Z.rcd Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,893 TRACE [main ] c.h.d.ApplicationStatus Returning application status for : LAST_VALID_DOWNLOADED_RECORD_FILE_HASH, d8b70aabf07659c3fd05492f3c27b50539e6535a51e6c3e3f747ae3a26a388ddc4eb47e2fffcbc7ff33fcbe436bc1573 Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,893 TRACE [main ] c.h.d.ApplicationStatus Returning application status for : LAST_VALID_DOWNLOADED_RECORD_FILE, 2019-09-03T20_42_00.092453Z.rcd Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,893 DEBUG [main ] c.h.d.RecordFileDownloader Verified signature file matches at least 2/3 of nodes: 2019-09-03T20_43_40.116069Z.rcd_sig ```

9a70800fd04d45f2183b89c83b92e3fde6bba115

e6ec5769bd26f1aa65af6125be64418998324015

https://github.com/hashgraph/hedera-mirror-node/compare/9a70800fd04d45f2183b89c83b92e3fde6bba115...e6ec5769bd26f1aa65af6125be64418998324015

diff --git a/src/main/java/com/hedera/downloader/RecordFileDownloader.java b/src/main/java/com/hedera/downloader/RecordFileDownloader.java index 0470d34b2..5c7e570e6 100644 --- a/src/main/java/com/hedera/downloader/RecordFileDownloader.java +++ b/src/main/java/com/hedera/downloader/RecordFileDownloader.java @@ -28,6 +28,7 @@ import com.hedera.utilities.Utility; import lombok.extern.log4j.Log4j2; import org.apache.commons.codec.binary.Hex; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import java.io.File; @@ -39,6 +40,7 @@ import java.util.stream.Stream; @Log4j2 public class RecordFileDownloader extends Downloader { + private static final String EMPTY_HASH = Hex.encodeHexString(new byte[48]); private final String validDir = ConfigLoader.getDefaultParseDir(OPERATION_TYPE.RECORDS); private final String tmpDir = ConfigLoader.getDefaultTmpDir(OPERATION_TYPE.RECORDS); @@ -65,7 +67,6 @@ public class RecordFileDownloader extends Downloader { // Verify signature files and download .rcd files of valid signature files verifySigsAndDownloadRecordFiles(sigFilesMap); - verifyValidRecordFiles(validDir); } catch (Exception e) { log.error("Error downloading and verifying new record files", e); } @@ -73,56 +74,28 @@ public class RecordFileDownloader extends Downloader { /** * Verify the .rcd files to see if the file Hash matches prevFileHash - * @param fileToCheck * @throws Exception */ - private void verifyValidRecordFiles(String validDir) throws Exception { - String lastValidRcdFileName = applicationStatus.getLastValidDownloadedRecordFileName(); - String lastValidRcdFileHash = applicationStatus.getLastValidDownloadedRecordFileHash(); - - try (Stream<Path> pathStream = Files.walk(Paths.get(validDir))) { - List<String> fileNames = pathStream.filter(p -> Utility.isRecordFile(p.toString())) - .filter(p -> lastValidRcdFileName.isEmpty() || - fileNameComparator.compare(p.toFile().getName(), lastValidRcdFileName) > 0) - .sorted(pathComparator) - .map(p -> p.toString()).collect(Collectors.toList()); - - String newLastValidRcdFileName = lastValidRcdFileName; - String newLastValidRcdFileHash = lastValidRcdFileHash; - - for (String rcdName : fileNames) { - if (Utility.checkStopFile()) { - log.info("Stop file found, stopping"); - break; - } - String prevFileHash = RecordFileParser.readPrevFileHash(rcdName); - if (prevFileHash == null) { - log.warn("Doesn't contain valid prevFileHash: {}", rcdName); - break; - } - if (newLastValidRcdFileHash.isEmpty() || - newLastValidRcdFileHash.equals(prevFileHash) || - prevFileHash.equals(Hex.encodeHexString(new byte[48]))) { - newLastValidRcdFileHash = Utility.bytesToHex(Utility.getFileHash(rcdName)); - newLastValidRcdFileName = new File(rcdName).getName(); - } else if (applicationStatus.getBypassRecordHashMismatchUntilAfter().compareTo(new File(rcdName).getName()) > 0) { - newLastValidRcdFileName = new File(rcdName).getName(); - newLastValidRcdFileHash = Utility.bytesToHex(Utility.getFileHash(rcdName)); - } else { - log.warn("File Hash Mismatch with previous : {}", rcdName); - break; - } - } - - if (!newLastValidRcdFileName.equals(lastValidRcdFileName)) { - applicationStatus.updateLastValidDownloadedRecordFileHash(newLastValidRcdFileHash); - applicationStatus.updateLastValidDownloadedRecordFileName(newLastValidRcdFileName); - } + private boolean verifyHashChain(File recordFile) throws Exception { + String recordPath = recordFile.getAbsolutePath(); + String lastValidRecordFileHash = applicationStatus.getLastValidDownloadedRecordFileHash(); + String bypassMismatch = StringUtils.defaultIfBlank(applicationStatus.getBypassRecordHashMismatchUntilAfter(), ""); + String prevFileHash = RecordFileParser.readPrevFileHash(recordPath); + + if (prevFileHash == null) { + log.warn("Doesn't contain valid previous file hash: {}", recordPath); + return false; + } - } catch (Exception ex) { - log.error("Failed to verify record files in {}", validDir, ex); + if (StringUtils.isBlank(lastValidRecordFileHash) || lastValidRecordFileHash.equals(prevFileHash) || + EMPTY_HASH.equals(prevFileHash) || bypassMismatch.compareTo(recordFile.getName()) > 0) { + return true; } + + log.warn("File Hash Mismatch with previous: {}, expected {}, got {}", recordFile.getName(), lastValidRecordFileHash, prevFileHash); + return false; } + /** * For each group of signature Files with the same file name: * (1) verify that the signature files are signed by corresponding node's PublicKey; @@ -147,7 +120,7 @@ public class RecordFileDownloader extends Downloader { } boolean valid = false; List<File> sigFiles = sigFilesMap.get(fileName); - + // If the number of sigFiles is not greater than 2/3 of number of nodes, we don't need to verify them if (sigFiles == null || !Utility.greaterThanSuperMajorityNum(sigFiles.size(), nodeAccountIds.size())) { log.warn("Signature file count for {} does not exceed 2/3 of nodes", fileName); @@ -162,18 +135,29 @@ public class RecordFileDownloader extends Downloader { break; } - Pair<Boolean, File> rcdFileResult = downloadFile(DownloadType.RCD, validSigFile, tmpDir); - File rcdFile = rcdFileResult.getRight(); - if (rcdFile != null && Utility.hashMatch(validSigFile, rcdFile)) { - // move the file to the valid directory - File fTo = new File(validDir + "/" + rcdFile.getName()); - if (moveFile(rcdFile, fTo)) { - log.debug("Verified signature file matches at least 2/3 of nodes: {}", fileName); - valid = true; - break; + try { + Pair<Boolean, File> rcdFileResult = downloadFile(DownloadType.RCD, validSigFile, tmpDir); + File rcdFile = rcdFileResult.getRight(); + if (rcdFile != null && Utility.hashMatch(validSigFile, rcdFile)) { + if (verifyHashChain(rcdFile)) { + // move the file to the valid directory + String name = rcdFile.getName(); + String hash = Utility.bytesToHex(Utility.getFileHash(rcdFile.getAbsolutePath())); + File validFile = Paths.get(validDir, name).toFile(); + + if (moveFile(rcdFile, validFile)) { + log.debug("Verified signature file matches at least 2/3 of nodes: {}", fileName); + applicationStatus.updateLastValidDownloadedRecordFileHash(hash); + applicationStatus.updateLastValidDownloadedRecordFileName(name); + valid = true; + break; + } + } + } else if (rcdFile != null) { + log.warn("Hash of {} doesn't match the hash contained in the signature file. Will try to download a record file with same timestamp from other nodes", validSigFile); } - } else if (rcdFile != null) { - log.warn("Hash of {} doesn't match the hash contained in the signature file. Will try to download a record file with same timestamp from other nodes", rcdFile); + } catch (Exception e) { + log.error("Unable to verify signature {}", validSigFile, e); } } diff --git a/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV1.java b/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV1.java index 263d61bb4..781d1fe70 100644 --- a/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV1.java +++ b/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV1.java @@ -72,9 +72,6 @@ public class RecordFileDownloaderTestV1 { s3 = S3Mock.create(8001, s3Path.toString()); s3.start(); - - when(applicationStatus.getLastValidDownloadedRecordFileName()).thenReturn(""); - when(applicationStatus.getLastValidDownloadedRecordFileHash()).thenReturn(""); } @AfterEach @@ -163,13 +160,11 @@ public class RecordFileDownloaderTestV1 { void hashMismatchWithPrevious() throws Exception { when(applicationStatus.getLastValidDownloadedRecordFileName()).thenReturn("2019-07-01T14:12:00.000000Z.rcd"); when(applicationStatus.getLastValidDownloadedRecordFileHash()).thenReturn("123"); - when(applicationStatus.getBypassRecordHashMismatchUntilAfter()).thenReturn(""); fileCopier.copy(); downloader.download(); assertThat(Files.walk(validPath)) .filteredOn(p -> !p.toFile().isDirectory()) - .hasSize(2) - .allMatch(p -> Utility.isRecordFile(p.toString())); + .hasSize(0); } @Test diff --git a/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV2.java b/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV2.java index 39bbf0974..5576a3811 100644 --- a/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV2.java +++ b/src/test/java/com/hedera/downloader/RecordFileDownloaderTestV2.java @@ -72,9 +72,6 @@ public class RecordFileDownloaderTestV2 { s3 = S3Mock.create(8001, s3Path.toString()); s3.start(); - - when(applicationStatus.getLastValidDownloadedRecordFileName()).thenReturn(""); - when(applicationStatus.getLastValidDownloadedRecordFileHash()).thenReturn(""); } @AfterEach

['src/test/java/com/hedera/downloader/RecordFileDownloaderTestV1.java', 'src/main/java/com/hedera/downloader/RecordFileDownloader.java', 'src/test/java/com/hedera/downloader/RecordFileDownloaderTestV2.java']

{'.java': 3}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/241/195

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/195

https://github.com/hashgraph/hedera-mirror-node/pull/241

https://github.com/hashgraph/hedera-mirror-node/pull/241

fixes

Record file hash mismatch with previous

**Detailed Description** `File Hash Mismatch with previous` error still occurs even after the fix for #157. **Actual Behavior** 1. Run record downloader 2. Run record parser Wait until hash mismatch occurs. **Expected Behavior** Records download, verified and moved to valid with no errors. **Environment:** - Environment: staging - Java: OpenJDK 11.0.4 - Version: 0.1.0 **Additional Context** Logs when it happened (reverse order): ```console Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,896 WARN [main ] c.h.d.RecordFileDownloader File Hash Mismatch with previous : /var/lib/mirror-node/recordstreams/valid/2019-09-03T20_43_40.116069Z.rcd Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,896 TRACE [main ] c.h.d.ApplicationStatus Returning application status for : RECORD_HASH_MISMATCH_BYPASS_UNTIL_AFTER, Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,895 TRACE [main ] c.h.d.ApplicationStatus Getting application status for : RECORD_HASH_MISMATCH_BYPASS_UNTIL_AFTER Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,894 TRACE [main ] c.h.p.RecordFileParser Read previous file hash a092fd020847f6b2206b29e7d50283c0f820e4244691eed75e4b19c301d7c97c0a7f5d1f0a24c227c84e6ee67b06b033 for file /var/lib/mirror-node/recordstreams/valid/2019-09-03T20_43_40.116069Z.rcd Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,893 TRACE [main ] c.h.d.ApplicationStatus Returning application status for : LAST_VALID_DOWNLOADED_RECORD_FILE_HASH, d8b70aabf07659c3fd05492f3c27b50539e6535a51e6c3e3f747ae3a26a388ddc4eb47e2fffcbc7ff33fcbe436bc1573 Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,893 TRACE [main ] c.h.d.ApplicationStatus Returning application status for : LAST_VALID_DOWNLOADED_RECORD_FILE, 2019-09-03T20_42_00.092453Z.rcd Sep 03 22:00:36 psql-test-02 java[8100]: 2019-09-03 22:00:36,893 DEBUG [main ] c.h.d.RecordFileDownloader Verified signature file matches at least 2/3 of nodes: 2019-09-03T20_43_40.116069Z.rcd_sig ```

95e521ed47e6be33861b2798a9f0334b7c00fa6c

1c8a093b8066b38ee92d6fd8300d1b942073d1d2

https://github.com/hashgraph/hedera-mirror-node/compare/95e521ed47e6be33861b2798a9f0334b7c00fa6c...1c8a093b8066b38ee92d6fd8300d1b942073d1d2

diff --git a/src/main/java/com/hedera/downloader/RecordFileDownloader.java b/src/main/java/com/hedera/downloader/RecordFileDownloader.java index cf5320e2d..8a6cca292 100644 --- a/src/main/java/com/hedera/downloader/RecordFileDownloader.java +++ b/src/main/java/com/hedera/downloader/RecordFileDownloader.java @@ -29,6 +29,7 @@ import com.hedera.utilities.Utility; import lombok.extern.log4j.Log4j2; import org.apache.commons.codec.binary.Hex; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.springframework.scheduling.annotation.Scheduled; @@ -43,6 +44,7 @@ import java.util.stream.Stream; @Named public class RecordFileDownloader extends Downloader { + private static final String EMPTY_HASH = Hex.encodeHexString(new byte[48]); private final String validDir = ConfigLoader.getDefaultParseDir(OPERATION_TYPE.RECORDS); private final String tmpDir = ConfigLoader.getDefaultTmpDir(OPERATION_TYPE.RECORDS); @@ -68,10 +70,7 @@ public class RecordFileDownloader extends Downloader { } Map<String, List<File>> sigFilesMap = downloadSigFiles(DownloadType.RCD); - - // Verify signature files and download .rcd files of valid signature files verifySigsAndDownloadRecordFiles(sigFilesMap); - verifyValidRecordFiles(validDir); } catch (Exception e) { log.error("Error downloading and verifying new record files", e); } @@ -79,56 +78,28 @@ public class RecordFileDownloader extends Downloader { /** * Verify the .rcd files to see if the file Hash matches prevFileHash - * @param fileToCheck - * @throws Exception + * @throws Exception */ - private void verifyValidRecordFiles(String validDir) throws Exception { - String lastValidRcdFileName = applicationStatus.getLastValidDownloadedRecordFileName(); - String lastValidRcdFileHash = applicationStatus.getLastValidDownloadedRecordFileHash(); - - try (Stream<Path> pathStream = Files.walk(Paths.get(validDir))) { - List<String> fileNames = pathStream.filter(p -> Utility.isRecordFile(p.toString())) - .filter(p -> lastValidRcdFileName.isEmpty() || - fileNameComparator.compare(p.toFile().getName(), lastValidRcdFileName) > 0) - .sorted(pathComparator) - .map(p -> p.toString()).collect(Collectors.toList()); - - String newLastValidRcdFileName = lastValidRcdFileName; - String newLastValidRcdFileHash = lastValidRcdFileHash; - - for (String rcdName : fileNames) { - if (Utility.checkStopFile()) { - log.info("Stop file found, stopping"); - break; - } - String prevFileHash = RecordFileParser.readPrevFileHash(rcdName); - if (prevFileHash == null) { - log.warn("Doesn't contain valid prevFileHash: {}", rcdName); - break; - } - if (newLastValidRcdFileHash.isEmpty() || - newLastValidRcdFileHash.equals(prevFileHash) || - prevFileHash.equals(Hex.encodeHexString(new byte[48]))) { - newLastValidRcdFileHash = Utility.bytesToHex(Utility.getFileHash(rcdName)); - newLastValidRcdFileName = new File(rcdName).getName(); - } else if (applicationStatus.getBypassRecordHashMismatchUntilAfter().compareTo(new File(rcdName).getName()) > 0) { - newLastValidRcdFileName = new File(rcdName).getName(); - newLastValidRcdFileHash = Utility.bytesToHex(Utility.getFileHash(rcdName)); - } else { - log.warn("File Hash Mismatch with previous : {}", rcdName); - break; - } - } - - if (!newLastValidRcdFileName.equals(lastValidRcdFileName)) { - applicationStatus.updateLastValidDownloadedRecordFileHash(newLastValidRcdFileHash); - applicationStatus.updateLastValidDownloadedRecordFileName(newLastValidRcdFileName); - } + private boolean verifyHashChain(File recordFile) throws Exception { + String recordPath = recordFile.getAbsolutePath(); + String lastValidRecordFileHash = applicationStatus.getLastValidDownloadedRecordFileHash(); + String bypassMismatch = StringUtils.defaultIfBlank(applicationStatus.getBypassRecordHashMismatchUntilAfter(), ""); + String prevFileHash = RecordFileParser.readPrevFileHash(recordPath); + + if (prevFileHash == null) { + log.warn("Doesn't contain valid previous file hash: {}", recordPath); + return false; + } - } catch (Exception ex) { - log.error("Failed to verify record files in {}", validDir, ex); + if (StringUtils.isBlank(lastValidRecordFileHash) || lastValidRecordFileHash.equals(prevFileHash) || + EMPTY_HASH.equals(prevFileHash) || bypassMismatch.compareTo(recordFile.getName()) > 0) { + return true; } + + log.warn("File Hash Mismatch with previous: {}, expected {}, got {}", recordFile.getName(), lastValidRecordFileHash, prevFileHash); + return false; } + /** * For each group of signature Files with the same file name: * (1) verify that the signature files are signed by corresponding node's PublicKey; @@ -153,7 +124,7 @@ public class RecordFileDownloader extends Downloader { } boolean valid = false; List<File> sigFiles = sigFilesMap.get(fileName); - + // If the number of sigFiles is not greater than 2/3 of number of nodes, we don't need to verify them if (sigFiles == null || !Utility.greaterThanSuperMajorityNum(sigFiles.size(), nodeAccountIds.size())) { log.warn("Signature file count for {} does not exceed 2/3 of nodes", fileName); @@ -168,18 +139,29 @@ public class RecordFileDownloader extends Downloader { break; } - Pair<Boolean, File> rcdFileResult = downloadFile(DownloadType.RCD, validSigFile, tmpDir); - File rcdFile = rcdFileResult.getRight(); - if (rcdFile != null && Utility.hashMatch(validSigFile, rcdFile)) { - // move the file to the valid directory - File fTo = new File(validDir + "/" + rcdFile.getName()); - if (moveFile(rcdFile, fTo)) { - log.debug("Verified signature file matches at least 2/3 of nodes: {}", fileName); - valid = true; - break; + try { + Pair<Boolean, File> rcdFileResult = downloadFile(DownloadType.RCD, validSigFile, tmpDir); + File rcdFile = rcdFileResult.getRight(); + if (rcdFile != null && Utility.hashMatch(validSigFile, rcdFile)) { + if (verifyHashChain(rcdFile)) { + // move the file to the valid directory + String name = rcdFile.getName(); + String hash = Utility.bytesToHex(Utility.getFileHash(rcdFile.getAbsolutePath())); + File validFile = Paths.get(validDir, name).toFile(); + + if (moveFile(rcdFile, validFile)) { + log.debug("Verified signature file matches at least 2/3 of nodes: {}", fileName); + applicationStatus.updateLastValidDownloadedRecordFileHash(hash); + applicationStatus.updateLastValidDownloadedRecordFileName(name); + valid = true; + break; + } + } + } else if (rcdFile != null) { + log.warn("Hash of {} doesn't match the hash contained in the signature file. Will try to download a record file with same timestamp from other nodes", rcdFile); } - } else if (rcdFile != null) { - log.warn("Hash of {} doesn't match the hash contained in the signature file. Will try to download a record file with same timestamp from other nodes", rcdFile); + } catch (Exception e) { + log.error("Unable to verify signature {}", validSigFile, e); } } diff --git a/src/test/java/com/hedera/downloader/RecordFileDownloaderTest.java b/src/test/java/com/hedera/downloader/RecordFileDownloaderTest.java index d44195c88..b8700eba5 100644 --- a/src/test/java/com/hedera/downloader/RecordFileDownloaderTest.java +++ b/src/test/java/com/hedera/downloader/RecordFileDownloaderTest.java @@ -72,9 +72,6 @@ public class RecordFileDownloaderTest { s3 = S3Mock.create(8001, s3Path.toString()); s3.start(); - - when(applicationStatus.getLastValidDownloadedRecordFileName()).thenReturn(""); - when(applicationStatus.getLastValidDownloadedRecordFileHash()).thenReturn(""); } @AfterEach @@ -190,15 +187,11 @@ public class RecordFileDownloaderTest { final String filename = "2019-08-30T18_10_05.249678Z.rcd"; when(applicationStatus.getLastValidDownloadedRecordFileName()).thenReturn("2019-07-01T14:12:00.000000Z.rcd"); when(applicationStatus.getLastValidDownloadedRecordFileHash()).thenReturn("123"); - when(applicationStatus.getBypassRecordHashMismatchUntilAfter()).thenReturn(""); fileCopier.filterFiles(filename + "*").copy(); // Skip first file with zero hash downloader.download(); assertThat(Files.walk(validPath)) .filteredOn(p -> !p.toFile().isDirectory()) - .hasSize(1) - .allMatch(p -> Utility.isRecordFile(p.toString())) - .extracting(Path::getFileName) - .contains(Paths.get(filename)); + .hasSize(0); } @Test @@ -207,7 +200,7 @@ public class RecordFileDownloaderTest { final String filename = "2019-08-30T18_10_05.249678Z.rcd"; when(applicationStatus.getLastValidDownloadedRecordFileName()).thenReturn("2019-07-01T14:12:00.000000Z.rcd"); when(applicationStatus.getLastValidDownloadedRecordFileHash()).thenReturn("123"); - when(applicationStatus.getBypassRecordHashMismatchUntilAfter()).thenReturn("2019-07-02T00:00:00.000000Z.rcd"); + when(applicationStatus.getBypassRecordHashMismatchUntilAfter()).thenReturn("2019-09-01T00:00:00.000000Z.rcd"); fileCopier.filterFiles(filename + "*").copy(); // Skip first file with zero hash downloader.download(); assertThat(Files.walk(validPath))

['src/main/java/com/hedera/downloader/RecordFileDownloader.java', 'src/test/java/com/hedera/downloader/RecordFileDownloaderTest.java']

{'.java': 2}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/48/42

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/42

https://github.com/hashgraph/hedera-mirror-node/pull/48

https://github.com/hashgraph/hedera-mirror-node/pull/48

fixes

Crash on invalid account balance csv

Actual: ```console 2019-08-15 15:10:37,094 INFO [main ] configloader Loading configuration from ./config/config.json 2019-08-15 15:11:17,133 INFO [main ] balancelogger No balance file to parse found 2019-08-15 15:11:17,133 INFO [main ] balancelogger Last Balance processing done 2019-08-15 15:11:17,133 INFO [main ] balancelogger Balance History processing done 2019-08-15 15:12:17,209 ERROR [main ] balancelogger File ./MirrorNodeData/accountBalances/valid/foo.csv is not named as expected, should be like 2019-06-28-22-05.csv 2019-08-15 15:12:17,221 INFO [main ] balancelogger Last Balance processing done 2019-08-15 15:12:17,222 ERROR [main ] balancelogger File ./MirrorNodeData/accountBalances/valid/foo.csv is not named as expected, should be like 2019-06-28-22-05.csv 2019-08-15 15:12:17,223 ERROR [main ] filewatcher Exception : {} java.lang.StringIndexOutOfBoundsException: begin 0, end 10, length 7 at java.lang.String.checkBoundsBeginEnd(String.java:3319) ~[?:?] at java.lang.String.substring(String.java:1874) ~[?:?] at com.hedera.utilities.Utility.moveFileToParsedDir(Utility.java:499) ~[classes/:?] at com.hedera.balanceFileLogger.BalanceFileLogger.processAllFilesForHistory(BalanceFileLogger.java:162) ~[classes/:?] at com.hedera.balanceFileLogger.BalanceFileLogger.onCreate(BalanceFileLogger.java:149) ~[classes/:?] at com.hedera.fileWatcher.FileWatcher.watch(FileWatcher.java:61) [classes/:?] at com.hedera.balanceFileLogger.BalanceFileLogger.main(BalanceFileLogger.java:143) [classes/:?] ``` Expected: Reject invalid file and move on

d1acd560b9547257b96b888e6fbca33931150009

c33a1e1ba87838e80f7f65638433484432676cc2

https://github.com/hashgraph/hedera-mirror-node/compare/d1acd560b9547257b96b888e6fbca33931150009...c33a1e1ba87838e80f7f65638433484432676cc2

diff --git a/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java b/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java index 0406598ed..3a5acffdc 100644 --- a/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java +++ b/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java @@ -83,7 +83,7 @@ public class BalanceFileLogger extends FileWatcher { super(pathToWatch); } - static void parseFileName(File fileName) { + static boolean parseFileName(File fileName) { String shortFileName = fileName.getName().replace(".csv", ""); if (shortFileName.contains("_Balances")) { @@ -98,6 +98,7 @@ public class BalanceFileLogger extends FileWatcher { String[] fileParts = shortFileName.split("-"); if (fileParts.length != 5) { log.error(MARKER, "File {} is not named as expected, should be like 2019-06-28-22-05.csv", fileName); + return false; } else { Calendar c = Calendar.getInstance(); c.clear(); @@ -114,6 +115,7 @@ public class BalanceFileLogger extends FileWatcher { fileNanos = fileTimestamp.getNano(); } } + return true; } private static File getLatestBalancefile() throws IOException { @@ -187,7 +189,9 @@ public class BalanceFileLogger extends FileWatcher { return false; } - parseFileName(balanceFile); + if ( ! parseFileName(balanceFile)) { + return false; + } PreparedStatement selectBalance = connect.prepareStatement( "SELECT id" @@ -314,7 +318,9 @@ public class BalanceFileLogger extends FileWatcher { // process the file connect = DatabaseUtilities.openDatabase(connect); - parseFileName(balanceFile); + if ( ! parseFileName(balanceFile)) { + return; + } if (connect != null) { connect.setAutoCommit(false);

['src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java']

{'.java': 1}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/286/275

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/275

https://github.com/hashgraph/hedera-mirror-node/pull/286

https://github.com/hashgraph/hedera-mirror-node/pull/286

fixes

Log AWS error messages on ListObjects failures

**Detailed Description** During upgrade, there were no files being downloaded, due to SSL/ca-cert errors that were generated at debug-level for the AWS code, but nothing was logged in the mirror-node. The AWS error was a "trustanchors parameter must be non-empty" error. **Actual Behavior** **Expected Behavior** In the event of these errors - the mirror-node should log an error level message. **Environment:** - Node: v0.2.0

0deb5e572e0a3b64d4124045ac1c43264531d8df

1a12a0bbdcd31f3a9f183aaefd80f638a01ad4c9

https://github.com/hashgraph/hedera-mirror-node/compare/0deb5e572e0a3b64d4124045ac1c43264531d8df...1a12a0bbdcd31f3a9f183aaefd80f638a01ad4c9

diff --git a/src/main/java/com/hedera/configLoader/ConfigLoader.java b/src/main/java/com/hedera/configLoader/ConfigLoader.java index 2ba652bf0..4297ab865 100644 --- a/src/main/java/com/hedera/configLoader/ConfigLoader.java +++ b/src/main/java/com/hedera/configLoader/ConfigLoader.java @@ -28,6 +28,7 @@ import com.google.gson.JsonSyntaxException; import com.hedera.utilities.Utility; import io.github.cdimascio.dotenv.Dotenv; +import lombok.*; import lombok.extern.log4j.Log4j2; import java.io.*; @@ -35,10 +36,14 @@ import java.io.*; @Log4j2 public class ConfigLoader { + @Getter + @RequiredArgsConstructor public static enum CLOUD_PROVIDER { - S3, - GCP, - LOCAL; // Testing + S3("https://s3.amazonaws.com"), + GCP("https://storage.googleapis.com"), + LOCAL("http://127.0.0.1:8001"); // Testing + + private final String endpoint; } // cloud provider, must be either S3 or GCP diff --git a/src/main/java/com/hedera/downloader/Downloader.java b/src/main/java/com/hedera/downloader/Downloader.java index e4fd686eb..bae8f0a31 100644 --- a/src/main/java/com/hedera/downloader/Downloader.java +++ b/src/main/java/com/hedera/downloader/Downloader.java @@ -20,13 +20,13 @@ package com.hedera.downloader; * ‍ */ -import com.amazonaws.ClientConfiguration; +import com.amazonaws.*; import com.amazonaws.auth.*; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.client.builder.ExecutorFactory; +import com.amazonaws.handlers.RequestHandler2; import com.amazonaws.retry.PredefinedRetryPolicies; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import com.amazonaws.services.s3.*; import com.amazonaws.services.s3.model.ListObjectsRequest; import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.S3ObjectSummary; @@ -46,6 +46,7 @@ import com.hedera.utilities.Utility; import com.hederahashgraph.api.proto.java.NodeAddress; import com.hederahashgraph.api.proto.java.NodeAddressBook; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -78,7 +79,6 @@ public abstract class Downloader { protected static String bucketName; protected static TransferManager xfer_mgr; - protected static DownloaderProperties downloaderProperties; protected static AmazonS3 s3Client; @@ -90,8 +90,6 @@ public abstract class Downloader { protected List<String> nodeAccountIds; - protected static ClientConfiguration clientConfiguration; - protected final ApplicationStatusRepository applicationStatusRepository; private final CommonDownloaderProperties commonProps; @@ -373,74 +371,46 @@ public abstract class Downloader { } } - protected static synchronized void setupCloudConnection(DownloaderProperties dlProps) { + protected static synchronized void setupCloudConnection(DownloaderProperties downloaderProperties) { if (xfer_mgr != null) { return; } - downloaderProperties = dlProps; bucketName = ConfigLoader.getBucketName(); // Define retryPolicy - clientConfiguration = new ClientConfiguration(); + ClientConfiguration clientConfiguration = new ClientConfiguration(); clientConfiguration.setRetryPolicy( PredefinedRetryPolicies.getDefaultRetryPolicyWithCustomMaxRetries(5)); clientConfiguration.setMaxConnections(downloaderProperties.getMaxConnections()); - if (ConfigLoader.getCloudProvider() == CLOUD_PROVIDER.S3) { - if (ConfigLoader.getAccessKey().contentEquals("")) { - s3Client = AmazonS3ClientBuilder.standard() - .withRegion(ConfigLoader.getClientRegion()) - .withClientConfiguration(clientConfiguration) - .withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())) - .build(); - } else { - s3Client = AmazonS3ClientBuilder.standard() - .withCredentials(new AWSStaticCredentialsProvider( - new BasicAWSCredentials(ConfigLoader.getAccessKey(), - ConfigLoader.getSecretKey()))) - .withRegion(ConfigLoader.getClientRegion()) - .withClientConfiguration(clientConfiguration) - .build(); - } - } else if (ConfigLoader.getCloudProvider() == CLOUD_PROVIDER.GCP) { - if (ConfigLoader.getAccessKey().contentEquals("")) { - s3Client = AmazonS3ClientBuilder.standard() - .withEndpointConfiguration( - new AwsClientBuilder.EndpointConfiguration( - "https://storage.googleapis.com", ConfigLoader.getClientRegion())) - .withClientConfiguration(clientConfiguration) - .withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())) - .build(); - } else { - s3Client = AmazonS3ClientBuilder.standard() - .withEndpointConfiguration( - new AwsClientBuilder.EndpointConfiguration( - "https://storage.googleapis.com", ConfigLoader.getClientRegion())) - .withCredentials(new AWSStaticCredentialsProvider( - new BasicAWSCredentials(ConfigLoader.getAccessKey(), - ConfigLoader.getSecretKey()))) - .withClientConfiguration(clientConfiguration) - .build(); + RequestHandler2 errorHandler = new RequestHandler2() { + private Logger logger = LogManager.getLogger(AmazonS3Client.class); + + @Override + public void afterError(Request<?> request, Response<?> response, Exception e) { + logger.error("Error calling {} {}", request.getHttpMethod(), request.getEndpoint(), e); } - } else { - s3Client = AmazonS3ClientBuilder.standard() - .withPathStyleAccessEnabled(true) - .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration("http://localhost:8001", ConfigLoader.getClientRegion())) - .withClientConfiguration(clientConfiguration) - .withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials())) - .build(); + }; + + AWSCredentials awsCredentials = new AnonymousAWSCredentials(); + if (StringUtils.isNotBlank(ConfigLoader.getAccessKey()) && StringUtils.isNotBlank(ConfigLoader.getSecretKey())) { + awsCredentials = new BasicAWSCredentials(ConfigLoader.getAccessKey(), ConfigLoader.getSecretKey()); } + + s3Client = AmazonS3ClientBuilder.standard() + .withClientConfiguration(clientConfiguration) + .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)) + .withEndpointConfiguration( + new AwsClientBuilder.EndpointConfiguration(ConfigLoader.getCloudProvider().getEndpoint(), ConfigLoader.getClientRegion())) + .withRequestHandlers(errorHandler) + .build(); + xfer_mgr = TransferManagerBuilder.standard() - .withExecutorFactory(new ExecutorFactory() { - @Override - public ExecutorService newExecutor() { - return new ThreadPoolExecutor(downloaderProperties.getCoreThreads(), downloaderProperties.getMaxThreads(), - 120, TimeUnit.SECONDS, - new ArrayBlockingQueue<Runnable>(downloaderProperties.getTaskQueueSize())); - } - }) - .withS3Client(s3Client).build(); + .withExecutorFactory(() -> new ThreadPoolExecutor(downloaderProperties.getCoreThreads(), downloaderProperties.getMaxThreads(), + 120, TimeUnit.SECONDS, new ArrayBlockingQueue<>(downloaderProperties.getTaskQueueSize()))) + .withS3Client(s3Client) + .build(); } /**

['src/main/java/com/hedera/downloader/Downloader.java', 'src/main/java/com/hedera/configLoader/ConfigLoader.java']

{'.java': 2}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/71/36

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/36

https://github.com/hashgraph/hedera-mirror-node/pull/71

https://github.com/hashgraph/hedera-mirror-node/pull/71#issuecomment-523539740

fixes

Don't process partial files

Due to the nature of downloading to files and processing the files in separate processes, it's possible that processing could occur on a partially downloaded file. Whether it's polling for new files manually or using java's WatcherService, it's a possibility that the S3 downloader created the file, wrote some bytes but has not finished writing all bytes by the time the file is picked up by the parsers (especially for larger files). Possible solutions: 1. Download files to a different directory and move them once complete. Move is an atomic operation. 2. Combine downloader and parser into a single process and use S3's GetObject to download to a ByteArrayOutputStream instead of a file. Pros to 1 is its quickest. Pros to 2 is it's a simpler architecture and avoids the penalty of writing files and coordinating processes. Due to the serial nature of processing these file streams, the only benefit of having separate processes is for separation of failures. But parser would be effectively down anyway if there's no new files being downloaded. Con is it's more work and not sure how large files get to be loaded into memory.

5725dde42826cc3511bae74c6cd7009d2f881fed

a1d99c88a3c98e19b1ed57d193901537a48d811c

https://github.com/hashgraph/hedera-mirror-node/compare/5725dde42826cc3511bae74c6cd7009d2f881fed...a1d99c88a3c98e19b1ed57d193901537a48d811c

diff --git a/src/main/java/com/hedera/configLoader/ConfigLoader.java b/src/main/java/com/hedera/configLoader/ConfigLoader.java index 28f64a7ea..492a8d046 100644 --- a/src/main/java/com/hedera/configLoader/ConfigLoader.java +++ b/src/main/java/com/hedera/configLoader/ConfigLoader.java @@ -355,6 +355,10 @@ public class ConfigLoader { return ""; } + public static String getDefaultTmpDir(OPERATION_TYPE operation) { + return getDefaultParseDir(operation).replace("/valid", "/tmp"); + } + public static int getProxyPort() { return proxyPort; } diff --git a/src/main/java/com/hedera/downloader/AccountBalancesDownloader.java b/src/main/java/com/hedera/downloader/AccountBalancesDownloader.java index 96dfb9f75..b17abaa6a 100644 --- a/src/main/java/com/hedera/downloader/AccountBalancesDownloader.java +++ b/src/main/java/com/hedera/downloader/AccountBalancesDownloader.java @@ -12,13 +12,18 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; import com.hedera.configLoader.ConfigLoader; +import com.hedera.configLoader.ConfigLoader.OPERATION_TYPE; import com.hedera.signatureVerifier.NodeSignatureVerifier; import com.hedera.utilities.Utility; public class AccountBalancesDownloader extends Downloader { + private static String validDir = ConfigLoader.getDefaultParseDir(OPERATION_TYPE.BALANCE); + private static String tmpDir = ConfigLoader.getDefaultTmpDir(OPERATION_TYPE.BALANCE); public AccountBalancesDownloader() { + Utility.createDirIfNotExists(validDir); + Utility.createDirIfNotExists(tmpDir); } public static void main(String[] args) { @@ -67,8 +72,7 @@ public class AccountBalancesDownloader extends Downloader { * return the name of directory which contains valid _Balances.csv files * @param sigFilesMap */ - String verifySigsAndDownloadBalanceFiles(Map<String, List<File>> sigFilesMap) { - String validDir = null; + private void verifySigsAndDownloadBalanceFiles(Map<String, List<File>> sigFilesMap) { String lastValidBalanceFileName = ""; try { lastValidBalanceFileName = ConfigLoader.getLastValidBalanceFileName(); @@ -99,18 +103,21 @@ public class AccountBalancesDownloader extends Downloader { log.info(MARKER, "Stop file found, stopping."); break; } - if (validDir == null) { - validDir = validSigFile.getParentFile().getParent() + "/valid/"; - } - Pair<Boolean, File> fileResult = downloadBalanceFile(validSigFile, validDir); + + Pair<Boolean, File> fileResult = downloadFile(DownloadType.BALANCE, validSigFile, tmpDir); File file = fileResult.getRight(); - if (file != null && - Utility.hashMatch(validSigFile, file)) { - if (newLastValidBalanceFileName.isEmpty() || - fileNameComparator.compare(newLastValidBalanceFileName, file.getName()) < 0) { - newLastValidBalanceFileName = file.getName(); - } - break; + if (file != null && Utility.hashMatch(validSigFile, file)) { + + // move the file to the valid directory + File fTo = new File(validDir + file.getName()); + + if (moveFile(file, fTo)) { + if (newLastValidBalanceFileName.isEmpty() || + fileNameComparator.compare(newLastValidBalanceFileName, file.getName()) < 0) { + newLastValidBalanceFileName = file.getName(); + } + break; + } } else if (file != null) { log.warn(MARKER, "{}'s Hash doesn't match the Hash contained in valid signature file. Will try to download a balance file with same timestamp from other nodes and check the Hash.", file.getPath()); } @@ -122,17 +129,5 @@ public class AccountBalancesDownloader extends Downloader { ConfigLoader.setLastValidBalanceFileName(newLastValidBalanceFileName); ConfigLoader.saveToFile(); } - return validDir; } - - Pair<Boolean, File> downloadBalanceFile(File sigFile, String validDir) { - String nodeAccountId = Utility.getAccountIDStringFromFilePath(sigFile.getPath()); - String sigFileName = sigFile.getName(); - String balanceFileName = sigFileName.replace("_Balances.csv_sig", "_Balances.csv"); - String s3ObjectKey = "accountBalances/balance" + nodeAccountId + "/" + balanceFileName; - String localFileName = validDir + balanceFileName; - return saveToLocal(bucketName, s3ObjectKey, localFileName); - } - - } diff --git a/src/main/java/com/hedera/downloader/Downloader.java b/src/main/java/com/hedera/downloader/Downloader.java index 733cbf466..411b1c38f 100644 --- a/src/main/java/com/hedera/downloader/Downloader.java +++ b/src/main/java/com/hedera/downloader/Downloader.java @@ -1,6 +1,5 @@ package com.hedera.downloader; - import com.amazonaws.AmazonServiceException; import com.amazonaws.ClientConfiguration; import com.amazonaws.SdkClientException; @@ -16,7 +15,6 @@ import com.amazonaws.services.s3.model.S3ObjectSummary; import com.amazonaws.services.s3.transfer.Download; import com.amazonaws.services.s3.transfer.TransferManager; import com.amazonaws.services.s3.transfer.TransferManagerBuilder; -import com.google.gson.JsonObject; import com.hedera.configLoader.ConfigLoader; import com.hedera.configLoader.ConfigLoader.CLOUD_PROVIDER; import com.hedera.configLoader.ConfigLoader.OPERATION_TYPE; @@ -30,11 +28,14 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; + import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.file.Files; import java.nio.file.Path; import java.time.Instant; import java.util.ArrayList; @@ -42,7 +43,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; -import java.util.stream.Collectors; public abstract class Downloader { protected static final Logger log = LogManager.getLogger("downloader"); @@ -149,6 +149,7 @@ public abstract class Downloader { * Download all balance .csv files with timestamp later than lastValidBalanceFileName */ + @Deprecated protected void downloadBalanceFiles() throws IOException { String s3Prefix = null; String fileType = null; @@ -157,8 +158,7 @@ public abstract class Downloader { s3Prefix = ConfigLoader.getAccountBalanceS3Location(); fileType = ".csv"; lastValidFileName = ConfigLoader.getLastValidBalanceFileName(); - saveFilePath = ConfigLoader.getDefaultParseDir(OPERATION_TYPE.BALANCE); - + saveFilePath = ConfigLoader.getDefaultTmpDir(OPERATION_TYPE.BALANCE); // refresh node account ids nodeAccountIds = loadNodeAccountIDs(); @@ -215,8 +215,11 @@ public abstract class Downloader { count++; File file = result.getRight(); if (file != null) { - String fileName = file.getName(); - files.add(fileName); + // move the file to the valid directory + File fTo = new File(file.getAbsolutePath().replace("/tmp/", "/valid/") + file.getName()); + if (moveFile(file, fTo)) { + files.add(file.getName()); + } } } else if (result.getRight() == null) { log.error(MARKER, "File {} failed to download from cloud", s3ObjectKey); @@ -396,27 +399,6 @@ public abstract class Downloader { return sigFilesMap; } -// /** -// * return a pair of download result: -// * boolean: download it or not. -// * True means we download it successfully; False means it already exists or we fail to download it; -// * File is the local file -// * @param bucket_name -// * @param s3ObjectKey -// * @return -// */ -// protected static Pair<Boolean, File> saveToLocal(String bucket_name, -// String s3ObjectKey, String filePath) throws IOException { -// -// if (!Utility.createDirIfNotExists(filePath)) { -// log.error(MARKER, "{} doesn't exist and we fail to create this directory", filePath); -// return null; -// } -// -// filePath += s3ObjectKey; -// return saveToLocal(bucket_name, s3ObjectKey, filePath); -// } - /** * return a pair of download result: * boolean: download it or not. @@ -429,6 +411,7 @@ public abstract class Downloader { */ protected static Pair<Boolean, File> saveToLocal(String bucket_name, String s3ObjectKey, String localFilepath) { + // ensure filePaths have OS specific separator localFilepath = localFilepath.replace("/", "~"); localFilepath = localFilepath.replace("\\\\", "~"); @@ -436,15 +419,7 @@ public abstract class Downloader { File f = new File(localFilepath).getAbsoluteFile(); - if (f.exists()) { - log.info(MARKER, "File exists: " + localFilepath); - return Pair.of(false, f); - } try { - if( ! f.getParentFile().exists() ) { - f.getParentFile().mkdirs(); - } - //f.createNewFile(); Download download = xfer_mgr.download(bucket_name, s3ObjectKey, f); download.waitForCompletion(); if (download.isDone()) { @@ -455,10 +430,10 @@ public abstract class Downloader { return Pair.of(false, null); } } catch (AmazonServiceException ex) { - log.error(MARKER, "Download Fails: {}, Exception: {}", s3ObjectKey, ex); + log.error(MARKER, "Download Failed: {}, Exception: {}", s3ObjectKey, ex); } catch (InterruptedException ex) { - log.error(MARKER, "Download Fails: {}, Exception: {}", s3ObjectKey, ex); - } + log.error(MARKER, "Download Failed: {}, Exception: {}", s3ObjectKey, ex); + } return Pair.of(false, null); } @@ -517,4 +492,52 @@ public abstract class Downloader { xfer_mgr = TransferManagerBuilder.standard() .withS3Client(s3Client).build(); } + + /** + * Moves a file from one location to another + * boolean: true if file moved successfully + * Note: The method doesn't check if source file or destination directory exist to avoid + * repeated checks that could hurt performance + * @param sourceFile + * @param destinationFile + * @return boolean + */ + protected boolean moveFile(File sourceFile, File destinationFile) { + try { + // not checking if file exists to help with performance + // assumption is caller has created the destination file folder + Files.move(sourceFile.toPath(), destinationFile.toPath(), REPLACE_EXISTING); + return true; + } catch (IOException e) { + log.error(MARKER, "File Move from {} to {} Failed: {}, Exception: {}", sourceFile.getAbsolutePath(), destinationFile.getAbsolutePath(), e); + return false; + } + } + + protected Pair<Boolean, File> downloadFile(DownloadType downloadType, File sigFile, String targetDir) { + String fileName = ""; + String s3Prefix = ""; + + String nodeAccountId = Utility.getAccountIDStringFromFilePath(sigFile.getPath()); + String sigFileName = sigFile.getName(); + + switch (downloadType) { + case BALANCE: + fileName = sigFileName.replace("_Balances.csv_sig", "_Balances.csv"); + s3Prefix = ConfigLoader.getAccountBalanceS3Location(); + break; + case EVENT: + fileName = sigFileName.replace(".evts_sig", ".evts"); + s3Prefix = ConfigLoader.getEventFilesS3Location(); + break; + case RCD: + fileName = sigFileName.replace(".rcd_sig", ".rcd"); + s3Prefix = ConfigLoader.getRecordFilesS3Location(); + break; + } + String s3ObjectKey = s3Prefix + nodeAccountId + "/" + fileName; + + String localFileName = targetDir + "/" + fileName; + return saveToLocal(bucketName, s3ObjectKey, localFileName); + } } diff --git a/src/main/java/com/hedera/downloader/EventStreamFileDownloader.java b/src/main/java/com/hedera/downloader/EventStreamFileDownloader.java index f3a91a852..4db1f5172 100644 --- a/src/main/java/com/hedera/downloader/EventStreamFileDownloader.java +++ b/src/main/java/com/hedera/downloader/EventStreamFileDownloader.java @@ -3,6 +3,7 @@ package com.hedera.downloader; import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; import com.hedera.configLoader.ConfigLoader; +import com.hedera.configLoader.ConfigLoader.OPERATION_TYPE; import com.hedera.parser.EventStreamFileParser; import com.hedera.signatureVerifier.NodeSignatureVerifier; import com.hedera.utilities.Utility; @@ -23,9 +24,13 @@ import java.util.stream.Stream; public class EventStreamFileDownloader extends Downloader { - private static String validDir = null; + private static String validDir = ConfigLoader.getDefaultParseDir(OPERATION_TYPE.EVENTS); + private static String tmpDir = ConfigLoader.getDefaultTmpDir(OPERATION_TYPE.EVENTS); + private static File fileValidDir = new File(validDir); public EventStreamFileDownloader() { + Utility.createDirIfNotExists(validDir); + Utility.createDirIfNotExists(tmpDir); } public static void downloadNewEventfiles(EventStreamFileDownloader downloader) { @@ -50,7 +55,7 @@ public class EventStreamFileDownloader extends Downloader { if (validDir != null) { // new Thread(() -> { - verifyValidFiles(validDir); + verifyValidFiles(); // }).start(); } @@ -86,7 +91,7 @@ public class EventStreamFileDownloader extends Downloader { * * @param validDir */ - public static void verifyValidFiles(String validDir) { + public static void verifyValidFiles() { String lastValidEventFileName = ""; try { lastValidEventFileName = ConfigLoader.getLastValidEventFileName(); @@ -104,11 +109,7 @@ public class EventStreamFileDownloader extends Downloader { } String lastValidEventFileName2 = lastValidEventFileName; - File validDirFile = new File(validDir); - if (!validDirFile.exists()) { - return; - } - try (Stream<Path> pathStream = Files.walk(validDirFile.toPath())) { + try (Stream<Path> pathStream = Files.walk(fileValidDir.toPath())) { List<String> fileNames = pathStream.filter(p -> Utility.isEventStreamFile(p.toString())) .filter(p -> lastValidEventFileName2.isEmpty() || fileNameComparator.compare(p.toFile().getName(), lastValidEventFileName2) > 0) @@ -159,7 +160,7 @@ public class EventStreamFileDownloader extends Downloader { * * @param sigFilesMap */ - String verifySigsAndDownloadEventStreamFiles(Map<String, List<File>> sigFilesMap) { + private void verifySigsAndDownloadEventStreamFiles(Map<String, List<File>> sigFilesMap) { NodeSignatureVerifier verifier = new NodeSignatureVerifier(); for (String fileName : sigFilesMap.keySet()) { @@ -173,14 +174,16 @@ public class EventStreamFileDownloader extends Downloader { List<File> validSigFiles = verifier.verifySignatureFiles(sigFiles); if (validSigFiles != null) { for (File validSigFile : validSigFiles) { - if (validDir == null) { - validDir = validSigFile.getParentFile().getParent() + "/valid/"; - } - Pair<Boolean, File> fileResult = downloadFile(validSigFile, validDir); + Pair<Boolean, File> fileResult = downloadFile(DownloadType.EVENT, validSigFile, tmpDir); File file = fileResult.getRight(); - if (file != null && - Utility.hashMatch(validSigFile, file)) { - break; + if (file != null && Utility.hashMatch(validSigFile, file)) { + // move the file to the valid directory + File fTo = new File(validDir + file.getName()); + + if (moveFile(file, fTo)) { + break; + } + } else if (file != null) { log.warn(MARKER, "{}'s Hash doesn't match the Hash contained in valid signature file. Will try to " + @@ -195,22 +198,6 @@ public class EventStreamFileDownloader extends Downloader { } } } - return validDir; } - /** - * Download .evts file - * - * @param sigFile - * @param validDir - * @return - */ - Pair<Boolean, File> downloadFile(File sigFile, String validDir) { - String nodeAccountId = Utility.getAccountIDStringFromFilePath(sigFile.getPath()); - String sigFileName = sigFile.getName(); - String fileName = sigFileName.replace(".evts_sig", ".evts"); - String s3ObjectKey = ConfigLoader.getEventFilesS3Location() + nodeAccountId + "/" + fileName; - String localFileName = validDir + fileName; - return saveToLocal(bucketName, s3ObjectKey, localFileName); - } } diff --git a/src/main/java/com/hedera/downloader/RecordFileDownloader.java b/src/main/java/com/hedera/downloader/RecordFileDownloader.java index 737408e96..669bb612a 100644 --- a/src/main/java/com/hedera/downloader/RecordFileDownloader.java +++ b/src/main/java/com/hedera/downloader/RecordFileDownloader.java @@ -3,6 +3,7 @@ package com.hedera.downloader; import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; import com.hedera.configLoader.ConfigLoader; +import com.hedera.configLoader.ConfigLoader.OPERATION_TYPE; import com.hedera.parser.RecordFileParser; import com.hedera.signatureVerifier.NodeSignatureVerifier; import com.hedera.utilities.Utility; @@ -23,10 +24,12 @@ import java.util.stream.Stream; public class RecordFileDownloader extends Downloader { - private static String validRcdDir = null; - private static String s3prefix = ""; + private static String validDir = ConfigLoader.getDefaultParseDir(OPERATION_TYPE.RECORDS); + private static String tmpDir = ConfigLoader.getDefaultTmpDir(OPERATION_TYPE.RECORDS); public RecordFileDownloader() { + Utility.createDirIfNotExists(validDir); + Utility.createDirIfNotExists(tmpDir); } public static void downloadNewRecordfiles(RecordFileDownloader downloader) { @@ -39,9 +42,9 @@ public class RecordFileDownloader extends Downloader { // Verify signature files and download .rcd files of valid signature files downloader.verifySigsAndDownloadRecordFiles(sigFilesMap); - if (validRcdDir != null) { + if (validDir != null) { // new Thread(() -> { - verifyValidRecordFiles(validRcdDir); + verifyValidRecordFiles(validDir); // }).start(); } else { } @@ -145,12 +148,6 @@ public class RecordFileDownloader extends Downloader { // reload address book and keys NodeSignatureVerifier verifier = new NodeSignatureVerifier(); - validRcdDir = null; - s3prefix = ConfigLoader.getRecordFilesS3Location(); - if (s3prefix.endsWith("/")) { - s3prefix = s3prefix.substring(0, s3prefix.length()-2); - } - for (String fileName : sigFilesMap.keySet()) { if (Utility.checkStopFile()) { log.info(MARKER, "Stop file found, stopping"); @@ -169,14 +166,16 @@ public class RecordFileDownloader extends Downloader { log.info(MARKER, "Stop file found, stopping"); break; } - if (validRcdDir == null) { - validRcdDir = validSigFile.getParentFile().getParent() + "/valid/"; - } - Pair<Boolean, File> rcdFileResult = downloadRcdFile(validSigFile, validRcdDir); + + Pair<Boolean, File> rcdFileResult = downloadFile(DownloadType.RCD, validSigFile, tmpDir); File rcdFile = rcdFileResult.getRight(); - if (rcdFile != null && - Utility.hashMatch(validSigFile, rcdFile)) { - break; + if (rcdFile != null && Utility.hashMatch(validSigFile, rcdFile)) { + // move the file to the valid directory + File fTo = new File(validDir + "/" + rcdFile.getName()); + + if (moveFile(rcdFile, fTo)) { + break; + } } else if (rcdFile != null) { log.warn(MARKER, "{}'s Hash doesn't match the Hash contained in valid signature file. Will try to download a rcd file with same timestamp from other nodes and check the Hash.", rcdFile.getPath()); } @@ -186,17 +185,7 @@ public class RecordFileDownloader extends Downloader { } } } - return validRcdDir; - } - - Pair<Boolean, File> downloadRcdFile(File sigFile, String validRcdDir) { - String nodeAccountId = Utility.getAccountIDStringFromFilePath(sigFile.getPath()); - String sigFileName = sigFile.getName(); - String rcdFileName = sigFileName.replace(".rcd_sig", ".rcd"); -// String s3ObjectKey = "recordstreams/record" + nodeAccountId + "/" + rcdFileName; - String s3ObjectKey = s3prefix + nodeAccountId + "/" + rcdFileName; -// String localFileName = validRcdDir + rcdFileName; - return saveToLocal(bucketName, s3ObjectKey, validRcdDir + rcdFileName); + return validDir; } } diff --git a/src/main/java/com/hedera/utilities/Utility.java b/src/main/java/com/hedera/utilities/Utility.java index b67888b66..6f21b2bcc 100644 --- a/src/main/java/com/hedera/utilities/Utility.java +++ b/src/main/java/com/hedera/utilities/Utility.java @@ -45,8 +45,8 @@ public class Utility { private static final Marker LOGM_EXCEPTION = MarkerManager.getMarker("EXCEPTION"); private static final Long SCALAR = 1_000_000_000L; - private static final byte TYPE_PREV_HASH = 1; // next 48 bytes are hash384 of previous files - private static final byte TYPE_RECORD = 2; // next data type is transaction and its record +// private static final byte TYPE_PREV_HASH = 1; // next 48 bytes are hash384 of previous files +// private static final byte TYPE_RECORD = 2; // next data type is transaction and its record private static final byte TYPE_SIGNATURE = 3; // the file content signature, should not be hashed private static final byte TYPE_FILE_HASH = 4; // next 48 bytes are hash384 of content of corresponding RecordFile

['src/main/java/com/hedera/configLoader/ConfigLoader.java', 'src/main/java/com/hedera/downloader/AccountBalancesDownloader.java', 'src/main/java/com/hedera/downloader/Downloader.java', 'src/main/java/com/hedera/downloader/EventStreamFileDownloader.java', 'src/main/java/com/hedera/downloader/RecordFileDownloader.java', 'src/main/java/com/hedera/utilities/Utility.java']

{'.java': 6}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/193/192

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/192

https://github.com/hashgraph/hedera-mirror-node/pull/193

https://github.com/hashgraph/hedera-mirror-node/pull/193

fixes

When address book, that is larger than a single transaction, is updated - mirror node stops processing

**Detailed Description** Mainnet mirror node stopped processing (and could not continue processing after restart) when it encountered an address book update that was larger than a single transaction. The address book update in mainnet was a FILEUPDATE followed by 2 FILEAPPEND operations. This broke the mirrornode and stopped all processing. The log messages were: ``` at com.google.protobuf.AbstractParser.parseFrom(AbstractParser.java:209) ~[protobuf-java-3.5.1.jar:?] at com.google.protobuf.AbstractParser.parseFrom(AbstractParser.java:214) ~[protobuf-java-3.5.1.jar:?] at com.google.protobuf.AbstractParser.parseFrom(AbstractParser.java:49) ~[protobuf-java-3.5.1.jar:?] at com.hederahashgraph.api.proto.java.NodeAddressBook.parseFrom(NodeAddressBook.java:237) ~[hedera-protobuf-java-api-0.3.4.jar:?] at com.hedera.signatureVerifier.NodeSignatureVerifier.<init>(NodeSignatureVerifier.java:62) [mirrorNode.jar:?] at com.hedera.downloader.RecordFileDownloader.verifySigsAndDownloadRecordFiles(RecordFileDownloader.java:136) [mirrorNode.jar:?] at com.hedera.downloader.RecordFileDownloader.downloadNewRecordfiles(RecordFileDownloader.java:65) [mirrorNode.jar:?] at com.hedera.downloader.RecordFileDownloader.main(RecordFileDownloader.java:82) [mirrorNode.jar:?] ``` **Actual Behavior** **Expected Behavior** **Environment:** **Additional Context**

bd4ceb2a2c334535c6cf41a6bad3d14daa1f3e82

245b89602df53d89689e16810282738e6ab0d754

https://github.com/hashgraph/hedera-mirror-node/compare/bd4ceb2a2c334535c6cf41a6bad3d14daa1f3e82...245b89602df53d89689e16810282738e6ab0d754

diff --git a/src/main/java/com/hedera/addressBook/NetworkAddressBook.java b/src/main/java/com/hedera/addressBook/NetworkAddressBook.java index 763ac2ee5..3d075ee18 100644 --- a/src/main/java/com/hedera/addressBook/NetworkAddressBook.java +++ b/src/main/java/com/hedera/addressBook/NetworkAddressBook.java @@ -22,6 +22,7 @@ package com.hedera.addressBook; import java.io.FileNotFoundException; import java.io.IOException; +import java.util.Arrays; import java.util.Map; import com.hedera.configLoader.ConfigLoader; @@ -33,6 +34,7 @@ import com.hedera.hashgraph.sdk.HederaNetworkException; import com.hedera.hashgraph.sdk.account.AccountId; import com.hedera.hashgraph.sdk.crypto.ed25519.Ed25519PrivateKey; import com.hedera.hashgraph.sdk.file.FileId; +import com.hederahashgraph.api.proto.java.NodeAddressBook; import io.github.cdimascio.dotenv.Dotenv; @@ -50,6 +52,7 @@ public class NetworkAddressBook { static Client client; static Dotenv dotenv = Dotenv.configure().ignoreIfMissing().load(); + static byte[] addressBookBytes = new byte[0]; public static void main(String[] args) { @@ -62,8 +65,7 @@ public class NetworkAddressBook { .setFileId(new FileId(0, 0, 102)) .execute(); - writeFile(contents.getFileContents().getContents().toByteArray()); - log.info("New address book successfully saved to {}", addressBookFile); + update(contents.getFileContents().getContents().toByteArray()); } catch (FileNotFoundException e) { log.error("Address book file {} not found.", addressBookFile); } catch (IOException e) { @@ -75,10 +77,23 @@ public class NetworkAddressBook { } } - public static void writeFile(byte[] newContents) throws IOException { + public static void update(byte[] newContents) throws IOException { + addressBookBytes = newContents; + savetoDisk(); + } + + public static void append(byte[] extraContents) throws IOException { + byte[] newAddressBook = Arrays.copyOf(addressBookBytes, addressBookBytes.length + extraContents.length); + System.arraycopy(extraContents, 0, newAddressBook, addressBookBytes.length, extraContents.length); + addressBookBytes = newAddressBook; + savetoDisk(); + } + + private static void savetoDisk() throws IOException { FileOutputStream fos = new FileOutputStream(addressBookFile); - fos.write(newContents); + fos.write(addressBookBytes); fos.close(); + log.info("New address book successfully saved to {}", addressBookFile); } private static Client createHederaClient() { diff --git a/src/main/java/com/hedera/recordFileLogger/RecordFileLogger.java b/src/main/java/com/hedera/recordFileLogger/RecordFileLogger.java index 7405686b3..939587269 100644 --- a/src/main/java/com/hedera/recordFileLogger/RecordFileLogger.java +++ b/src/main/java/com/hedera/recordFileLogger/RecordFileLogger.java @@ -645,6 +645,15 @@ public class RecordFileLogger { if ( ! bSkip) { sqlInsertFileData.addBatch(); } + + // update the local address book + FileID updatedFile = body.getFileAppend().getFileID(); + + if ((updatedFile.getFileNum() == 102) && (updatedFile.getShardNum() == 0) && (updatedFile.getRealmNum() == 0)) { + // we have an address book update, refresh the local file + NetworkAddressBook.append(contents); + } + } } else if (body.hasFileCreate()) { if (ConfigLoader.getPersistFiles().contentEquals("ALL") || (ConfigLoader.getPersistFiles().contentEquals("SYSTEM") && txRecord.getReceipt().getFileID().getFileNum() < 1000)) { @@ -673,7 +682,7 @@ public class RecordFileLogger { if ((updatedFile.getFileNum() == 102) && (updatedFile.getShardNum() == 0) && (updatedFile.getRealmNum() == 0)) { // we have an address book update, refresh the local file - NetworkAddressBook.writeFile(body.getFileUpdate().getContents().toByteArray()); + NetworkAddressBook.update(body.getFileUpdate().getContents().toByteArray()); } } else if (body.hasFreeze()) {

['src/main/java/com/hedera/addressBook/NetworkAddressBook.java', 'src/main/java/com/hedera/recordFileLogger/RecordFileLogger.java']

{'.java': 2}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/133/132

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/132

https://github.com/hashgraph/hedera-mirror-node/pull/133

https://github.com/hashgraph/hedera-mirror-node/pull/133

fixes

RecordFileDownloader re-downloads same files over and over

The hash map in ApplicationStatus.java isn't static so when it's used by several classes, changes made by one don't propagate to the other. As a result, RecordFileDownloader and Downloader were managing two separate hash maps.

7c1b352c86bb9b9712d3ab4b82c160b63e19bb13

f7ef9da46ce2acc3b5184535df1d707586e65185

https://github.com/hashgraph/hedera-mirror-node/compare/7c1b352c86bb9b9712d3ab4b82c160b63e19bb13...f7ef9da46ce2acc3b5184535df1d707586e65185

diff --git a/src/main/java/com/hedera/databaseUtilities/ApplicationStatus.java b/src/main/java/com/hedera/databaseUtilities/ApplicationStatus.java index 8d2847feb..30eab5987 100644 --- a/src/main/java/com/hedera/databaseUtilities/ApplicationStatus.java +++ b/src/main/java/com/hedera/databaseUtilities/ApplicationStatus.java @@ -22,7 +22,7 @@ public class ApplicationStatus { ,LAST_PROCESSED_RECORD_HASH } - private ConcurrentHashMap<ApplicationStatusCode, String> applicationStatusMap = new ConcurrentHashMap<ApplicationStatusCode, String>(); + private static ConcurrentHashMap<ApplicationStatusCode, String> applicationStatusMap = new ConcurrentHashMap<ApplicationStatusCode, String>(); private static final String updateSQL = "UPDATE t_application_status SET " + " status_value = ? " diff --git a/src/main/java/com/hedera/parser/RecordFileParser.java b/src/main/java/com/hedera/parser/RecordFileParser.java index 08217bf20..c575e4750 100644 --- a/src/main/java/com/hedera/parser/RecordFileParser.java +++ b/src/main/java/com/hedera/parser/RecordFileParser.java @@ -8,6 +8,7 @@ import java.security.MessageDigest; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.common.base.Stopwatch;

['src/main/java/com/hedera/databaseUtilities/ApplicationStatus.java', 'src/main/java/com/hedera/parser/RecordFileParser.java']

{'.java': 2}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/59/57

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/57

https://github.com/hashgraph/hedera-mirror-node/pull/59

https://github.com/hashgraph/hedera-mirror-node/pull/59

fixes

FileWatcher not notified of files created while down

`BalanceFileLogger` uses the Java file watching API to be notified of creates and updates of files that the downloader writes. However, if `BalanceFileLogger` is down while downloader writes them then there will be no notification. We need to look for new files on startup.

ca4696cc42aecdb6c56986b390ab4e69f63db65c

2f7ce61451e9e12f4577d57948f600004d80afca

https://github.com/hashgraph/hedera-mirror-node/compare/ca4696cc42aecdb6c56986b390ab4e69f63db65c...2f7ce61451e9e12f4577d57948f600004d80afca

diff --git a/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java b/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java index 3a5acffdc..de10c1c00 100644 --- a/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java +++ b/src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java @@ -72,8 +72,6 @@ public class BalanceFileLogger extends FileWatcher { ,NUM } - private static Connection connect = null; - private static Instant fileTimestamp; private static long fileSeconds = 0; private static long fileNanos = 0; @@ -144,7 +142,7 @@ public class BalanceFileLogger extends FileWatcher { FileWatcher fileWatcher = new BalanceFileLogger(balanceFilePath); fileWatcher.watch(); } - + @Override public void onCreate() { processLastBalanceFile(); @@ -176,249 +174,236 @@ public class BalanceFileLogger extends FileWatcher { if ( ! balanceFile.toString().endsWith(".csv") ) { return false; } - try { - // process the file - connect = DatabaseUtilities.openDatabase(connect); - - if (connect != null) { - - try { - connect.setAutoCommit(false); - } catch (SQLException e) { - log.error(LOGM_EXCEPTION, "Unable to unset database auto commit, Exception: {}", e.getMessage()); - return false; - } - - if ( ! parseFileName(balanceFile)) { - return false; - } - - PreparedStatement selectBalance = connect.prepareStatement( - "SELECT id" - + " FROM t_account_balances" - + " WHERE shard = ?" - + " AND realm = ?" - + " AND num = ?"); - - PreparedStatement insertBalance = connect.prepareStatement( - "INSERT INTO t_account_balances (shard, realm, num, balance) " - + " VALUES (?, ?, ?, 0) " - + " RETURNING id"); - - PreparedStatement insertBalanceHistory; - insertBalanceHistory = connect.prepareStatement( - "insert into t_account_balance_history (snapshot_time, seconds, nanos, snapshot_time_ns, fk_balance_id, balance) " - + " values (" - + " ?" // snapshot - + ", ?" // seconds - + ", ?" // nanos - + ", ?" // snapshot_time_ns - + ", ?" // balance_id - + ", ?" // balance - + ")" - + " ON CONFLICT (snapshot_time, seconds, fk_balance_id)" - + " DO UPDATE set balance = EXCLUDED.balance"); - - BufferedReader br = new BufferedReader(new FileReader(balanceFile)); - - String line; - while ((line = br.readLine()) != null) { - if (processLine) { - try { - String[] balanceLine = line.split(","); - if (balanceLine.length != 4) { - log.error(LOGM_EXCEPTION, "Balance file {} appears truncated", balanceFile); - connect.rollback(); - insertBalanceHistory.close(); - selectBalance.close(); - insertBalance.close(); - br.close(); - return false; - } else { - - // get the account id from t_Account_balances - long accountId = 0; - - selectBalance.setLong(BalanceSelect.SHARD.ordinal(), Long.valueOf(balanceLine[0])); - selectBalance.setLong(BalanceSelect.REALM.ordinal(), Long.valueOf(balanceLine[1])); - selectBalance.setLong(BalanceSelect.NUM.ordinal(), Long.valueOf(balanceLine[2])); - - selectBalance.execute(); - ResultSet balanceRow = selectBalance.getResultSet(); - - if (balanceRow.next()) { - accountId = balanceRow.getLong(1); - } else { - insertBalance.setLong(BalanceHistoryInsertBalance.SHARD.ordinal(), Long.valueOf(balanceLine[0])); - insertBalance.setLong(BalanceHistoryInsertBalance.REALM.ordinal(), Long.valueOf(balanceLine[1])); - insertBalance.setLong(BalanceHistoryInsertBalance.NUM.ordinal(), Long.valueOf(balanceLine[2])); - - insertBalance.execute(); - - ResultSet newId = insertBalance.getResultSet(); - if (newId.next()) { - accountId = newId.getLong(1); - newId.close(); - } else { - // failed to create or fetch the account from t_account_balances - newId.close(); - balanceRow.close(); - throw new IllegalStateException("Unable to create or find, shard " + balanceLine[0] + ", realm " + balanceLine[1] + ", num " + balanceLine[2]); - } - } - balanceRow.close(); - Timestamp timestamp = Timestamp.from(fileTimestamp); - insertBalanceHistory.setTimestamp(BalanceHistoryInsert.SNAPSHOT_TIME.ordinal(), timestamp); - insertBalanceHistory.setLong(BalanceHistoryInsert.SECONDS.ordinal(), fileSeconds); - insertBalanceHistory.setLong(BalanceHistoryInsert.NANOS.ordinal(), fileNanos); - insertBalanceHistory.setLong(BalanceHistoryInsert.SNAPSHOT_TIME_NS.ordinal(), Utility.convertInstantToNanos(fileTimestamp)); - insertBalanceHistory.setLong(BalanceHistoryInsert.FK_BAL_ID.ordinal(), accountId); - insertBalanceHistory.setLong(BalanceHistoryInsert.BALANCE.ordinal(), Long.valueOf(balanceLine[3])); - - insertBalanceHistory.execute(); - } - } catch (SQLException e) { - log.error(LOGM_EXCEPTION, "Exception {}", e); - connect.rollback(); - insertBalanceHistory.close(); - selectBalance.close(); - insertBalance.close(); - br.close(); - return false; - } - } else if (line.contains("shard")) { - processLine = true; - } - } - connect.commit(); - insertBalanceHistory.close(); - selectBalance.close(); - insertBalance.close(); - br.close(); - return true; - } - } catch (FileNotFoundException e) { - log.error(LOGM_EXCEPTION, "Exception {}", e); - } catch (IOException e) { - log.error(LOGM_EXCEPTION, "Exception {}", e); - } catch (SQLException e) { + try (Connection connect = DatabaseUtilities.getConnection()) { + try { + connect.setAutoCommit(false); + } catch (SQLException e) { + log.error(LOGM_EXCEPTION, "Unable to unset database auto commit, Exception: {}", e.getMessage()); + return false; + } + + if ( ! parseFileName(balanceFile)) { + return false; + } + + PreparedStatement selectBalance = connect.prepareStatement( + "SELECT id" + + " FROM t_account_balances" + + " WHERE shard = ?" + + " AND realm = ?" + + " AND num = ?"); + + PreparedStatement insertBalance = connect.prepareStatement( + "INSERT INTO t_account_balances (shard, realm, num, balance) " + + " VALUES (?, ?, ?, 0) " + + " RETURNING id"); + + PreparedStatement insertBalanceHistory; + insertBalanceHistory = connect.prepareStatement( + "insert into t_account_balance_history (snapshot_time, seconds, nanos, snapshot_time_ns, fk_balance_id, balance) " + + " values (" + + " ?" // snapshot + + ", ?" // seconds + + ", ?" // nanos + + ", ?" // snapshot_time_ns + + ", ?" // balance_id + + ", ?" // balance + + ")" + + " ON CONFLICT (snapshot_time, seconds, fk_balance_id)" + + " DO UPDATE set balance = EXCLUDED.balance"); + + BufferedReader br = new BufferedReader(new FileReader(balanceFile)); + + String line; + while ((line = br.readLine()) != null) { + if (processLine) { + try { + String[] balanceLine = line.split(","); + if (balanceLine.length != 4) { + log.error(LOGM_EXCEPTION, "Balance file {} appears truncated", balanceFile); + connect.rollback(); + insertBalanceHistory.close(); + selectBalance.close(); + insertBalance.close(); + br.close(); + return false; + } else { + + // get the account id from t_Account_balances + long accountId = 0; + + selectBalance.setLong(BalanceSelect.SHARD.ordinal(), Long.valueOf(balanceLine[0])); + selectBalance.setLong(BalanceSelect.REALM.ordinal(), Long.valueOf(balanceLine[1])); + selectBalance.setLong(BalanceSelect.NUM.ordinal(), Long.valueOf(balanceLine[2])); + + selectBalance.execute(); + ResultSet balanceRow = selectBalance.getResultSet(); + + if (balanceRow.next()) { + accountId = balanceRow.getLong(1); + } else { + insertBalance.setLong(BalanceHistoryInsertBalance.SHARD.ordinal(), Long.valueOf(balanceLine[0])); + insertBalance.setLong(BalanceHistoryInsertBalance.REALM.ordinal(), Long.valueOf(balanceLine[1])); + insertBalance.setLong(BalanceHistoryInsertBalance.NUM.ordinal(), Long.valueOf(balanceLine[2])); + + insertBalance.execute(); + + ResultSet newId = insertBalance.getResultSet(); + if (newId.next()) { + accountId = newId.getLong(1); + newId.close(); + } else { + // failed to create or fetch the account from t_account_balances + newId.close(); + balanceRow.close(); + throw new IllegalStateException("Unable to create or find, shard " + balanceLine[0] + ", realm " + balanceLine[1] + ", num " + balanceLine[2]); + } + } + balanceRow.close(); + Timestamp timestamp = Timestamp.from(fileTimestamp); + insertBalanceHistory.setTimestamp(BalanceHistoryInsert.SNAPSHOT_TIME.ordinal(), timestamp); + insertBalanceHistory.setLong(BalanceHistoryInsert.SECONDS.ordinal(), fileSeconds); + insertBalanceHistory.setLong(BalanceHistoryInsert.NANOS.ordinal(), fileNanos); + insertBalanceHistory.setLong(BalanceHistoryInsert.SNAPSHOT_TIME_NS.ordinal(), Utility.convertInstantToNanos(fileTimestamp)); + insertBalanceHistory.setLong(BalanceHistoryInsert.FK_BAL_ID.ordinal(), accountId); + insertBalanceHistory.setLong(BalanceHistoryInsert.BALANCE.ordinal(), Long.valueOf(balanceLine[3])); + + insertBalanceHistory.execute(); + } + } catch (SQLException e) { + log.error(LOGM_EXCEPTION, "Exception {}", e); + connect.rollback(); + insertBalanceHistory.close(); + selectBalance.close(); + insertBalance.close(); + br.close(); + return false; + } + } else if (line.contains("shard")) { + processLine = true; + } + } + connect.commit(); + insertBalanceHistory.close(); + selectBalance.close(); + insertBalance.close(); + br.close(); + return true; + } catch (Exception e) { log.error(LOGM_EXCEPTION, "Exception {}", e); } return false; } private static void processLastBalanceFile() { - boolean processLine = false; - try { - File balanceFile = getLatestBalancefile(); - - if (balanceFile != null) { - // process the file - connect = DatabaseUtilities.openDatabase(connect); - - if ( ! parseFileName(balanceFile)) { - return; - } - - if (connect != null) { - connect.setAutoCommit(false); - - PreparedStatement updateLastBalanceTime = connect.prepareStatement( - "UPDATE t_account_balance_refresh_time" - + " SET seconds = ?" - + ",nanos = ?"); - - PreparedStatement selectBalance = connect.prepareStatement( - "SELECT id" - + " FROM t_account_balances" - + " WHERE shard = ?" - + " AND realm = ?" - + " AND num = ?"); - - PreparedStatement updateBalance = connect.prepareStatement( - "UPDATE t_account_balances" - + " SET balance = ?" - + " WHERE id = ?"); - - - PreparedStatement insertBalance = connect.prepareStatement( - "INSERT INTO t_account_balances (shard, realm, num, balance) " - + " VALUES (?, ?, ?, ?)"); - - // update last file update time - updateLastBalanceTime.setLong(1, fileSeconds); - updateLastBalanceTime.setLong(2, fileNanos); - updateLastBalanceTime.execute(); - - BufferedReader br = new BufferedReader(new FileReader(balanceFile)); - - String line; - while ((line = br.readLine()) != null) { - if (processLine) { - try { - String[] balanceLine = line.split(","); - if (balanceLine.length != 4) { - log.error(LOGM_EXCEPTION, "Balance file {} appears truncated", balanceFile); - connect.rollback(); - break; - } else { - selectBalance.setLong(BalanceSelect.SHARD.ordinal(), Long.valueOf(balanceLine[0])); - selectBalance.setLong(BalanceSelect.REALM.ordinal(), Long.valueOf(balanceLine[1])); - selectBalance.setLong(BalanceSelect.NUM.ordinal(), Long.valueOf(balanceLine[2])); - - selectBalance.execute(); - ResultSet balanceRow = selectBalance.getResultSet(); - if (balanceRow.next()) { - // update the balance - updateBalance.setLong(BalanceUpdate.BALANCE.ordinal(), Long.valueOf(balanceLine[3])); - updateBalance.setLong(BalanceUpdate.ID.ordinal(), balanceRow.getLong(1)); - updateBalance.execute(); - } else { - // insert new row - insertBalance.setLong(BalanceInsert.SHARD.ordinal(), Long.valueOf(balanceLine[0])); - insertBalance.setLong(BalanceInsert.REALM.ordinal(), Long.valueOf(balanceLine[1])); - insertBalance.setLong(BalanceInsert.NUM.ordinal(), Long.valueOf(balanceLine[2])); - insertBalance.setLong(BalanceInsert.BALANCE.ordinal(), Long.valueOf(balanceLine[3])); - insertBalance.execute(); - } - balanceRow.close(); - } - - } catch (SQLException e) { - connect.rollback(); - log.error(LOGM_EXCEPTION, "Exception {}", e); - break; - } - } else if (line.contentEquals("shard,realm,number,balance")) { - // skip all lines until shard,realm,number,balance - processLine = true; - } else if (line.contentEquals("shardNum,realmNum,accountNum,balance")) { - // skip all lines until shard,realm,number,balance - processLine = true; - } - } - connect.commit(); - insertBalance.close(); - updateBalance.close(); - selectBalance.close(); - updateLastBalanceTime.close(); - br.close(); - } - } else { - log.info("No balance file to parse found"); - } - } catch (IOException e) { - log.error(LOGM_EXCEPTION, "Exception {}", e); - } catch (SQLException e) { - log.error(LOGM_EXCEPTION, "Exception {}", e); - try { - connect.rollback(); - } catch (SQLException e1) { - log.error(LOGM_EXCEPTION, "Exception {}", e1); + try (Connection connect = DatabaseUtilities.getConnection()) { + File balanceFile = getLatestBalancefile(); + + if (balanceFile == null) { + return; + } else if (!parseFileName(balanceFile)) { + log.info("Invalid balance file"); + return; } - } + + try { + connect.setAutoCommit(false); + + PreparedStatement updateLastBalanceTime = connect.prepareStatement( + "UPDATE t_account_balance_refresh_time" + + " SET seconds = ?" + + ",nanos = ?"); + + PreparedStatement selectBalance = connect.prepareStatement( + "SELECT id" + + " FROM t_account_balances" + + " WHERE shard = ?" + + " AND realm = ?" + + " AND num = ?"); + + PreparedStatement updateBalance = connect.prepareStatement( + "UPDATE t_account_balances" + + " SET balance = ?" + + " WHERE id = ?"); + + + PreparedStatement insertBalance = connect.prepareStatement( + "INSERT INTO t_account_balances (shard, realm, num, balance) " + + " VALUES (?, ?, ?, ?)"); + + // update last file update time + updateLastBalanceTime.setLong(1, fileSeconds); + updateLastBalanceTime.setLong(2, fileNanos); + updateLastBalanceTime.execute(); + + BufferedReader br = new BufferedReader(new FileReader(balanceFile)); + + String line; + while ((line = br.readLine()) != null) { + if (processLine) { + try { + String[] balanceLine = line.split(","); + if (balanceLine.length != 4) { + log.error(LOGM_EXCEPTION, "Balance file {} appears truncated", balanceFile); + connect.rollback(); + break; + } else { + selectBalance.setLong(BalanceSelect.SHARD.ordinal(), Long.valueOf(balanceLine[0])); + selectBalance.setLong(BalanceSelect.REALM.ordinal(), Long.valueOf(balanceLine[1])); + selectBalance.setLong(BalanceSelect.NUM.ordinal(), Long.valueOf(balanceLine[2])); + + selectBalance.execute(); + ResultSet balanceRow = selectBalance.getResultSet(); + if (balanceRow.next()) { + // update the balance + updateBalance.setLong(BalanceUpdate.BALANCE.ordinal(), Long.valueOf(balanceLine[3])); + updateBalance.setLong(BalanceUpdate.ID.ordinal(), balanceRow.getLong(1)); + updateBalance.execute(); + } else { + // insert new row + insertBalance.setLong(BalanceInsert.SHARD.ordinal(), Long.valueOf(balanceLine[0])); + insertBalance.setLong(BalanceInsert.REALM.ordinal(), Long.valueOf(balanceLine[1])); + insertBalance.setLong(BalanceInsert.NUM.ordinal(), Long.valueOf(balanceLine[2])); + insertBalance.setLong(BalanceInsert.BALANCE.ordinal(), Long.valueOf(balanceLine[3])); + insertBalance.execute(); + } + balanceRow.close(); + } + + } catch (SQLException e) { + connect.rollback(); + log.error(LOGM_EXCEPTION, "Exception {}", e); + break; + } + } else if (line.contentEquals("shard,realm,number,balance")) { + // skip all lines until shard,realm,number,balance + processLine = true; + } else if (line.contentEquals("shardNum,realmNum,accountNum,balance")) { + // skip all lines until shard,realm,number,balance + processLine = true; + } + } + connect.commit(); + insertBalance.close(); + updateBalance.close(); + selectBalance.close(); + updateLastBalanceTime.close(); + br.close(); + } catch (IOException e) { + log.error(LOGM_EXCEPTION, "Exception {}", e); + } catch (SQLException e) { + log.error(LOGM_EXCEPTION, "Exception {}", e); + try { + connect.rollback(); + } catch (SQLException e1) { + log.error(LOGM_EXCEPTION, "Exception {}", e1); + } + } + } catch (Exception e) { + log.error(LOGM_EXCEPTION, "Error closing connection {}", e); + } log.info(MARKER, "Last Balance processing done"); } } diff --git a/src/main/java/com/hedera/fileWatcher/FileWatcher.java b/src/main/java/com/hedera/fileWatcher/FileWatcher.java index f8ad62d0b..89b142992 100644 --- a/src/main/java/com/hedera/fileWatcher/FileWatcher.java +++ b/src/main/java/com/hedera/fileWatcher/FileWatcher.java @@ -21,6 +21,9 @@ public abstract class FileWatcher { } public void watch() { + // Invoke on startup to check for any changed files while this process was down. + onCreate(); + try (WatchService watcher = FileSystems.getDefault().newWatchService()) { Path path = pathToWatch.toPath(); WatchKey rootKey = path.register(watcher, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY);

['src/main/java/com/hedera/balanceFileLogger/BalanceFileLogger.java', 'src/main/java/com/hedera/fileWatcher/FileWatcher.java']

{'.java': 2}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

hashgraph/hedera-mirror-node/213/203

hashgraph

hedera-mirror-node

https://github.com/hashgraph/hedera-mirror-node/issues/203

https://github.com/hashgraph/hedera-mirror-node/pull/213

https://github.com/hashgraph/hedera-mirror-node/pull/213

fixes

DB migration error

**Detailed Description** ERROR [main ] o.f.c.i.c.DbMigrate Migration of schema "public" to version 1.8 - MigrateConfig failed! Changes successfully rolled back. The issue affects any attempt to migrate the database (which running any of the services does) when: - The database had not already migrated v1.8 of the DB, **_and_** - `./config/config.json` is not located relative to the working directory of the running service/app. This would include anyone trying to install out of the CI-deliverable, using the instructions for installing that, against a fresh/empty database (as ./config/config.json is no longer located at that place relative to the running service's working directory). **Workaround** Ensure that "config.json" is found in the "./config/" directory relative to the working directory of the running processes (any of the downloaders or parsers). If the working directory of the processes is /usr/lib/mirror-node and the config.json is in /usr/etc/mirror-node, then: - `sudo ln -s /usr/etc/mirror-node /usr/lib/mirror-node/config` - restart all downloader and parser processes **Actual Behavior** **Expected Behavior** **Environment:** **Additional Context** Fix will be to remove the v1.8 migration code as it's not needed for a fresh DB, is causing this issue, and was only in place to upgrade from pre-v0.1.0 systems.

f6e13feadced118b964abb73a9b5a0a4829a0ae8

1df691351b0177f0dd04569911b3e76d66dc68f2

https://github.com/hashgraph/hedera-mirror-node/compare/f6e13feadced118b964abb73a9b5a0a4829a0ae8...1df691351b0177f0dd04569911b3e76d66dc68f2

diff --git a/src/main/java/com/hedera/databaseUtilities/DatabaseUtilities.java b/src/main/java/com/hedera/databaseUtilities/DatabaseUtilities.java index ce51629af..7cc839716 100644 --- a/src/main/java/com/hedera/databaseUtilities/DatabaseUtilities.java +++ b/src/main/java/com/hedera/databaseUtilities/DatabaseUtilities.java @@ -53,6 +53,16 @@ public class DatabaseUtilities { .dataSource(dataSource) .baselineOnMigrate(true) .baselineVersion(MigrationVersion.fromVersion("0")) + + // Allow missing migrations without failing the overall migration. + // This would allow the database to have a "V1.23" migration in it (before the product is 1.0-ready), + // that gets removed by developers at a future point. + // When the software is updated and no longer has V1.23 in it (bad migration file removed by dev), + // but flyway sees a database that had V1.23 in it - ignore this issue and continue flyway migrations. + // This allows development to more easily "fix" some bad initial migration files without resorting + // to `flyway repair`. + .ignoreMissingMigrations(true) + .placeholders(ImmutableMap.of( "api-user", ConfigLoader.getApiUsername(), "api-password", ConfigLoader.getApiPassword(), diff --git a/src/main/java/db/migration/V1_8__MigrateConfig.java b/src/main/java/db/migration/V1_8__MigrateConfig.java deleted file mode 100644 index d57fe3292..000000000 --- a/src/main/java/db/migration/V1_8__MigrateConfig.java +++ /dev/null @@ -1,203 +0,0 @@ -package db.migration; - -/*- - * ‌ - * Hedera Mirror Node - * ​ - * Copyright (C) 2019 Hedera Hashgraph, LLC - * ​ - * 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. - * ‍ - */ - -import org.flywaydb.core.api.migration.BaseJavaMigration; -import org.flywaydb.core.api.migration.Context; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonIOException; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonSyntaxException; -import com.hedera.databaseUtilities.ApplicationStatus; - -import lombok.extern.log4j.Log4j2; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.sql.PreparedStatement; - -@Log4j2 -public class V1_8__MigrateConfig extends BaseJavaMigration { - public void migrate(Context context) throws Exception { - - String configSavePath = "./config/config.json"; - String balanceSavePath = "./config/balance.json"; - String recordsSavePath = "./config/records.json"; - String eventsSavePath = "./config/events.json"; - String loggerSavePath = "./config/loggerStatus.json"; - - JsonObject configJsonObject; - JsonObject balanceJsonObject; - JsonObject recordsJsonObject; - JsonObject eventsJsonObject; - JsonObject loggerJsonObject; - - String stopLoggingIfRecordHashMismatchAfter = ""; - String stopLoggingIfEventHashMismatchAfter = ""; - String lastValidBalanceFileName = ""; - String lastValidRcdFileName = ""; - String lastValidRcdFileHash = ""; - String lastValidEventFileName = ""; - String lastValidEventFileHash = ""; - String lastProcessedRcdHash = ""; - String lastProcessedEventHash = ""; - - configJsonObject = getJsonObject(configSavePath); - - if (configJsonObject.has("stopLoggingIfRecordHashMismatch")) { - stopLoggingIfRecordHashMismatchAfter = configJsonObject.get("stopLoggingIfRecordHashMismatch").getAsString(); - } - - if (configJsonObject.has("stopLoggingIfEventHashMismatch")) { - stopLoggingIfEventHashMismatchAfter = configJsonObject.get("stopLoggingIfEventHashMismatch").getAsString(); - } - File balanceFile = new File(balanceSavePath); - if (balanceFile.exists()) { - balanceJsonObject = getJsonObject(balanceSavePath); - if (balanceJsonObject.has("lastValidBalanceFileName")) { - lastValidBalanceFileName = balanceJsonObject.get("lastValidBalanceFileName").getAsString(); - } - } else if (configJsonObject.has("lastValidBalanceFileName")) { - lastValidBalanceFileName = configJsonObject.get("lastValidBalanceFileName").getAsString(); - } - - File recordFile = new File(recordsSavePath); - if (recordFile.exists()) { - recordsJsonObject = getJsonObject(recordsSavePath); - if (recordsJsonObject.has("lastValidRcdFileName")) { - lastValidRcdFileName = recordsJsonObject.get("lastValidRcdFileName").getAsString(); - } - if (recordsJsonObject.has("lastValidRcdFileHash")) { - lastValidRcdFileHash = recordsJsonObject.get("lastValidRcdFileHash").getAsString(); - } - } else if ((configJsonObject.has("lastValidRcdFileName")) || (configJsonObject.has("lastValidRcdFileHash"))) { - if (configJsonObject.has("lastValidRcdFileName")) { - lastValidRcdFileName = configJsonObject.get("lastValidRcdFileName").getAsString(); - } - if (configJsonObject.has("lastValidRcdFileHash")) { - lastValidRcdFileHash = configJsonObject.get("lastValidRcdFileHash").getAsString(); - } - } - - File eventFile = new File(eventsSavePath); - if (eventFile.exists()) { - eventsJsonObject = getJsonObject(eventsSavePath); - if (eventsJsonObject.has("lastValidEventFileName")) { - lastValidEventFileName = eventsJsonObject.get("lastValidEventFileName").getAsString(); - } - if (eventsJsonObject.has("lastValidEventFileHash")) { - lastValidEventFileHash = eventsJsonObject.get("lastValidEventFileHash").getAsString(); - } - } - - File loggerFile = new File (loggerSavePath); - - if (loggerFile.exists()) { - loggerJsonObject = getJsonObject(loggerSavePath); - - if (loggerJsonObject.has("lastProcessedRcdHash")) { - lastProcessedRcdHash = loggerJsonObject.get("lastProcessedRcdHash").getAsString(); - } - if (loggerJsonObject.has("lastProcessedEventHash")) { - lastProcessedEventHash = loggerJsonObject.get("lastProcessedEventHash").getAsString(); - } - } - - try (PreparedStatement updateValue = context.getConnection().prepareStatement( - "UPDATE t_application_status SET " - + " status_value = ? " - + " WHERE status_code = ?")) { - updateValue.setString(1, stopLoggingIfEventHashMismatchAfter); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.EVENT_HASH_MISMATCH_BYPASS_UNTIL_AFTER.name()); - updateValue.execute(); - updateValue.setString(1, stopLoggingIfRecordHashMismatchAfter); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.RECORD_HASH_MISMATCH_BYPASS_UNTIL_AFTER.name()); - updateValue.execute(); - updateValue.setString(1, lastValidBalanceFileName); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_VALID_DOWNLOADED_BALANCE_FILE.name()); - updateValue.execute(); - updateValue.setString(1, lastValidRcdFileName); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_VALID_DOWNLOADED_RECORD_FILE.name()); - updateValue.execute(); - updateValue.setString(1, lastValidRcdFileHash); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_VALID_DOWNLOADED_RECORD_FILE_HASH.name()); - updateValue.execute(); - updateValue.setString(1, lastValidEventFileName); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_VALID_DOWNLOADED_EVENT_FILE.name()); - updateValue.execute(); - updateValue.setString(1, lastValidEventFileHash); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_VALID_DOWNLOADED_EVENT_FILE_HASH.name()); - updateValue.execute(); - updateValue.setString(1, lastProcessedRcdHash); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_PROCESSED_RECORD_HASH.name()); - updateValue.execute(); - updateValue.setString(1, lastProcessedEventHash); - updateValue.setString(2, ApplicationStatus.ApplicationStatusCode.LAST_PROCESSED_EVENT_HASH.name()); - updateValue.execute(); - } - - // remove from config file - configJsonObject.remove("lastValidRcdFileName"); - configJsonObject.remove("lastValidRcdFileHash"); - configJsonObject.remove("stopLoggingIfRecordHashMismatch"); - configJsonObject.remove("stopLoggingIfEventHashMismatch"); - configJsonObject.remove("lastValidBalanceFileName"); - - try (FileWriter configFile = new FileWriter(configSavePath)) { - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - gson.toJson(configJsonObject, configFile); - log.debug("Successfully wrote update to {}", configSavePath); - } catch (IOException ex) { - log.error("Fail to write update to {}", configSavePath, ex); - throw ex; - } - - if (balanceFile.exists()) { - balanceFile.delete(); - } - if (recordFile.exists()) { - recordFile.delete(); - } - if (eventFile.exists()) { - eventFile.delete(); - } - if (loggerFile.exists()) { - loggerFile.delete(); - } - } - - private JsonObject getJsonObject( - final String location) throws JsonIOException, JsonSyntaxException, FileNotFoundException { - - final JsonParser parser = new JsonParser(); - - // Read file into object - final FileReader file = new FileReader(location); - return (JsonObject) parser.parse(file); - } - -}

['src/main/java/db/migration/V1_8__MigrateConfig.java', 'src/main/java/com/hedera/databaseUtilities/DatabaseUtilities.java']

{'.java': 2}

Java

{'Java': 8228904, 'JavaScript': 1607027, 'Go': 582284, 'Kotlin': 65844, 'PLpgSQL': 50429, 'Solidity': 45435, 'Gherkin': 33509, 'Shell': 27165, 'Mustache': 22158, 'Dockerfile': 17413, 'HTML': 1783, 'Python': 1445, 'CSS': 1425}

Apache License 2.0

adyen/adyen-android/1242/1234

adyen

adyen-android

https://github.com/Adyen/adyen-android/issues/1234

https://github.com/Adyen/adyen-android/pull/1242

https://github.com/Adyen/adyen-android/pull/1242

fixes

Crash on AwaitView when DNKA is active

**Describe the bug** Application Crashes when trying to pay with MBWay with DNKA (Do Not Keep Activities) active, if the user goes to background and then to foreground again. This is problematic because MBWay will force the user to navigate to a different app to confirm the payment, which can increase the probability of this issue to occur in production. **To Reproduce** Steps to reproduce the behavior: 1. Make sure the device is with DNKA active 2. Start a payment with MBWay 3. While the payment is awaiting confirmation (see screenshot) go to background 4. Bring the app again back to foreground 5. Crash happens **Expected behavior** When returning to the app, the DropIn would be restored with the AwaitView and the process would conclude as expected. **Screenshots** <img src="https://github.com/Adyen/adyen-android/assets/19568050/84de811b-9120-4524-9339-07131048e6a2" width="200" height="400" /> **Smartphone (please complete the following information):** - Device: Any - OS: Any - Version: 4.12.0 **Additional context** Stacktrace: ``` java.lang.NullPointerException: Attempt to invoke virtual method 'int java.lang.String.hashCode()' on a null object reference at com.adyen.checkout.await.AwaitView.getMessageTextResource(AwaitView.java:126) at com.adyen.checkout.await.AwaitView.updateMessageText(AwaitView.java:118) at com.adyen.checkout.await.AwaitView.onChanged(AwaitView.java:95) at com.adyen.checkout.await.AwaitView.onChanged(AwaitView.java:32) at androidx.lifecycle.LiveData.considerNotify(LiveData.java:133) at androidx.lifecycle.LiveData.dispatchingValue(LiveData.java:146) at androidx.lifecycle.LiveData$ObserverWrapper.activeStateChanged(LiveData.java:468) at androidx.lifecycle.LiveData$LifecycleBoundObserver.onStateChanged(LiveData.java:425) at androidx.lifecycle.LifecycleRegistry$ObserverWithState.dispatchEvent(LifecycleRegistry.java:360) at androidx.lifecycle.LifecycleRegistry.forwardPass(LifecycleRegistry.java:271) at androidx.lifecycle.LifecycleRegistry.sync(LifecycleRegistry.java:313) at androidx.lifecycle.LifecycleRegistry.moveToState(LifecycleRegistry.java:151) at androidx.lifecycle.LifecycleRegistry.handleLifecycleEvent(LifecycleRegistry.java:134) at androidx.fragment.app.FragmentViewLifecycleOwner.handleLifecycleEvent(FragmentViewLifecycleOwner.java:93) at androidx.fragment.app.Fragment.performStart(Fragment.java:3169) at androidx.fragment.app.FragmentStateManager.start(FragmentStateManager.java:588) at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:279) at androidx.fragment.app.FragmentStore.moveToExpectedState(FragmentStore.java:113) at androidx.fragment.app.FragmentManager.moveToState(FragmentManager.java:1433) at androidx.fragment.app.FragmentManager.dispatchStateChange(FragmentManager.java:2977) at androidx.fragment.app.FragmentManager.dispatchStart(FragmentManager.java:2902) at androidx.fragment.app.FragmentController.dispatchStart(FragmentController.java:274) at androidx.fragment.app.FragmentActivity.onStart(FragmentActivity.java:359) at androidx.appcompat.app.AppCompatActivity.onStart(AppCompatActivity.java:248) at com.adyen.checkout.dropin.ui.DropInActivity.onStart(DropInActivity.kt:248) at android.app.Instrumentation.callActivityOnStart(Instrumentation.java:1455) at android.app.Activity.performStart(Activity.java:8076) at android.app.ActivityThread.handleStartActivity(ActivityThread.java:3660) at android.app.servertransaction.TransactionExecutor.performLifecycleSequence(TransactionExecutor.java:221) at android.app.servertransaction.TransactionExecutor.cycleToPath(TransactionExecutor.java:201) at android.app.servertransaction.TransactionExecutor.executeLifecycleState(TransactionExecutor.java:173) at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:97) at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2210) at android.os.Handler.dispatchMessage(Handler.java:106) at android.os.Looper.loopOnce(Looper.java:201) at android.os.Looper.loop(Looper.java:288) at android.app.ActivityThread.main(ActivityThread.java:7839) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1003) ```

c2601443d8288a1cd4cfcc315a3a3644f2602c63

6ed7e3b4601b4822fc54a4ced0327c95f7f3a927

https://github.com/adyen/adyen-android/compare/c2601443d8288a1cd4cfcc315a3a3644f2602c63...6ed7e3b4601b4822fc54a4ced0327c95f7f3a927

diff --git a/await/src/main/java/com/adyen/checkout/await/AwaitView.java b/await/src/main/java/com/adyen/checkout/await/AwaitView.java index 9c305fc26..73a09d0e5 100644 --- a/await/src/main/java/com/adyen/checkout/await/AwaitView.java +++ b/await/src/main/java/com/adyen/checkout/await/AwaitView.java @@ -123,6 +123,10 @@ public class AwaitView extends AdyenLinearLayout<AwaitOutputData, AwaitConfigura @StringRes private Integer getMessageTextResource() { + if (mPaymentMethodType == null) { + return null; + } + switch (mPaymentMethodType) { case PaymentMethodTypes.BLIK: return R.string.checkout_await_message_blik;

['await/src/main/java/com/adyen/checkout/await/AwaitView.java']

{'.java': 1}