diff --git a/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/Service.kt b/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/Service.kt index 99ad957f2e..a331caee07 100644 --- a/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/Service.kt +++ b/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/Service.kt @@ -10,7 +10,7 @@ "ArrayInDataClass", "EnumEntryName", "RemoveRedundantQualifierName", - "UnusedImport" + "UnusedImport", ) package org.hyperledger.identus.client.models @@ -18,17 +18,6 @@ package org.hyperledger.identus.client.models import com.google.gson.* import com.google.gson.annotations.JsonAdapter import com.google.gson.annotations.SerializedName - - -/** - * A service expressed in the DID document. https://www.w3.org/TR/did-core/#services - * - * @param id The id of the service. Requires a URI fragment when use in create / update DID. Returns the full ID (with DID prefix) when resolving DID - * @param type - * @param serviceEndpoint - */ - -import com.google.gson.* import java.lang.reflect.Type class StringOrStringArrayAdapter : JsonSerializer>, JsonDeserializer> { @@ -50,15 +39,13 @@ class StringOrStringArrayAdapter : JsonSerializer>, JsonDeserialize override fun serialize(src: List?, typeOfSrc: Type?, context: JsonSerializationContext?): JsonElement { return when { src == null -> JsonNull.INSTANCE - src.size == 1 -> JsonPrimitive(src[0]) // If only one string, serialize as a single string - else -> context!!.serialize(src) // Otherwise, serialize as a list + src.size == 1 -> JsonPrimitive(src[0]) // If only one string, serialize as a single string + else -> context!!.serialize(src) // Otherwise, serialize as a list } } } - - -data class Service ( +data class Service( /* The id of the service. Requires a URI fragment when use in create / update DID. Returns the full ID (with DID prefix) when resolving DID */ @SerializedName("id") @@ -69,7 +56,6 @@ data class Service ( val type: kotlin.collections.List? = null, @SerializedName("serviceEndpoint") - val serviceEndpoint: JsonElement? = null + val serviceEndpoint: JsonElement? = null, ) - diff --git a/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/UpdateManagedDIDServiceAction.kt b/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/UpdateManagedDIDServiceAction.kt index 7883eacc5b..5c8aa24016 100644 --- a/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/UpdateManagedDIDServiceAction.kt +++ b/cloud-agent/client/kotlin/src/main/kotlin/org/hyperledger/identus/client/models/UpdateManagedDIDServiceAction.kt @@ -10,24 +10,23 @@ "ArrayInDataClass", "EnumEntryName", "RemoveRedundantQualifierName", - "UnusedImport" + "UnusedImport", ) package org.hyperledger.identus.client.models -import com.google.gson.annotations.SerializedName import com.google.gson.JsonElement +import com.google.gson.annotations.SerializedName /** * A patch to existing Service. 'type' and 'serviceEndpoint' cannot both be empty. * * @param id The id of the service to update - * @param type - * @param serviceEndpoint + * @param type + * @param serviceEndpoint */ - -data class UpdateManagedDIDServiceAction ( +data class UpdateManagedDIDServiceAction( /* The id of the service to update */ @SerializedName("id") @@ -37,7 +36,6 @@ data class UpdateManagedDIDServiceAction ( val type: kotlin.collections.List? = null, @SerializedName("serviceEndpoint") - val serviceEndpoint: JsonElement? = null + val serviceEndpoint: JsonElement? = null, ) - diff --git a/tests/integration-tests/src/test/kotlin/abilities/ListenToEvents.kt b/tests/integration-tests/src/test/kotlin/abilities/ListenToEvents.kt index 2d74b8d5fe..e2116d6793 100644 --- a/tests/integration-tests/src/test/kotlin/abilities/ListenToEvents.kt +++ b/tests/integration-tests/src/test/kotlin/abilities/ListenToEvents.kt @@ -28,7 +28,7 @@ open class ListenToEvents( private val gson = GsonBuilder() .registerTypeAdapter( OffsetDateTime::class.java, - CustomGsonObjectMapperFactory.OffsetDateTimeTypeAdapter() + CustomGsonObjectMapperFactory.OffsetDateTimeTypeAdapter(), ) .create() @@ -47,29 +47,29 @@ open class ListenToEvents( TestConstants.EVENT_TYPE_CONNECTION_UPDATED -> connectionEvents.add( gson.fromJson( eventString, - ConnectionEvent::class.java - ) + ConnectionEvent::class.java, + ), ) TestConstants.EVENT_TYPE_ISSUE_CREDENTIAL_RECORD_UPDATED -> credentialEvents.add( gson.fromJson( eventString, - CredentialEvent::class.java - ) + CredentialEvent::class.java, + ), ) TestConstants.EVENT_TYPE_PRESENTATION_UPDATED -> presentationEvents.add( gson.fromJson( eventString, - PresentationEvent::class.java - ) + PresentationEvent::class.java, + ), ) TestConstants.EVENT_TYPE_DID_STATUS_UPDATED -> didEvents.add( gson.fromJson( eventString, - DidEvent::class.java - ) + DidEvent::class.java, + ), ) else -> { diff --git a/tests/integration-tests/src/test/kotlin/steps/did/UpdateDidSteps.kt b/tests/integration-tests/src/test/kotlin/steps/did/UpdateDidSteps.kt index d5ff3ed1a4..0bbfa21380 100644 --- a/tests/integration-tests/src/test/kotlin/steps/did/UpdateDidSteps.kt +++ b/tests/integration-tests/src/test/kotlin/steps/did/UpdateDidSteps.kt @@ -198,7 +198,9 @@ class UpdateDidSteps { serviceEndpoint.asString.contains(serviceUrl) } else if (serviceEndpoint.isJsonArray) { serviceEndpoint.asJsonArray.any { it.asString.contains(serviceUrl) } - } else false + } else { + false + } } }, equalTo(true),