From 6104d114c8ff895ad8c9a2ed0b396d31598f0031 Mon Sep 17 00:00:00 2001 From: Jonathan Locke Date: Thu, 14 Nov 2019 15:11:02 +0000 Subject: [PATCH 1/8] NOTICK: Update API after release of 4.3 Update the api-current.txt file after the release of Corda 4.3 --- .ci/api-current.txt | 388 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 388 insertions(+) diff --git a/.ci/api-current.txt b/.ci/api-current.txt index 4541d6002e..b192465045 100644 --- a/.ci/api-current.txt +++ b/.ci/api-current.txt @@ -478,6 +478,8 @@ public interface net.corda.core.contracts.Attachment extends net.corda.core.cont public interface net.corda.core.contracts.AttachmentConstraint public abstract boolean isSatisfiedBy(net.corda.core.contracts.Attachment) ## +public final class net.corda.core.contracts.AttachmentConstraintKt extends java.lang.Object +## @CordaSerializable public final class net.corda.core.contracts.AttachmentResolutionException extends net.corda.core.flows.FlowException public (net.corda.core.crypto.SecureHash) @@ -570,6 +572,7 @@ public interface net.corda.core.contracts.Contract public abstract void verify(net.corda.core.transactions.LedgerTransaction) ## @DoNotImplement +@CordaSerializable public final class net.corda.core.contracts.ContractAttachment extends java.lang.Object implements net.corda.core.contracts.Attachment public (net.corda.core.contracts.Attachment, String) public (net.corda.core.contracts.Attachment, String, java.util.Set) @@ -648,6 +651,11 @@ public final class net.corda.core.contracts.HashAttachmentConstraint extends jav public boolean isSatisfiedBy(net.corda.core.contracts.Attachment) @NotNull public String toString() + public static final net.corda.core.contracts.HashAttachmentConstraint$Companion Companion +## +public static final class net.corda.core.contracts.HashAttachmentConstraint$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) + public final boolean getDisableHashConstraints() ## @CordaSerializable public final class net.corda.core.contracts.InsufficientBalanceException extends net.corda.core.flows.FlowException @@ -676,15 +684,20 @@ public final class net.corda.core.contracts.Issued extends java.lang.Object public @interface net.corda.core.contracts.LegalProseReference public abstract String uri() ## +@DoNotImplement @CordaSerializable public final class net.corda.core.contracts.LinearPointer extends net.corda.core.contracts.StatePointer + @DeprecatedConstructorForDeserialization public (net.corda.core.contracts.UniqueIdentifier, Class) + public (net.corda.core.contracts.UniqueIdentifier, Class, boolean) + public (net.corda.core.contracts.UniqueIdentifier, Class, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public boolean equals(Object) @NotNull public net.corda.core.contracts.UniqueIdentifier getPointer() @NotNull public Class getType() public int hashCode() + public boolean isResolved() @NotNull public net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull @@ -872,6 +885,7 @@ public final class net.corda.core.contracts.StateAndRef extends java.lang.Object @NotNull public String toString() ## +@DoNotImplement @CordaSerializable public abstract class net.corda.core.contracts.StatePointer extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) @@ -879,10 +893,15 @@ public abstract class net.corda.core.contracts.StatePointer extends java.lang.Ob public abstract Object getPointer() @NotNull public abstract Class getType() + public abstract boolean isResolved() @NotNull public abstract net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull public abstract net.corda.core.contracts.StateAndRef resolve(net.corda.core.transactions.LedgerTransaction) + public static final net.corda.core.contracts.StatePointer$Companion Companion +## +public static final class net.corda.core.contracts.StatePointer$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) ## @CordaSerializable public final class net.corda.core.contracts.StateRef extends java.lang.Object @@ -900,15 +919,20 @@ public final class net.corda.core.contracts.StateRef extends java.lang.Object @NotNull public String toString() ## +@DoNotImplement @CordaSerializable public final class net.corda.core.contracts.StaticPointer extends net.corda.core.contracts.StatePointer + @DeprecatedConstructorForDeserialization public (net.corda.core.contracts.StateRef, Class) + public (net.corda.core.contracts.StateRef, Class, boolean) + public (net.corda.core.contracts.StateRef, Class, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public boolean equals(Object) @NotNull public net.corda.core.contracts.StateRef getPointer() @NotNull public Class getType() public int hashCode() + public boolean isResolved() @NotNull public net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull @@ -1011,6 +1035,7 @@ public final class net.corda.core.contracts.TransactionState extends java.lang.O ## public final class net.corda.core.contracts.TransactionStateKt extends java.lang.Object ## +@CordaSerializable public abstract class net.corda.core.contracts.TransactionVerificationException extends net.corda.core.flows.FlowException public (net.corda.core.crypto.SecureHash, String, Throwable) @NotNull @@ -1024,6 +1049,7 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ConstraintPropagationRejection extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, String, net.corda.core.contracts.AttachmentConstraint, net.corda.core.contracts.AttachmentConstraint) @NotNull public final String getContractClass() @@ -1036,6 +1062,7 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ContractCreationError extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String, Throwable) public (net.corda.core.crypto.SecureHash, String, Throwable, String) @NotNull public final String getContractClass() @@ -1054,12 +1081,32 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public static net.corda.core.contracts.TransactionVerificationException$Direction[] values() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateAttachmentsRejection extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.Attachment) + @NotNull + public final net.corda.core.contracts.Attachment getAttachmentId() +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateInputStates extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, net.corda.core.utilities.NonEmptySet) @NotNull public final net.corda.core.utilities.NonEmptySet getDuplicates() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$InvalidAttachmentException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, net.corda.core.crypto.SecureHash) + @NotNull + public final net.corda.core.crypto.SecureHash getAttachmentHash() +## +@CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$InvalidConstraintRejection extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String, String) + @NotNull + public final String getContractClass() + @NotNull + public final String getReason() +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$InvalidNotaryChange extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash) ## @@ -1070,6 +1117,11 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public final String getContractClass() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$MissingNetworkParametersException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) + public (net.corda.core.crypto.SecureHash, net.corda.core.crypto.SecureHash) +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$MoreThanOneNotary extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash) ## @@ -1084,6 +1136,8 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$OverlappingAttachmentsException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, String) + @NotNull + public final String getPath() ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$PackageOwnershipException extends net.corda.core.contracts.TransactionVerificationException @@ -1103,11 +1157,13 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionContractConflictException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.TransactionState, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionDuplicateEncumbranceException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, int) + public (net.corda.core.crypto.SecureHash, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionMissingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException @@ -1117,18 +1173,34 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public final int getMissing() ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNetworkParameterOrderingException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) + public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.StateRef, net.corda.core.node.NetworkParameters, net.corda.core.node.NetworkParameters) +## +@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNonMatchingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, java.util.Collection) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNotaryMismatchEncumbranceException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, int, int, net.corda.core.identity.Party, net.corda.core.identity.Party) + public (net.corda.core.crypto.SecureHash, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionRequiredContractUnspecifiedException extends net.corda.core.contracts.TransactionVerificationException + public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.TransactionState) ## @CordaSerializable +public static final class net.corda.core.contracts.TransactionVerificationException$UntrustedAttachmentsException extends net.corda.core.CordaException + public (net.corda.core.crypto.SecureHash, java.util.List) + @NotNull + public final java.util.List getIds() + @NotNull + public final net.corda.core.crypto.SecureHash getTxId() +## +@CordaSerializable public abstract class net.corda.core.contracts.TypeOnlyCommandData extends java.lang.Object implements net.corda.core.contracts.CommandData public () public boolean equals(Object) @@ -1369,6 +1441,48 @@ public final class net.corda.core.cordapp.CordappContext extends java.lang.Objec public static final class net.corda.core.cordapp.CordappContext$Companion extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) ## +@CordaSerializable +public final class net.corda.core.cordapp.CordappInfo extends java.lang.Object + public (String, String, String, int, int, String, String, String, net.corda.core.crypto.SecureHash$SHA256) + @NotNull + public final String component1() + @NotNull + public final String component2() + @NotNull + public final String component3() + public final int component4() + public final int component5() + @NotNull + public final String component6() + @NotNull + public final String component7() + @NotNull + public final String component8() + @NotNull + public final net.corda.core.crypto.SecureHash$SHA256 component9() + @NotNull + public final net.corda.core.cordapp.CordappInfo copy(String, String, String, int, int, String, String, String, net.corda.core.crypto.SecureHash$SHA256) + public boolean equals(Object) + @NotNull + public final net.corda.core.crypto.SecureHash$SHA256 getJarHash() + @NotNull + public final String getLicence() + public final int getMinimumPlatformVersion() + @NotNull + public final String getName() + @NotNull + public final String getShortName() + public final int getTargetPlatformVersion() + @NotNull + public final String getType() + @NotNull + public final String getVendor() + @NotNull + public final String getVersion() + public int hashCode() + @NotNull + public String toString() +## @DoNotImplement public interface net.corda.core.cordapp.CordappProvider @NotNull @@ -2156,6 +2270,9 @@ public class net.corda.core.flows.DataVendingFlow extends net.corda.core.flows.F @Suspendable protected void verifyDataRequest(net.corda.core.internal.FetchDataFlow$Request$Data) ## +@DoNotImplement +public interface net.corda.core.flows.Destination +## @InitiatingFlow public final class net.corda.core.flows.FinalityFlow extends net.corda.core.flows.FlowLogic public (net.corda.core.transactions.SignedTransaction) @@ -2326,6 +2443,9 @@ public abstract class net.corda.core.flows.FlowLogic extends java.lang.Object public final net.corda.core.node.ServiceHub getServiceHub() @Suspendable @NotNull + public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.flows.Destination) + @Suspendable + @NotNull public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.identity.Party) @Suspendable public final void persistFlowStackSnapshot() @@ -2405,6 +2525,8 @@ public abstract class net.corda.core.flows.FlowSession extends java.lang.Object @Suspendable @NotNull public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo(boolean) + @NotNull + public abstract net.corda.core.flows.Destination getDestination() @Suspendable @NotNull public abstract net.corda.core.utilities.UntrustworthyData receive(Class) @@ -2550,6 +2672,11 @@ public final class net.corda.core.flows.NotaryChangeFlow extends net.corda.core. @CordaSerializable public abstract class net.corda.core.flows.NotaryError extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) + public static final net.corda.core.flows.NotaryError$Companion Companion + public static final int NUM_STATES = 5 +## +public static final class net.corda.core.flows.NotaryError$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) ## @CordaSerializable public static final class net.corda.core.flows.NotaryError$Conflict extends net.corda.core.flows.NotaryError @@ -2972,6 +3099,7 @@ public final class net.corda.core.identity.IdentityUtils extends java.lang.Objec public static final java.util.Map> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection) @NotNull public static final java.util.Map> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection, boolean) + public static final boolean x500Matches(String, boolean, net.corda.core.identity.CordaX500Name) ## @DoNotImplement @CordaSerializable @@ -3067,6 +3195,8 @@ public interface net.corda.core.messaging.CordaRPCOps extends net.corda.core.mes @NotNull public abstract net.corda.core.messaging.DataFeed networkParametersFeed() @NotNull + public abstract net.corda.core.node.NodeDiagnosticInfo nodeDiagnosticInfo() + @NotNull public abstract net.corda.core.node.NodeInfo nodeInfo() @Nullable public abstract net.corda.core.node.NodeInfo nodeInfoFromParty(net.corda.core.identity.AbstractParty) @@ -3424,6 +3554,34 @@ public final class net.corda.core.node.NetworkParameters extends java.lang.Objec public String toString() ## @CordaSerializable +public final class net.corda.core.node.NodeDiagnosticInfo extends java.lang.Object + public (String, String, int, String, java.util.List) + @NotNull + public final String component1() + @NotNull + public final String component2() + public final int component3() + @NotNull + public final String component4() + @NotNull + public final java.util.List component5() + @NotNull + public final net.corda.core.node.NodeDiagnosticInfo copy(String, String, int, String, java.util.List) + public boolean equals(Object) + @NotNull + public final java.util.List getCordapps() + public final int getPlatformVersion() + @NotNull + public final String getRevision() + @NotNull + public final String getVendor() + @NotNull + public final String getVersion() + public int hashCode() + @NotNull + public String toString() +## +@CordaSerializable public final class net.corda.core.node.NodeInfo extends java.lang.Object public (java.util.List, java.util.List, int, long) @NotNull @@ -3448,6 +3606,7 @@ public final class net.corda.core.node.NodeInfo extends java.lang.Object public final net.corda.core.identity.PartyAndCertificate identityAndCertFromX500Name(net.corda.core.identity.CordaX500Name) @NotNull public final net.corda.core.identity.Party identityFromX500Name(net.corda.core.identity.CordaX500Name) + public final boolean isLegalIdentity(net.corda.core.identity.CordaX500Name) public final boolean isLegalIdentity(net.corda.core.identity.Party) @NotNull public String toString() @@ -3583,6 +3742,9 @@ public interface net.corda.core.node.services.IdentityService public abstract void assertOwnership(net.corda.core.identity.Party, net.corda.core.identity.AnonymousParty) @Nullable public abstract net.corda.core.identity.PartyAndCertificate certificateFromKey(java.security.PublicKey) + @Suspendable + @Nullable + public abstract java.util.UUID externalIdForPublicKey(java.security.PublicKey) @NotNull public abstract Iterable getAllIdentities() @NotNull @@ -3596,6 +3758,9 @@ public interface net.corda.core.node.services.IdentityService @Nullable public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey) @NotNull + public abstract Iterable publicKeysForExternalId(java.util.UUID) + public abstract void registerKey(java.security.PublicKey, net.corda.core.identity.Party, java.util.UUID) + @NotNull public abstract net.corda.core.identity.Party requireWellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty) @Nullable public abstract net.corda.core.identity.PartyAndCertificate verifyAndRegisterIdentity(net.corda.core.identity.PartyAndCertificate) @@ -3605,6 +3770,9 @@ public interface net.corda.core.node.services.IdentityService public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty) @Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name) + public static final net.corda.core.node.services.IdentityService$Companion Companion +## +public static final class net.corda.core.node.services.IdentityService$Companion extends java.lang.Object ## @DoNotImplement public interface net.corda.core.node.services.KeyManagementService @@ -3615,7 +3783,13 @@ public interface net.corda.core.node.services.KeyManagementService public abstract java.security.PublicKey freshKey() @Suspendable @NotNull + public abstract java.security.PublicKey freshKey(java.util.UUID) + @Suspendable + @NotNull public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean) + @Suspendable + @NotNull + public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean, java.util.UUID) @NotNull public abstract java.util.Set getKeys() @Suspendable @@ -3987,6 +4161,8 @@ public static final class net.corda.core.node.services.Vault$UpdateType extends @CordaSerializable public final class net.corda.core.node.services.VaultQueryException extends net.corda.core.flows.FlowException public (String) + public (String, Exception) + public (String, Exception, int, kotlin.jvm.internal.DefaultConstructorMarker) ## @DoNotImplement public interface net.corda.core.node.services.VaultService @@ -4063,9 +4239,13 @@ public static final class net.corda.core.node.services.vault.AttachmentQueryCrit @CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria extends net.corda.core.node.services.vault.AttachmentQueryCriteria public () + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate>, net.corda.core.node.services.vault.ColumnPredicate>, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, int, kotlin.jvm.internal.DefaultConstructorMarker) @@ -4778,6 +4958,10 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co @Nullable public abstract java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @NotNull + public java.util.List getExternalIds() + @Nullable public java.util.List getParticipants() @NotNull public net.corda.core.node.services.Vault$RelevancyStatus getRelevancyStatus() @@ -4788,17 +4972,30 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria + @DeprecatedConstructorForDeserialization public () + @DeprecatedConstructorForDeserialization public (java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) + public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final java.util.List component1() @Nullable @@ -4815,14 +5012,20 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi public final java.util.Set> component7() @NotNull public final net.corda.core.node.services.Vault$RelevancyStatus component8() + @Nullable + public final java.util.List component9() @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) public boolean equals(Object) @Nullable public java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @Nullable public final java.util.List getIssuer() @Nullable public final java.util.List getIssuerRef() @@ -4844,6 +5047,8 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withContractStateTypes(java.util.Set>) @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withExactParticipants(java.util.List) + @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withIssuer(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withOwner(java.util.List) @@ -4904,18 +5109,33 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria + @DeprecatedConstructorForDeserialization public () + @DeprecatedConstructorForDeserialization public (java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) + public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final java.util.List component1() @@ -4929,14 +5149,20 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Linea public final java.util.Set> component5() @NotNull public final net.corda.core.node.services.Vault$RelevancyStatus component6() + @Nullable + public final java.util.List component7() @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) public boolean equals(Object) @Nullable public java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @Nullable public final java.util.List getExternalId() @Nullable public java.util.List getParticipants() @@ -4954,6 +5180,8 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Linea @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withContractStateTypes(java.util.Set>) @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withExactParticipants(java.util.List) + @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withExternalId(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withParticipants(java.util.List) @@ -5025,9 +5253,13 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$TimeI ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) @@ -5069,19 +5301,38 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria public () + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List) + @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) + @DeprecatedConstructorForDeserialization + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List) + @DeprecatedConstructorForDeserialization + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List) + public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.core.node.services.Vault$StateStatus component1() @Nullable public final java.util.List component10() + @NotNull + public final java.util.List component11() + @Nullable + public final java.util.List component12() @Nullable public final java.util.Set> component2() @Nullable @@ -5102,6 +5353,10 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List) public boolean equals(Object) @NotNull public java.util.Set getConstraintTypes() @@ -5110,6 +5365,10 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @Nullable public java.util.Set> getContractStateTypes() @Nullable + public java.util.List getExactParticipants() + @NotNull + public java.util.List getExternalIds() + @Nullable public final java.util.List getNotary() @Nullable public java.util.List getParticipants() @@ -5135,6 +5394,10 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withContractStateTypes(java.util.Set>) @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withExactParticipants(java.util.List) + @NotNull + public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withExternalIds(java.util.List) + @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withNotary(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withParticipants(java.util.List) @@ -5471,6 +5734,7 @@ public final class net.corda.core.serialization.SerializationAPIKt extends java. ## @DoNotImplement public interface net.corda.core.serialization.SerializationContext + public abstract boolean getCarpenterDisabled() @NotNull public abstract java.util.Set> getCustomSerializers() @NotNull @@ -5511,6 +5775,8 @@ public interface net.corda.core.serialization.SerializationContext @NotNull public abstract net.corda.core.serialization.SerializationContext withWhitelisted(Class) @NotNull + public abstract net.corda.core.serialization.SerializationContext withoutCarpenter() + @NotNull public abstract net.corda.core.serialization.SerializationContext withoutReferences() ## public static final class net.corda.core.serialization.SerializationContext$UseCase extends java.lang.Enum @@ -5714,6 +5980,7 @@ public static final class net.corda.core.transactions.ContractUpgradeFilteredTra @DoNotImplement public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures public (java.util.List>, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List, net.corda.core.node.NetworkParameters) + public (java.util.List, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List, net.corda.core.node.NetworkParameters, net.corda.core.contracts.UpgradedContract, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final java.util.List> component1() @NotNull @@ -5764,6 +6031,10 @@ public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction public int hashCode() @NotNull public String toString() + public static final net.corda.core.transactions.ContractUpgradeLedgerTransaction$Companion Companion +## +public static final class net.corda.core.transactions.ContractUpgradeLedgerTransaction$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) ## @DoNotImplement @CordaSerializable @@ -5900,6 +6171,7 @@ public final class net.corda.core.transactions.LedgerTransaction extends net.cor public (java.util.List>, java.util.List>, java.util.List>, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt) @DeprecatedConstructorForDeserialization public (java.util.List>, java.util.List>, java.util.List>, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters) + public (java.util.List, java.util.List, java.util.List, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters, java.util.List, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final java.util.List> commandsOfType(Class) @NotNull @@ -6216,6 +6488,7 @@ public final class net.corda.core.transactions.SignedTransaction extends java.la public final net.corda.core.transactions.SignedTransaction withAdditionalSignatures(Iterable) public static final net.corda.core.transactions.SignedTransaction$Companion Companion ## +@CordaSerializable public static final class net.corda.core.transactions.SignedTransaction$SignaturesMissingException extends java.security.SignatureException implements net.corda.core.CordaThrowable, net.corda.core.contracts.NamedByHash public (java.util.Set, java.util.List, net.corda.core.crypto.SecureHash) public void addSuppressed(Throwable[]) @@ -6263,6 +6536,8 @@ public class net.corda.core.transactions.TransactionBuilder extends java.lang.Ob @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint) @NotNull + public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, net.corda.core.contracts.AttachmentConstraint) + @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, net.corda.core.identity.Party) @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState) @@ -6655,6 +6930,7 @@ public final class net.corda.core.utilities.ProgressTracker extends java.lang.Ob public final net.corda.core.utilities.ProgressTracker$Step nextStep() public final void setChildProgressTracker(net.corda.core.utilities.ProgressTracker$Step, net.corda.core.utilities.ProgressTracker) public final void setCurrentStep(net.corda.core.utilities.ProgressTracker$Step) + public static final net.corda.core.utilities.ProgressTracker$Companion Companion ## @CordaSerializable public abstract static class net.corda.core.utilities.ProgressTracker$Change extends java.lang.Object @@ -6731,12 +7007,14 @@ public static class net.corda.core.utilities.ProgressTracker$Step extends java.l public (String) @Nullable public net.corda.core.utilities.ProgressTracker childProgressTracker() + public boolean equals(Object) @NotNull public rx.Observable getChanges() @NotNull public java.util.Map getExtraAuditData() @NotNull public String getLabel() + public int hashCode() ## @CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$UNSTARTED extends net.corda.core.utilities.ProgressTracker$Step @@ -7061,6 +7339,7 @@ public class net.corda.client.jackson.StringToMethodCallParser extends java.lang public final net.corda.client.jackson.StringToMethodCallParser$ParsedMethodCall parse(T, String) @NotNull public final Object[] parseArguments(String, java.util.List>, String) + public final void validateIsMatchingCtor(String, java.util.List>, String) public static final net.corda.client.jackson.StringToMethodCallParser$Companion Companion ## public static final class net.corda.client.jackson.StringToMethodCallParser$Companion extends java.lang.Object @@ -7089,6 +7368,9 @@ public static final class net.corda.client.jackson.StringToMethodCallParser$Unpa @NotNull public final String getParamName() ## +public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$NoSuchFile extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException + public (String) +## public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$ReflectionDataMissing extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException public (String, int) ## @@ -7115,6 +7397,7 @@ public interface net.corda.testing.driver.DriverDSL public abstract net.corda.core.concurrent.CordaFuture getDefaultNotaryNode() @NotNull public abstract java.util.List getNotaryHandles() + public abstract int nextPort() @NotNull public abstract net.corda.core.concurrent.CordaFuture startNode() @NotNull @@ -7122,6 +7405,8 @@ public interface net.corda.testing.driver.DriverDSL @NotNull public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) @NotNull + public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, String) + @NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle) @NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle, String) @@ -7286,6 +7571,8 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>) public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>, String) + public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map, String, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final net.corda.core.identity.CordaX500Name component1() @NotNull @@ -7302,10 +7589,14 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public final java.util.Collection component7() @NotNull public final java.util.Map>, Class>> component8() + @Nullable + public final String component9() @NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) @NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>) + @NotNull + public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>, String) public boolean equals(Object) @NotNull public final java.util.Collection getAdditionalCordapps() @@ -7313,6 +7604,8 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public final java.util.Map getCustomOverrides() @NotNull public final java.util.Map>, Class>> getFlowOverrides() + @Nullable + public final String getLogLevelOverride() @NotNull public final String getMaximumHeapSize() @Nullable @@ -7333,6 +7626,8 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj @NotNull public final net.corda.testing.driver.NodeParameters withFlowOverrides(java.util.Map>, ? extends Class>>) @NotNull + public final net.corda.testing.driver.NodeParameters withLogLevelOverride(String) + @NotNull public final net.corda.testing.driver.NodeParameters withMaximumHeapSize(String) @NotNull public final net.corda.testing.driver.NodeParameters withProvidedName(net.corda.core.identity.CordaX500Name) @@ -7371,8 +7666,18 @@ public interface net.corda.testing.driver.OutOfProcess extends net.corda.testing public abstract class net.corda.testing.driver.PortAllocation extends java.lang.Object public () @NotNull + public static final net.corda.testing.driver.PortAllocation getDefaultAllocator() + @NotNull public final net.corda.core.utilities.NetworkHostAndPort nextHostAndPort() public abstract int nextPort() + public static final net.corda.testing.driver.PortAllocation$Companion Companion + public static final int DEFAULT_START_PORT = 10000 + public static final int FIRST_EPHEMERAL_PORT = 30000 +## +public static final class net.corda.testing.driver.PortAllocation$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) + @NotNull + public final net.corda.testing.driver.PortAllocation getDefaultAllocator() ## @DoNotImplement public static class net.corda.testing.driver.PortAllocation$Incremental extends net.corda.testing.driver.PortAllocation @@ -7403,6 +7708,22 @@ public final class net.corda.testing.driver.WebserverHandle extends java.lang.Ob @NotNull public String toString() ## +public final class net.corda.testing.flows.FlowTestsUtilsKt extends java.lang.Object + @NotNull + public static final kotlin.Pair from(T, net.corda.core.flows.FlowSession) + @NotNull + public static final R from(java.util.Map>, net.corda.core.flows.FlowSession) + @NotNull + public static final kotlin.Pair> from(kotlin.reflect.KClass, net.corda.core.flows.FlowSession) + @Suspendable + @NotNull + public static final java.util.List> receiveAll(net.corda.core.flows.FlowLogic, Class, net.corda.core.flows.FlowSession, net.corda.core.flows.FlowSession...) + @Suspendable + @NotNull + public static final java.util.Map> receiveAll(net.corda.core.flows.FlowLogic, kotlin.Pair>, kotlin.Pair>...) + @NotNull + public static final rx.Observable registerCoreFlowFactory(net.corda.testing.node.internal.TestStartedNode, Class>, Class, kotlin.jvm.functions.Function1, boolean) +## @DoNotImplement public abstract class net.corda.testing.node.ClusterSpec extends java.lang.Object public () @@ -7596,16 +7917,21 @@ public final class net.corda.testing.node.MockNetworkNotarySpec extends java.lan public (net.corda.core.identity.CordaX500Name) public (net.corda.core.identity.CordaX500Name, boolean) public (net.corda.core.identity.CordaX500Name, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.core.identity.CordaX500Name, boolean, String) + public (net.corda.core.identity.CordaX500Name, boolean, String, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.core.identity.CordaX500Name component1() public final boolean component2() @NotNull public final net.corda.testing.node.MockNetworkNotarySpec copy(net.corda.core.identity.CordaX500Name, boolean) public boolean equals(Object) + @Nullable + public final String getClassName() @NotNull public final net.corda.core.identity.CordaX500Name getName() public final boolean getValidating() public int hashCode() + public final void setClassName(String) @NotNull public String toString() ## @@ -7722,6 +8048,7 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public (Iterable, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...) public (Iterable, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair...) + public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair[], net.corda.core.node.services.KeyManagementService) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair...) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) public (Iterable, net.corda.testing.core.TestIdentity, java.security.KeyPair...) @@ -7734,6 +8061,8 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService) public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...) + public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) + public (net.corda.nodeapi.internal.cordapp.CordappLoader, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, net.corda.testing.core.TestIdentity, java.security.KeyPair[], net.corda.core.node.services.KeyManagementService, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, net.corda.testing.core.TestIdentity...) public (net.corda.testing.core.TestIdentity, net.corda.testing.core.TestIdentity...) public final void addMockCordapp(String) @@ -7797,6 +8126,12 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public static final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...) @NotNull public static final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...) + @NotNull + public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, java.util.Set, java.util.Set) + @NotNull + public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set) + @NotNull + public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set, net.corda.testing.internal.TestingNamedCacheFactory) public void recordTransactions(Iterable) public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable) public void recordTransactions(net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...) @@ -7825,6 +8160,12 @@ public static final class net.corda.testing.node.MockServices$Companion extends public final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...) @NotNull public final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...) + @NotNull + public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, java.util.Set, java.util.Set) + @NotNull + public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set) + @NotNull + public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set, net.corda.testing.internal.TestingNamedCacheFactory) ## public final class net.corda.testing.node.MockServicesKt extends java.lang.Object @NotNull @@ -7930,6 +8271,8 @@ public final class net.corda.testing.node.UnstartedMockNode extends java.lang.Ob public final int getId() @NotNull public final net.corda.testing.node.StartedMockNode getStarted() + @NotNull + public final T installCordaService(Class) public final boolean isStarted() @NotNull public final net.corda.testing.node.StartedMockNode start() @@ -7983,11 +8326,19 @@ public final class net.corda.client.rpc.CordaRPCClient extends java.lang.Object @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String) @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.client.rpc.GracefulReconnect) + @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor) @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.client.rpc.GracefulReconnect) + @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.identity.CordaX500Name) @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.identity.CordaX500Name, net.corda.client.rpc.GracefulReconnect) + @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.identity.CordaX500Name) + @NotNull + public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.identity.CordaX500Name, net.corda.client.rpc.GracefulReconnect) public final A use(String, String, kotlin.jvm.functions.Function1) public static final net.corda.client.rpc.CordaRPCClient$Companion Companion ## @@ -8063,12 +8414,33 @@ public static final class net.corda.client.rpc.CordaRPCClientConfiguration$Compa @DoNotImplement public final class net.corda.client.rpc.CordaRPCConnection extends java.lang.Object implements net.corda.client.rpc.RPCConnection public (net.corda.client.rpc.RPCConnection) + public (net.corda.client.rpc.RPCConnection, java.util.concurrent.ExecutorService, net.corda.client.rpc.internal.ReconnectingCordaRPCOps, kotlin.jvm.internal.DefaultConstructorMarker) public void close() public void forceClose() @NotNull public net.corda.core.messaging.CordaRPCOps getProxy() public int getServerProtocolVersion() public void notifyServerAndClose() + public static final net.corda.client.rpc.CordaRPCConnection$Companion Companion +## +public static final class net.corda.client.rpc.CordaRPCConnection$Companion extends java.lang.Object + public (kotlin.jvm.internal.DefaultConstructorMarker) +## +public final class net.corda.client.rpc.GracefulReconnect extends java.lang.Object + public () + public (Runnable, Runnable) + public (Runnable, Runnable, int) + public (Runnable, Runnable, int, int, kotlin.jvm.internal.DefaultConstructorMarker) + public (kotlin.jvm.functions.Function0, kotlin.jvm.functions.Function0, int) + public (kotlin.jvm.functions.Function0, kotlin.jvm.functions.Function0, int, int, kotlin.jvm.internal.DefaultConstructorMarker) + public final int getMaxAttempts() + @NotNull + public final kotlin.jvm.functions.Function0 getOnDisconnect() + @NotNull + public final kotlin.jvm.functions.Function0 getOnReconnect() +## +public final class net.corda.client.rpc.MaxRpcRetryException extends net.corda.client.rpc.RPCException + public (int, Throwable) ## public final class net.corda.client.rpc.PermissionException extends net.corda.core.CordaRuntimeException implements net.corda.nodeapi.exceptions.RpcSerializableError, net.corda.core.ClientRelevantError public (String) @@ -8077,6 +8449,7 @@ public final class net.corda.client.rpc.PermissionException extends net.corda.co ## @DoNotImplement public interface net.corda.client.rpc.RPCConnection extends java.io.Closeable + public abstract void close() public abstract void forceClose() @NotNull public abstract I getProxy() @@ -8093,6 +8466,11 @@ public @interface net.corda.client.rpc.RPCSinceVersion public final class net.corda.client.rpc.UtilsKt extends java.lang.Object public static final void notUsed(rx.Observable) ## +public final class net.corda.client.rpc.reconnect.CouldNotStartFlowException extends net.corda.client.rpc.RPCException + public () + public (Throwable) + public (Throwable, int, kotlin.jvm.internal.DefaultConstructorMarker) +## public final class net.corda.finance.test.CashSchema extends java.lang.Object public static final net.corda.finance.test.CashSchema INSTANCE ## @@ -8256,6 +8634,10 @@ public final class net.corda.testing.contracts.DummyContractV2 extends java.lang @NotNull public net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint() @NotNull + public static final net.corda.core.transactions.TransactionBuilder move(java.util.List>, net.corda.core.identity.AbstractParty) + @NotNull + public static final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty) + @NotNull public net.corda.testing.contracts.DummyContractV2$State upgrade(net.corda.testing.contracts.DummyContract$State) public void verify(net.corda.core.transactions.LedgerTransaction) public static final net.corda.testing.contracts.DummyContractV2$Companion Companion @@ -8272,6 +8654,10 @@ public static final class net.corda.testing.contracts.DummyContractV2$Commands$M ## public static final class net.corda.testing.contracts.DummyContractV2$Companion extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) + @NotNull + public final net.corda.core.transactions.TransactionBuilder move(java.util.List>, net.corda.core.identity.AbstractParty) + @NotNull + public final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty) ## public static final class net.corda.testing.contracts.DummyContractV2$State extends java.lang.Object implements net.corda.core.contracts.ContractState public (int, java.util.List) @@ -8290,6 +8676,8 @@ public static final class net.corda.testing.contracts.DummyContractV2$State exte public int hashCode() @NotNull public String toString() + @NotNull + public final kotlin.Pair withNewOwner(net.corda.core.identity.AbstractParty) ## public final class net.corda.testing.contracts.DummyContractV3 extends java.lang.Object implements net.corda.core.contracts.UpgradedContractWithLegacyConstraint public () From b48a714aaabaa029d55c67f304351a184d119228 Mon Sep 17 00:00:00 2001 From: cairncross <35581327+cairncross@users.noreply.github.com> Date: Fri, 15 Nov 2019 14:46:53 +0000 Subject: [PATCH 2/8] TM-10 - Parallelise DB integration tests (postgres) (#5704) --- .../corda/testing/DistributedTesting.groovy | 2 + .../groovy/net/corda/testing/KubesTest.java | 85 +++++++++++++++++-- .../net/corda/testing/ParallelTestGroup.java | 18 ++++ 3 files changed, 97 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy b/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy index 735e3e0aff..87189097c3 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy +++ b/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy @@ -117,6 +117,8 @@ class DistributedTesting implements Plugin { podLogLevel = testGrouping.getLogLevel() doFirst { dockerTag = tagToUseForRunningTests ? (ImageBuilding.registryName + ":" + tagToUseForRunningTests) : (imagePushTask.imageName.get() + ":" + imagePushTask.tag.get()) + sidecarImage = testGrouping.sidecarImage + additionalArgs = testGrouping.additionalArgs } } def reportOnAllTask = project.rootProject.tasks.create("userDefinedReports${testGrouping.getName().capitalize()}", KubesReporting) { diff --git a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java index 1061a49ff9..39e397a128 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java +++ b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java @@ -68,7 +68,9 @@ public class KubesTest extends DefaultTask { String dockerTag; String fullTaskToExecutePath; String taskToExecuteName; + String sidecarImage; Boolean printOutput = false; + List additionalArgs; Integer numberOfCoresPerFork = 4; Integer memoryGbPerFork = 6; @@ -229,7 +231,7 @@ public class KubesTest extends DefaultTask { } } getProject().getLogger().lifecycle("creating pod: " + podName); - createdPod = client.pods().inNamespace(namespace).create(buildPodRequest(podName, pvc)); + createdPod = client.pods().inNamespace(namespace).create(buildPodRequest(podName, pvc, sidecarImage != null)); remainingPods.add(podName); getProject().getLogger().lifecycle("scheduled pod: " + podName); } @@ -287,20 +289,27 @@ public class KubesTest extends DefaultTask { String[] buildCommand = getBuildCommand(numberOfPods, podIdx); getProject().getLogger().quiet("About to execute " + Arrays.stream(buildCommand).reduce("", (s, s2) -> s + " " + s2) + " on pod " + podName); client.pods().inNamespace(namespace).withName(podName) + .inContainer(podName) .writingOutput(stdOutOs) .writingErrorChannel(errChannelStream) .usingListener(execListener) - .exec(getBuildCommand(numberOfPods, podIdx)); + .exec(buildCommand); return startLogPumping(stdOutIs, podIdx, podLogsDirectory, printOutput); } - private Pod buildPodRequest(String podName, PersistentVolumeClaim pvc) { + private Pod buildPodRequest(String podName, PersistentVolumeClaim pvc, boolean withDb) { + if (withDb) { + return buildPodRequestWithWorkerNodeAndDbContainer(podName, pvc); + } else { + return buildPodRequestWithOnlyWorkerNode(podName, pvc); + } + } + + private Pod buildPodRequestWithOnlyWorkerNode(String podName, PersistentVolumeClaim pvc) { return new PodBuilder() .withNewMetadata().withName(podName).endMetadata() - .withNewSpec() - .addNewVolume() .withName("gradlecache") .withNewHostPath() @@ -327,19 +336,77 @@ public class KubesTest extends DefaultTask { .withName(podName) .withNewResources() .addToRequests("cpu", new Quantity(numberOfCoresPerFork.toString())) - .addToRequests("memory", new Quantity(memoryGbPerFork.toString() + "Gi")) + .addToRequests("memory", new Quantity(memoryGbPerFork.toString())) + .endResources() + .addNewVolumeMount().withName("gradlecache").withMountPath("/tmp/gradle").endVolumeMount() + .addNewVolumeMount().withName("testruns").withMountPath(TEST_RUN_DIR).endVolumeMount() + .endContainer() + .addNewImagePullSecret(REGISTRY_CREDENTIALS_SECRET_NAME) + .withRestartPolicy("Never") + .endSpec() + .build(); + } + + private Pod buildPodRequestWithWorkerNodeAndDbContainer(String podName, PersistentVolumeClaim pvc) { + return new PodBuilder() + .withNewMetadata().withName(podName).endMetadata() + .withNewSpec() + + .addNewVolume() + .withName("gradlecache") + .withNewHostPath() + .withType("DirectoryOrCreate") + .withPath("/tmp/gradle") + .endHostPath() + .endVolume() + .addNewVolume() + .withName("testruns") + .withNewPersistentVolumeClaim() + .withClaimName(pvc.getMetadata().getName()) + .endPersistentVolumeClaim() + .endVolume() + + .addNewContainer() + .withImage(dockerTag) + .withCommand("bash") + .withArgs("-c", "sleep 3600") + .addNewEnv() + .withName("DRIVER_NODE_MEMORY") + .withValue("1024m") + .withName("DRIVER_WEB_MEMORY") + .withValue("1024m") + .endEnv() + .withName(podName) + .withNewResources() + .addToRequests("cpu", new Quantity(Integer.valueOf(numberOfCoresPerFork - 1).toString())) + .addToRequests("memory", new Quantity(Integer.valueOf(memoryGbPerFork - 1).toString() + "Gi")) .endResources() .addNewVolumeMount().withName("gradlecache").withMountPath("/tmp/gradle").endVolumeMount() .addNewVolumeMount().withName("testruns").withMountPath(TEST_RUN_DIR).endVolumeMount() .endContainer() + .addNewContainer() + .withImage(sidecarImage) + .addNewEnv() + .withName("DRIVER_NODE_MEMORY") + .withValue("1024m") + .withName("DRIVER_WEB_MEMORY") + .withValue("1024m") + .endEnv() + .withName(podName + "-pg") + .withNewResources() + .addToRequests("cpu", new Quantity("1")) + .addToRequests("memory", new Quantity("1Gi")) + .endResources() + .endContainer() + .addNewImagePullSecret(REGISTRY_CREDENTIALS_SECRET_NAME) .withRestartPolicy("Never") - .endSpec() .build(); } + private File startLogPumping(InputStream stdOutIs, int podIdx, File podLogsDirectory, boolean printOutput) throws IOException { File outputFile = new File(podLogsDirectory, "container-" + podIdx + ".log"); outputFile.createNewFile(); @@ -405,6 +472,7 @@ public class KubesTest extends DefaultTask { client.pods() .inNamespace(namespace) .withName(podName) + .inContainer(podName) .dir(resultsInContainerPath) .copy(tempDir); } @@ -416,6 +484,7 @@ public class KubesTest extends DefaultTask { final String gitTargetBranch = " -Dgit.target.branch=" + Properties.getTargetGitBranch(); final String artifactoryUsername = " -Dartifactory.username=" + Properties.getUsername() + " "; final String artifactoryPassword = " -Dartifactory.password=" + Properties.getPassword() + " "; + final String additionalArgs = this.additionalArgs.isEmpty() ? "" : String.join(" ", this.additionalArgs); String shellScript = "(let x=1 ; while [ ${x} -ne 0 ] ; do echo \"Waiting for DNS\" ; curl services.gradle.org > /dev/null 2>&1 ; x=$? ; sleep 1 ; done ) && " + " cd /tmp/source && " + @@ -425,7 +494,7 @@ public class KubesTest extends DefaultTask { gitTargetBranch + artifactoryUsername + artifactoryPassword + - "-Dkubenetize -PdockerFork=" + podIdx + " -PdockerForks=" + numberOfPods + " " + fullTaskToExecutePath + " " + getLoggingLevel() + " 2>&1) ; " + + "-Dkubenetize -PdockerFork=" + podIdx + " -PdockerForks=" + numberOfPods + " " + fullTaskToExecutePath + " " + additionalArgs + " " + getLoggingLevel() + " 2>&1) ; " + "let rs=$? ; sleep 10 ; exit ${rs}"; return new String[]{"bash", "-c", shellScript}; } diff --git a/buildSrc/src/main/groovy/net/corda/testing/ParallelTestGroup.java b/buildSrc/src/main/groovy/net/corda/testing/ParallelTestGroup.java index d8e4d5bf44..007ba7b10e 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/ParallelTestGroup.java +++ b/buildSrc/src/main/groovy/net/corda/testing/ParallelTestGroup.java @@ -15,6 +15,8 @@ public class ParallelTestGroup extends DefaultTask { private int gbOfMemory = 4; private boolean printToStdOut = true; private PodLogLevel logLevel = PodLogLevel.INFO; + private String sidecarImage; + private List additionalArgs = new ArrayList<>(); public DistributeTestsBy getDistribution() { return distribution; @@ -44,6 +46,10 @@ public class ParallelTestGroup extends DefaultTask { return logLevel; } + public String getSidecarImage() { return sidecarImage; } + + public List getAdditionalArgs() { return additionalArgs; } + public void numberOfShards(int shards) { this.shardCount = shards; } @@ -77,4 +83,16 @@ public class ParallelTestGroup extends DefaultTask { groups.addAll(group); } + public void sidecarImage(String sidecarImage) { + this.sidecarImage = sidecarImage; + } + + public void additionalArgs(String... additionalArgs) { + additionalArgs(Arrays.asList(additionalArgs)); + } + + private void additionalArgs(List additionalArgs) { + this.additionalArgs.addAll(additionalArgs); + } + } From deed4e97632847515db027d2e7a06bee371a1735 Mon Sep 17 00:00:00 2001 From: Razvan Codreanu <52859362+Schife@users.noreply.github.com> Date: Fri, 15 Nov 2019 15:07:23 +0000 Subject: [PATCH 3/8] Enable test retry in distributed testing (#5702) * TM-88 only write the test to the file if it passes otherwise retry * TM-88 1 failing test for testing purposes * TM-88 fail an integration test instead of unit test * TM-88 include failed test for retry * TM-88 new logic for retrying failed tests * TM-88 refactored to use retry class when dealing with test failures + copy results even after pod failure * TM-88 remaining pods as set to prevent duplicates, limit retries to prevent crashed build and a bit more logging * TM-88 atomic int instead of int array * TM-88 moving atomic int outside retry loops * TM-88 removing second retry as it is not needed * TM-88 small fix to final copy * TM-88 while loop to prevent destruction of results on test retry * TM-88 removing shutdown hook * TM-88 reverting to previous implementation * TM-88 copying xml files before retry * TM-88 removing fail --- .../corda/testing/DistributedTesting.groovy | 8 ++++-- .../groovy/net/corda/testing/KubesTest.java | 26 +++++++++++++------ .../net/corda/testing/driver/DriverTests.kt | 10 +++++-- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy b/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy index 87189097c3..2ce623f4a8 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy +++ b/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy @@ -7,6 +7,8 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.tasks.testing.Test +import org.gradle.api.tasks.testing.TestResult +import org.gradle.internal.impldep.junit.framework.TestFailure import java.util.stream.Collectors @@ -252,8 +254,10 @@ class DistributedTesting implements Plugin { } afterTest { desc, result -> - executedTestsFile.withWriterAppend { writer -> - writer.writeLine(desc.getClassName() + "." + desc.getName()) + if (result.getResultType() == TestResult.ResultType.SUCCESS ) { + executedTestsFile.withWriterAppend { writer -> + writer.writeLine(desc.getClassName() + "." + desc.getName()) + } } } } diff --git a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java index 39e397a128..41ef3fe0f5 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java +++ b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java @@ -18,7 +18,6 @@ import io.fabric8.kubernetes.client.dsl.PodResource; import io.fabric8.kubernetes.client.utils.Serialization; import net.corda.testing.retry.Retry; import okhttp3.Response; -import org.apache.commons.compress.utils.IOUtils; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.TaskAction; import org.jetbrains.annotations.NotNull; @@ -27,8 +26,6 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; @@ -36,23 +33,25 @@ import java.io.InputStreamReader; import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.math.BigInteger; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.Queue; import java.util.Random; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -76,7 +75,7 @@ public class KubesTest extends DefaultTask { Integer memoryGbPerFork = 6; public volatile List testOutput = Collections.emptyList(); public volatile List containerResults = Collections.emptyList(); - private final List remainingPods = Collections.synchronizedList(new ArrayList()); + private final Set remainingPods = Collections.synchronizedSet(new HashSet()); public static String NAMESPACE = "thisisatest"; int k8sTimeout = 50 * 1_000; @@ -214,7 +213,7 @@ public class KubesTest extends DefaultTask { }); int podNumber = podIdx + 1; - + final AtomicInteger testRetries = new AtomicInteger(0); try { // pods might die, so we retry return Retry.fixed(numberOfRetries).run(() -> { @@ -248,11 +247,20 @@ public class KubesTest extends DefaultTask { if (!podLogsDirectory.exists()) { podLogsDirectory.mkdirs(); } - File podOutput = executeBuild(namespace, numberOfPods, podIdx, podName, podLogsDirectory, printOutput, stdOutOs, stdOutIs, errChannelStream, waiter); + File podOutput = executeBuild(namespace, numberOfPods, podIdx, podName, podLogsDirectory, printOutput, stdOutOs, stdOutIs, errChannelStream, waiter); int resCode = waiter.join(); getProject().getLogger().lifecycle("build has ended on on pod " + podName + " (" + podNumber + "/" + numberOfPods + ") with result " + resCode + " , gathering results"); - Collection binaryResults = downloadTestXmlFromPod(namespace, createdPod); + Collection binaryResults; + //we don't retry on the final attempt as this will crash the build and some pods might not get to finish + if (resCode != 0 && testRetries.getAndIncrement() < numberOfRetries - 1) { + downloadTestXmlFromPod(namespace, createdPod); + getProject().getLogger().lifecycle("There are test failures in this pod. Retrying failed tests!!!"); + throw new RuntimeException("There are test failures in this pod"); + } else { + binaryResults = downloadTestXmlFromPod(namespace, createdPod); + } + getLogger().lifecycle("removing pod " + podName + " (" + podNumber + "/" + numberOfPods + ") after completed build"); try (KubernetesClient client = getKubernetesClient()) { @@ -267,6 +275,8 @@ public class KubesTest extends DefaultTask { return new KubePodResult(podIdx, resCode, podOutput, binaryResults); }); } catch (Retry.RetryException e) { + Pod pod = getKubernetesClient().pods().inNamespace(namespace).create(buildPodRequest(podName, pvc)); + downloadTestXmlFromPod(namespace, pod); throw new RuntimeException("Failed to build in pod " + podName + " (" + podNumber + "/" + numberOfPods + ") in " + numberOfRetries + " attempts", e); } } diff --git a/testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt b/testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt index 9dec4b200e..fb68e45e90 100644 --- a/testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt +++ b/testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt @@ -2,10 +2,14 @@ package net.corda.testing.driver import net.corda.core.concurrent.CordaFuture import net.corda.core.identity.CordaX500Name -import net.corda.core.internal.* +import net.corda.core.internal.CertRole import net.corda.core.internal.concurrent.fork import net.corda.core.internal.concurrent.openFuture import net.corda.core.internal.concurrent.transpose +import net.corda.core.internal.div +import net.corda.core.internal.isRegularFile +import net.corda.core.internal.list +import net.corda.core.internal.readLines import net.corda.core.utilities.getOrThrow import net.corda.node.internal.NodeStartup import net.corda.testing.common.internal.ProjectStructure.projectRootDir @@ -15,7 +19,9 @@ import net.corda.testing.core.DUMMY_BANK_B_NAME import net.corda.testing.http.HttpApi import net.corda.testing.node.internal.addressMustBeBound import net.corda.testing.node.internal.addressMustNotBeBound -import org.assertj.core.api.Assertions.* +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatCode +import org.assertj.core.api.Assertions.assertThatIllegalArgumentException import org.json.simple.JSONObject import org.junit.Test import java.util.* From 01c1e4bc17446748d954ad0e08bf703139223910 Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Fri, 15 Nov 2019 15:14:01 +0000 Subject: [PATCH 4/8] attempt to make preAllocation job deletion more certain (#5708) fix issue with deallocate during build phase fix test report URL --- .ci/dev/smoke/Jenkinsfile | 4 +-- .../corda/testing/DistributedTesting.groovy | 4 ++- .../net/corda/testing/PodAllocator.java | 29 ++++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.ci/dev/smoke/Jenkinsfile b/.ci/dev/smoke/Jenkinsfile index 0c93fd2b79..d5332b2508 100644 --- a/.ci/dev/smoke/Jenkinsfile +++ b/.ci/dev/smoke/Jenkinsfile @@ -60,7 +60,7 @@ pipeline { pullRequest.createStatus(status: 'success', context: 'continuous-integration/jenkins/pr-merge/smokeTest', description: 'Smoke Tests Passed', - targetUrl: "${env.JOB_URL}testResults") + targetUrl: "${env.BUILD_URL}testResults") } } } @@ -71,7 +71,7 @@ pipeline { pullRequest.createStatus(status: 'failure', context: 'continuous-integration/jenkins/pr-merge/smokeTest', description: 'Smoke Tests Failed', - targetUrl: "${env.JOB_URL}testResults") + targetUrl: "${env.BUILD_URL}testResults") } } } diff --git a/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy b/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy index 2ce623f4a8..47a5032c29 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy +++ b/buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy @@ -97,6 +97,7 @@ class DistributedTesting implements Plugin { //modify the image building task to depend on the preAllocate task (if specified on the command line) - this prevents gradle running out of order if (preAllocateTask.name in requestedTaskNames) { imageBuildTask.dependsOn preAllocateTask + imagePushTask.finalizedBy(deAllocateTask) } def userDefinedParallelTask = project.rootProject.tasks.create("userDefined" + testGrouping.getName().capitalize(), KubesTest) { @@ -171,7 +172,8 @@ class DistributedTesting implements Plugin { Task deAllocateTask = project.rootProject.tasks.create("deAllocateFor" + testGrouping.getName().capitalize()) { group = GRADLE_GROUP doFirst { - String dockerTag = System.getProperty(ImageBuilding.PROVIDE_TAG_FOR_RUNNING_PROPERTY) + String dockerTag = System.getProperty(ImageBuilding.PROVIDE_TAG_FOR_RUNNING_PROPERTY) ?: + System.getProperty(ImageBuilding.PROVIDE_TAG_FOR_BUILDING_PROPERTY) if (dockerTag == null) { throw new GradleException("pre allocation cannot be used without a stable docker tag - please provide one using -D" + ImageBuilding.PROVIDE_TAG_FOR_RUNNING_PROPERTY) } diff --git a/buildSrc/src/main/groovy/net/corda/testing/PodAllocator.java b/buildSrc/src/main/groovy/net/corda/testing/PodAllocator.java index 7dc64678a8..995868e1e8 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/PodAllocator.java +++ b/buildSrc/src/main/groovy/net/corda/testing/PodAllocator.java @@ -1,6 +1,5 @@ package net.corda.testing; -import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.Quantity; import io.fabric8.kubernetes.api.model.batch.Job; import io.fabric8.kubernetes.api.model.batch.JobBuilder; @@ -39,36 +38,38 @@ public class PodAllocator { public void allocatePods(Integer number, Integer coresPerPod, Integer memoryPerPod, String prefix) { - Config config = new ConfigBuilder() - .withConnectionTimeout(CONNECTION_TIMEOUT) - .withRequestTimeout(CONNECTION_TIMEOUT) - .withRollingTimeout(CONNECTION_TIMEOUT) - .withWebsocketTimeout(CONNECTION_TIMEOUT) - .withWebsocketPingInterval(CONNECTION_TIMEOUT) - .build(); - + Config config = getConfig(); KubernetesClient client = new DefaultKubernetesClient(config); List podsToRequest = IntStream.range(0, number).mapToObj(i -> buildJob("pa-" + prefix + i, coresPerPod, memoryPerPod)).collect(Collectors.toList()); - podsToRequest.forEach(requestedJob -> { + List createdJobs = podsToRequest.stream().map(requestedJob -> { String msg = "PreAllocating " + requestedJob.getMetadata().getName(); if (logger instanceof org.gradle.api.logging.Logger) { ((org.gradle.api.logging.Logger) logger).quiet(msg); } else { logger.info(msg); } - client.batch().jobs().inNamespace(KubesTest.NAMESPACE).create(requestedJob); - }); + return client.batch().jobs().inNamespace(KubesTest.NAMESPACE).create(requestedJob); + }).collect(Collectors.toList()); + + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + KubernetesClient tearDownClient = new DefaultKubernetesClient(getConfig()); + tearDownClient.batch().jobs().delete(createdJobs); + })); } - public void tearDownPods(String prefix) { - io.fabric8.kubernetes.client.Config config = new io.fabric8.kubernetes.client.ConfigBuilder() + private Config getConfig() { + return new ConfigBuilder() .withConnectionTimeout(CONNECTION_TIMEOUT) .withRequestTimeout(CONNECTION_TIMEOUT) .withRollingTimeout(CONNECTION_TIMEOUT) .withWebsocketTimeout(CONNECTION_TIMEOUT) .withWebsocketPingInterval(CONNECTION_TIMEOUT) .build(); + } + + public void tearDownPods(String prefix) { + io.fabric8.kubernetes.client.Config config = getConfig(); KubernetesClient client = new DefaultKubernetesClient(config); Stream jobsToDelete = client.batch().jobs().inNamespace(KubesTest.NAMESPACE).list() .getItems() From 052adc9791af8ba5460c2e0c94c4e0e8de4797b3 Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Fri, 15 Nov 2019 17:31:58 +0000 Subject: [PATCH 5/8] fix merge issue with sidecar image work (#5724) --- buildSrc/src/main/groovy/net/corda/testing/KubesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java index 41ef3fe0f5..6a1a94732d 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java +++ b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java @@ -275,7 +275,7 @@ public class KubesTest extends DefaultTask { return new KubePodResult(podIdx, resCode, podOutput, binaryResults); }); } catch (Retry.RetryException e) { - Pod pod = getKubernetesClient().pods().inNamespace(namespace).create(buildPodRequest(podName, pvc)); + Pod pod = getKubernetesClient().pods().inNamespace(namespace).create(buildPodRequest(podName, pvc, sidecarImage != null)); downloadTestXmlFromPod(namespace, pod); throw new RuntimeException("Failed to build in pod " + podName + " (" + podNumber + "/" + numberOfPods + ") in " + numberOfRetries + " attempts", e); } From 129d8d1b344af1b519686e6ceb0ff09aeb538d27 Mon Sep 17 00:00:00 2001 From: Jonathan Locke <36930160+lockathan@users.noreply.github.com> Date: Mon, 18 Nov 2019 12:42:25 +0000 Subject: [PATCH 6/8] NOTICK: Mention platform version change in release notes (#5721) * NOTICK: Mention platform version change in release notes (#5721) Update the release notes to mention the platform version change. * NOTICK: Mention platform version change in release notes Added mention of preserved wire stability and compatibility across different versions. * Typo fixes * Corrected typo in release notes. * Reworded change according to feedback - greatly simplified it. * Slight rewording --- docs/source/release-notes.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/source/release-notes.rst b/docs/source/release-notes.rst index 42bdad9206..8c427ed816 100644 --- a/docs/source/release-notes.rst +++ b/docs/source/release-notes.rst @@ -11,7 +11,7 @@ Welcome to the Corda 4.3 release notes. Please read these carefully to understan Corda 4.3 ========= -Corda 4.1 was released with a great suite of new features to build on top of the success of Corda 4. Now, Corda 4.3 extends upon that with some powerful new capabilities. Corda 4.3 over 400 fixes and documentation updates to bring additional stability and quality of life improvements to those developing on the Corda platform. +Corda 4.1 was released with a great suite of new features to build on top of the success of Corda 4. Now, Corda 4.3 extends upon that with some powerful new capabilities. Corda 4.3 contains over 400 fixes and documentation updates to bring additional stability and quality of life improvements to those developing on the Corda platform. We recommend you upgrade from Corda 4.1 to Corda 4.3 as soon as possible. @@ -88,6 +88,13 @@ There have been several security upgrades, including changes to the Corda webser * Enhancements to attachment whitelisting: Transactions referencing contracts that are not installed on a node can still be accepted if the contract is signed by a trusted party. * Updated vulnerable dependency: Jolokia 1.2 to 1.6.0 are vulnerable to system-wide cross-site-request-forgery attacks. Updated to Jolokia 1.6.1 +Platform version change +~~~~~~~~~~~~~~~~~~~~~~~ + +Given the addition of a new API to support the Accounts feature, the platform version of Corda 4.3 has been bumped up from 4 to 5. This is to prevent CorDapps that use it being deployed onto nodes unable to host them. Note that the minimum platform version has not been changed - this means that older Corda nodes can still interoperate with Corda 4.3 nodes. Since the APIs added do not affect the wire protocol or have other zone-level implications, applications can take advantage of these new platform version 5 features even if the Corda 4.3 node is running on a network whose minimum platform version is 4. + +For more information on platform version, please see :doc:`versioning`. For more details on upgrading a CorDapp to use platform version 5, please see :doc:`app-upgrade-notes`. + Deprecations ~~~~~~~~~~~~ @@ -95,7 +102,7 @@ The Corda Finance library is now deprecated and has been superseded by the Corda Any confidential identities registered using the old API will not be reflected in the new tables after migration to Corda 4.3. However, the standard APIs work with both old and new confidential identities tables. For this reason, we do not recommend the use of both old and new confidential identities APIs in the same deployment. The old confidential identities API will be deprecated in a future release. -Issued Fixed +Issues Fixed ~~~~~~~~~~~~ * Register custom serializers for jackson as well as amqp [`CORDA-3152 `_] From 831ca33ed5a84e8fe0aea88d07a3e2fee531eeb6 Mon Sep 17 00:00:00 2001 From: Stefano Franz Date: Mon, 18 Nov 2019 13:45:43 +0000 Subject: [PATCH 7/8] try increase websocket timeout due to azure EOF exceptions (#5729) --- .../groovy/net/corda/testing/KubesTest.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java index 6a1a94732d..d47979c0c5 100644 --- a/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java +++ b/buildSrc/src/main/groovy/net/corda/testing/KubesTest.java @@ -64,6 +64,10 @@ public class KubesTest extends DefaultTask { */ private static final String REGISTRY_CREDENTIALS_SECRET_NAME = "regcred"; + private static int DEFAULT_K8S_TIMEOUT_VALUE_MILLIES = 60 * 1_000; + private static int DEFAULT_K8S_WEBSOCKET_TIMEOUT = DEFAULT_K8S_TIMEOUT_VALUE_MILLIES * 30; + private static int DEFAULT_POD_ALLOCATION_TIMEOUT = 60; + String dockerTag; String fullTaskToExecutePath; String taskToExecuteName; @@ -78,10 +82,8 @@ public class KubesTest extends DefaultTask { private final Set remainingPods = Collections.synchronizedSet(new HashSet()); public static String NAMESPACE = "thisisatest"; - int k8sTimeout = 50 * 1_000; - int webSocketTimeout = k8sTimeout * 6; + int numberOfPods = 5; - int timeoutInMinutesForPodToStart = 60; DistributeTestsBy distribution = DistributeTestsBy.METHOD; PodLogLevel podLogLevel = PodLogLevel.INFO; @@ -139,11 +141,11 @@ public class KubesTest extends DefaultTask { @NotNull private KubernetesClient getKubernetesClient() { io.fabric8.kubernetes.client.Config config = new io.fabric8.kubernetes.client.ConfigBuilder() - .withConnectionTimeout(k8sTimeout) - .withRequestTimeout(k8sTimeout) - .withRollingTimeout(k8sTimeout) - .withWebsocketTimeout(webSocketTimeout) - .withWebsocketPingInterval(webSocketTimeout) + .withConnectionTimeout(DEFAULT_K8S_TIMEOUT_VALUE_MILLIES) + .withRequestTimeout(DEFAULT_K8S_TIMEOUT_VALUE_MILLIES) + .withRollingTimeout(DEFAULT_K8S_TIMEOUT_VALUE_MILLIES) + .withWebsocketTimeout(DEFAULT_K8S_WEBSOCKET_TIMEOUT) + .withWebsocketPingInterval(DEFAULT_K8S_WEBSOCKET_TIMEOUT) .build(); return new DefaultKubernetesClient(config); @@ -460,7 +462,7 @@ public class KubesTest extends DefaultTask { try (KubernetesClient client = getKubernetesClient()) { getProject().getLogger().lifecycle("Waiting for pod " + pod.getMetadata().getName() + " to start before executing build"); try { - client.pods().inNamespace(pod.getMetadata().getNamespace()).withName(pod.getMetadata().getName()).waitUntilReady(timeoutInMinutesForPodToStart, TimeUnit.MINUTES); + client.pods().inNamespace(pod.getMetadata().getNamespace()).withName(pod.getMetadata().getName()).waitUntilReady(DEFAULT_POD_ALLOCATION_TIMEOUT, TimeUnit.MINUTES); } catch (InterruptedException e) { throw new RuntimeException(e); } From 4e7c8a6b1b31773f9330d8f05cf4176316c2bd26 Mon Sep 17 00:00:00 2001 From: stefano Date: Mon, 18 Nov 2019 14:04:06 +0000 Subject: [PATCH 8/8] revert api-current to 4.4 --- .ci/api-current.txt | 388 -------------------------------------------- 1 file changed, 388 deletions(-) diff --git a/.ci/api-current.txt b/.ci/api-current.txt index b5741aebc3..5af5a10553 100644 --- a/.ci/api-current.txt +++ b/.ci/api-current.txt @@ -478,8 +478,6 @@ public interface net.corda.core.contracts.Attachment extends net.corda.core.cont public interface net.corda.core.contracts.AttachmentConstraint public abstract boolean isSatisfiedBy(net.corda.core.contracts.Attachment) ## -public final class net.corda.core.contracts.AttachmentConstraintKt extends java.lang.Object -## @CordaSerializable public final class net.corda.core.contracts.AttachmentResolutionException extends net.corda.core.flows.FlowException public (net.corda.core.crypto.SecureHash) @@ -571,7 +569,6 @@ public interface net.corda.core.contracts.Contract public abstract void verify(net.corda.core.transactions.LedgerTransaction) ## @DoNotImplement -@CordaSerializable public final class net.corda.core.contracts.ContractAttachment extends java.lang.Object implements net.corda.core.contracts.Attachment public (net.corda.core.contracts.Attachment, String) public (net.corda.core.contracts.Attachment, String, java.util.Set) @@ -650,11 +647,6 @@ public final class net.corda.core.contracts.HashAttachmentConstraint extends jav public boolean isSatisfiedBy(net.corda.core.contracts.Attachment) @NotNull public String toString() - public static final net.corda.core.contracts.HashAttachmentConstraint$Companion Companion -## -public static final class net.corda.core.contracts.HashAttachmentConstraint$Companion extends java.lang.Object - public (kotlin.jvm.internal.DefaultConstructorMarker) - public final boolean getDisableHashConstraints() ## @CordaSerializable public final class net.corda.core.contracts.InsufficientBalanceException extends net.corda.core.flows.FlowException @@ -683,20 +675,15 @@ public final class net.corda.core.contracts.Issued extends java.lang.Object public @interface net.corda.core.contracts.LegalProseReference public abstract String uri() ## -@DoNotImplement @CordaSerializable public final class net.corda.core.contracts.LinearPointer extends net.corda.core.contracts.StatePointer - @DeprecatedConstructorForDeserialization public (net.corda.core.contracts.UniqueIdentifier, Class) - public (net.corda.core.contracts.UniqueIdentifier, Class, boolean) - public (net.corda.core.contracts.UniqueIdentifier, Class, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public boolean equals(Object) @NotNull public net.corda.core.contracts.UniqueIdentifier getPointer() @NotNull public Class getType() public int hashCode() - public boolean isResolved() @NotNull public net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull @@ -884,7 +871,6 @@ public final class net.corda.core.contracts.StateAndRef extends java.lang.Object @NotNull public String toString() ## -@DoNotImplement @CordaSerializable public abstract class net.corda.core.contracts.StatePointer extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) @@ -892,15 +878,10 @@ public abstract class net.corda.core.contracts.StatePointer extends java.lang.Ob public abstract Object getPointer() @NotNull public abstract Class getType() - public abstract boolean isResolved() @NotNull public abstract net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull public abstract net.corda.core.contracts.StateAndRef resolve(net.corda.core.transactions.LedgerTransaction) - public static final net.corda.core.contracts.StatePointer$Companion Companion -## -public static final class net.corda.core.contracts.StatePointer$Companion extends java.lang.Object - public (kotlin.jvm.internal.DefaultConstructorMarker) ## @CordaSerializable public final class net.corda.core.contracts.StateRef extends java.lang.Object @@ -918,20 +899,15 @@ public final class net.corda.core.contracts.StateRef extends java.lang.Object @NotNull public String toString() ## -@DoNotImplement @CordaSerializable public final class net.corda.core.contracts.StaticPointer extends net.corda.core.contracts.StatePointer - @DeprecatedConstructorForDeserialization public (net.corda.core.contracts.StateRef, Class) - public (net.corda.core.contracts.StateRef, Class, boolean) - public (net.corda.core.contracts.StateRef, Class, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) public boolean equals(Object) @NotNull public net.corda.core.contracts.StateRef getPointer() @NotNull public Class getType() public int hashCode() - public boolean isResolved() @NotNull public net.corda.core.contracts.StateAndRef resolve(net.corda.core.node.ServiceHub) @NotNull @@ -1034,7 +1010,6 @@ public final class net.corda.core.contracts.TransactionState extends java.lang.O ## public final class net.corda.core.contracts.TransactionStateKt extends java.lang.Object ## -@CordaSerializable public abstract class net.corda.core.contracts.TransactionVerificationException extends net.corda.core.flows.FlowException public (net.corda.core.crypto.SecureHash, String, Throwable) @NotNull @@ -1048,7 +1023,6 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ConstraintPropagationRejection extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, String, net.corda.core.contracts.AttachmentConstraint, net.corda.core.contracts.AttachmentConstraint) @NotNull public final String getContractClass() @@ -1061,7 +1035,6 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ContractCreationError extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String, Throwable) public (net.corda.core.crypto.SecureHash, String, Throwable, String) @NotNull public final String getContractClass() @@ -1079,32 +1052,12 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public static net.corda.core.contracts.TransactionVerificationException$Direction[] values() ## @CordaSerializable -public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateAttachmentsRejection extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.Attachment) - @NotNull - public final net.corda.core.contracts.Attachment getAttachmentId() -## -@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateInputStates extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, net.corda.core.utilities.NonEmptySet) @NotNull public final net.corda.core.utilities.NonEmptySet getDuplicates() ## @CordaSerializable -public static final class net.corda.core.contracts.TransactionVerificationException$InvalidAttachmentException extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, net.corda.core.crypto.SecureHash) - @NotNull - public final net.corda.core.crypto.SecureHash getAttachmentHash() -## -@CordaSerializable -public static final class net.corda.core.contracts.TransactionVerificationException$InvalidConstraintRejection extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String, String) - @NotNull - public final String getContractClass() - @NotNull - public final String getReason() -## -@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$InvalidNotaryChange extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash) ## @@ -1115,11 +1068,6 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public final String getContractClass() ## @CordaSerializable -public static final class net.corda.core.contracts.TransactionVerificationException$MissingNetworkParametersException extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String) - public (net.corda.core.crypto.SecureHash, net.corda.core.crypto.SecureHash) -## -@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$MoreThanOneNotary extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash) ## @@ -1134,8 +1082,6 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$OverlappingAttachmentsException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, String) - @NotNull - public final String getPath() ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$PackageOwnershipException extends net.corda.core.contracts.TransactionVerificationException @@ -1155,13 +1101,11 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionContractConflictException extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.TransactionState, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionDuplicateEncumbranceException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, int) - public (net.corda.core.crypto.SecureHash, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionMissingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException @@ -1171,34 +1115,18 @@ public static final class net.corda.core.contracts.TransactionVerificationExcept public final int getMissing() ## @CordaSerializable -public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNetworkParameterOrderingException extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String) - public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.StateRef, net.corda.core.node.NetworkParameters, net.corda.core.node.NetworkParameters) -## -@CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNonMatchingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, java.util.Collection) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionNotaryMismatchEncumbranceException extends net.corda.core.contracts.TransactionVerificationException public (net.corda.core.crypto.SecureHash, int, int, net.corda.core.identity.Party, net.corda.core.identity.Party) - public (net.corda.core.crypto.SecureHash, String) ## @CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionRequiredContractUnspecifiedException extends net.corda.core.contracts.TransactionVerificationException - public (net.corda.core.crypto.SecureHash, String) public (net.corda.core.crypto.SecureHash, net.corda.core.contracts.TransactionState) ## @CordaSerializable -public static final class net.corda.core.contracts.TransactionVerificationException$UntrustedAttachmentsException extends net.corda.core.CordaException - public (net.corda.core.crypto.SecureHash, java.util.List) - @NotNull - public final java.util.List getIds() - @NotNull - public final net.corda.core.crypto.SecureHash getTxId() -## -@CordaSerializable public abstract class net.corda.core.contracts.TypeOnlyCommandData extends java.lang.Object implements net.corda.core.contracts.CommandData public () public boolean equals(Object) @@ -1439,48 +1367,6 @@ public final class net.corda.core.cordapp.CordappContext extends java.lang.Objec public static final class net.corda.core.cordapp.CordappContext$Companion extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) ## -@CordaSerializable -public final class net.corda.core.cordapp.CordappInfo extends java.lang.Object - public (String, String, String, int, int, String, String, String, net.corda.core.crypto.SecureHash$SHA256) - @NotNull - public final String component1() - @NotNull - public final String component2() - @NotNull - public final String component3() - public final int component4() - public final int component5() - @NotNull - public final String component6() - @NotNull - public final String component7() - @NotNull - public final String component8() - @NotNull - public final net.corda.core.crypto.SecureHash$SHA256 component9() - @NotNull - public final net.corda.core.cordapp.CordappInfo copy(String, String, String, int, int, String, String, String, net.corda.core.crypto.SecureHash$SHA256) - public boolean equals(Object) - @NotNull - public final net.corda.core.crypto.SecureHash$SHA256 getJarHash() - @NotNull - public final String getLicence() - public final int getMinimumPlatformVersion() - @NotNull - public final String getName() - @NotNull - public final String getShortName() - public final int getTargetPlatformVersion() - @NotNull - public final String getType() - @NotNull - public final String getVendor() - @NotNull - public final String getVersion() - public int hashCode() - @NotNull - public String toString() -## @DoNotImplement public interface net.corda.core.cordapp.CordappProvider @NotNull @@ -2268,9 +2154,6 @@ public class net.corda.core.flows.DataVendingFlow extends net.corda.core.flows.F @Suspendable protected void verifyDataRequest(net.corda.core.internal.FetchDataFlow$Request$Data) ## -@DoNotImplement -public interface net.corda.core.flows.Destination -## @InitiatingFlow public final class net.corda.core.flows.FinalityFlow extends net.corda.core.flows.FlowLogic public (net.corda.core.transactions.SignedTransaction) @@ -2441,9 +2324,6 @@ public abstract class net.corda.core.flows.FlowLogic extends java.lang.Object public final net.corda.core.node.ServiceHub getServiceHub() @Suspendable @NotNull - public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.flows.Destination) - @Suspendable - @NotNull public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.identity.Party) @Suspendable public final void persistFlowStackSnapshot() @@ -2523,8 +2403,6 @@ public abstract class net.corda.core.flows.FlowSession extends java.lang.Object @Suspendable @NotNull public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo(boolean) - @NotNull - public abstract net.corda.core.flows.Destination getDestination() @Suspendable @NotNull public abstract net.corda.core.utilities.UntrustworthyData receive(Class) @@ -2670,11 +2548,6 @@ public final class net.corda.core.flows.NotaryChangeFlow extends net.corda.core. @CordaSerializable public abstract class net.corda.core.flows.NotaryError extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) - public static final net.corda.core.flows.NotaryError$Companion Companion - public static final int NUM_STATES = 5 -## -public static final class net.corda.core.flows.NotaryError$Companion extends java.lang.Object - public (kotlin.jvm.internal.DefaultConstructorMarker) ## @CordaSerializable public static final class net.corda.core.flows.NotaryError$Conflict extends net.corda.core.flows.NotaryError @@ -3096,7 +2969,6 @@ public final class net.corda.core.identity.IdentityUtils extends java.lang.Objec public static final java.util.Map> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection) @NotNull public static final java.util.Map> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection, boolean) - public static final boolean x500Matches(String, boolean, net.corda.core.identity.CordaX500Name) ## @DoNotImplement @CordaSerializable @@ -3192,8 +3064,6 @@ public interface net.corda.core.messaging.CordaRPCOps extends net.corda.core.mes @NotNull public abstract net.corda.core.messaging.DataFeed networkParametersFeed() @NotNull - public abstract net.corda.core.node.NodeDiagnosticInfo nodeDiagnosticInfo() - @NotNull public abstract net.corda.core.node.NodeInfo nodeInfo() @Nullable public abstract net.corda.core.node.NodeInfo nodeInfoFromParty(net.corda.core.identity.AbstractParty) @@ -3551,34 +3421,6 @@ public final class net.corda.core.node.NetworkParameters extends java.lang.Objec public String toString() ## @CordaSerializable -public final class net.corda.core.node.NodeDiagnosticInfo extends java.lang.Object - public (String, String, int, String, java.util.List) - @NotNull - public final String component1() - @NotNull - public final String component2() - public final int component3() - @NotNull - public final String component4() - @NotNull - public final java.util.List component5() - @NotNull - public final net.corda.core.node.NodeDiagnosticInfo copy(String, String, int, String, java.util.List) - public boolean equals(Object) - @NotNull - public final java.util.List getCordapps() - public final int getPlatformVersion() - @NotNull - public final String getRevision() - @NotNull - public final String getVendor() - @NotNull - public final String getVersion() - public int hashCode() - @NotNull - public String toString() -## -@CordaSerializable public final class net.corda.core.node.NodeInfo extends java.lang.Object public (java.util.List, java.util.List, int, long) @NotNull @@ -3603,7 +3445,6 @@ public final class net.corda.core.node.NodeInfo extends java.lang.Object public final net.corda.core.identity.PartyAndCertificate identityAndCertFromX500Name(net.corda.core.identity.CordaX500Name) @NotNull public final net.corda.core.identity.Party identityFromX500Name(net.corda.core.identity.CordaX500Name) - public final boolean isLegalIdentity(net.corda.core.identity.CordaX500Name) public final boolean isLegalIdentity(net.corda.core.identity.Party) @NotNull public String toString() @@ -3738,9 +3579,6 @@ public interface net.corda.core.node.services.IdentityService public abstract void assertOwnership(net.corda.core.identity.Party, net.corda.core.identity.AnonymousParty) @Nullable public abstract net.corda.core.identity.PartyAndCertificate certificateFromKey(java.security.PublicKey) - @Suspendable - @Nullable - public abstract java.util.UUID externalIdForPublicKey(java.security.PublicKey) @NotNull public abstract Iterable getAllIdentities() @NotNull @@ -3754,9 +3592,6 @@ public interface net.corda.core.node.services.IdentityService @Nullable public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey) @NotNull - public abstract Iterable publicKeysForExternalId(java.util.UUID) - public abstract void registerKey(java.security.PublicKey, net.corda.core.identity.Party, java.util.UUID) - @NotNull public abstract net.corda.core.identity.Party requireWellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty) @Nullable public abstract net.corda.core.identity.PartyAndCertificate verifyAndRegisterIdentity(net.corda.core.identity.PartyAndCertificate) @@ -3766,9 +3601,6 @@ public interface net.corda.core.node.services.IdentityService public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty) @Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name) - public static final net.corda.core.node.services.IdentityService$Companion Companion -## -public static final class net.corda.core.node.services.IdentityService$Companion extends java.lang.Object ## @DoNotImplement public interface net.corda.core.node.services.KeyManagementService @@ -3779,13 +3611,7 @@ public interface net.corda.core.node.services.KeyManagementService public abstract java.security.PublicKey freshKey() @Suspendable @NotNull - public abstract java.security.PublicKey freshKey(java.util.UUID) - @Suspendable - @NotNull public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean) - @Suspendable - @NotNull - public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean, java.util.UUID) @NotNull public abstract java.util.Set getKeys() @Suspendable @@ -4153,8 +3979,6 @@ public static final class net.corda.core.node.services.Vault$UpdateType extends @CordaSerializable public final class net.corda.core.node.services.VaultQueryException extends net.corda.core.flows.FlowException public (String) - public (String, Exception) - public (String, Exception, int, kotlin.jvm.internal.DefaultConstructorMarker) ## @DoNotImplement public interface net.corda.core.node.services.VaultService @@ -4230,13 +4054,9 @@ public static final class net.corda.core.node.services.vault.AttachmentQueryCrit @CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria extends net.corda.core.node.services.vault.AttachmentQueryCriteria public () - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate>, net.corda.core.node.services.vault.ColumnPredicate>, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate) public (net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, int, kotlin.jvm.internal.DefaultConstructorMarker) @@ -4942,10 +4762,6 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co @Nullable public abstract java.util.Set> getContractStateTypes() @Nullable - public java.util.List getExactParticipants() - @NotNull - public java.util.List getExternalIds() - @Nullable public java.util.List getParticipants() @NotNull public net.corda.core.node.services.Vault$RelevancyStatus getRelevancyStatus() @@ -4956,30 +4772,17 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @DeprecatedConstructorForDeserialization public () - @DeprecatedConstructorForDeserialization public (java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) - public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) - public (java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final java.util.List component1() @Nullable @@ -4996,20 +4799,14 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi public final java.util.Set> component7() @NotNull public final net.corda.core.node.services.Vault$RelevancyStatus component8() - @Nullable - public final java.util.List component9() @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) - @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List, java.util.List, net.corda.core.node.services.vault.ColumnPredicate, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) public boolean equals(Object) @Nullable public java.util.Set> getContractStateTypes() @Nullable - public java.util.List getExactParticipants() - @Nullable public final java.util.List getIssuer() @Nullable public final java.util.List getIssuerRef() @@ -5031,8 +4828,6 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withContractStateTypes(java.util.Set>) @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withExactParticipants(java.util.List) - @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withIssuer(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria withOwner(java.util.List) @@ -5093,33 +4888,18 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @DeprecatedConstructorForDeserialization public () - @DeprecatedConstructorForDeserialization public (java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) - public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) - public (java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) - @DeprecatedConstructorForDeserialization public (java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final java.util.List component1() @@ -5133,20 +4913,14 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Linea public final java.util.Set> component5() @NotNull public final net.corda.core.node.services.Vault$RelevancyStatus component6() - @Nullable - public final java.util.List component7() @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) - @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List, java.util.List, java.util.List, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus, java.util.List) public boolean equals(Object) @Nullable public java.util.Set> getContractStateTypes() @Nullable - public java.util.List getExactParticipants() - @Nullable public final java.util.List getExternalId() @Nullable public java.util.List getParticipants() @@ -5164,8 +4938,6 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Linea @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withContractStateTypes(java.util.Set>) @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withExactParticipants(java.util.List) - @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withExternalId(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria withParticipants(java.util.List) @@ -5235,13 +5007,9 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$TimeI ## @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set>) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set>, net.corda.core.node.services.Vault$RelevancyStatus) public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, java.util.Set, net.corda.core.node.services.Vault$RelevancyStatus, int, kotlin.jvm.internal.DefaultConstructorMarker) @@ -5283,38 +5051,19 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria public () - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, int, kotlin.jvm.internal.DefaultConstructorMarker) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List) - @DeprecatedConstructorForDeserialization public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) - @DeprecatedConstructorForDeserialization - public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List) - @DeprecatedConstructorForDeserialization - public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) - public (net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List) - public (net.corda.core.node.services.Vault$StateStatus, java.util.Set, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.core.node.services.Vault$StateStatus component1() @Nullable public final java.util.List component10() - @NotNull - public final java.util.List component11() - @Nullable - public final java.util.List component12() @Nullable public final java.util.Set> component2() @Nullable @@ -5335,10 +5084,6 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List) - @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List) - @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set>, java.util.List, java.util.List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition, net.corda.core.node.services.Vault$RelevancyStatus, java.util.Set, java.util.Set, java.util.List, java.util.List, java.util.List) public boolean equals(Object) @NotNull public java.util.Set getConstraintTypes() @@ -5347,10 +5092,6 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @Nullable public java.util.Set> getContractStateTypes() @Nullable - public java.util.List getExactParticipants() - @NotNull - public java.util.List getExternalIds() - @Nullable public final java.util.List getNotary() @Nullable public java.util.List getParticipants() @@ -5376,10 +5117,6 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withContractStateTypes(java.util.Set>) @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withExactParticipants(java.util.List) - @NotNull - public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withExternalIds(java.util.List) - @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withNotary(java.util.List) @NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria withParticipants(java.util.List) @@ -5710,7 +5447,6 @@ public final class net.corda.core.serialization.SerializationAPIKt extends java. ## @DoNotImplement public interface net.corda.core.serialization.SerializationContext - public abstract boolean getCarpenterDisabled() @NotNull public abstract java.util.Set> getCustomSerializers() @NotNull @@ -5751,8 +5487,6 @@ public interface net.corda.core.serialization.SerializationContext @NotNull public abstract net.corda.core.serialization.SerializationContext withWhitelisted(Class) @NotNull - public abstract net.corda.core.serialization.SerializationContext withoutCarpenter() - @NotNull public abstract net.corda.core.serialization.SerializationContext withoutReferences() ## public static final class net.corda.core.serialization.SerializationContext$UseCase extends java.lang.Enum @@ -5955,7 +5689,6 @@ public static final class net.corda.core.transactions.ContractUpgradeFilteredTra @DoNotImplement public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures public (java.util.List>, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List, net.corda.core.node.NetworkParameters) - public (java.util.List, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List, net.corda.core.node.NetworkParameters, net.corda.core.contracts.UpgradedContract, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final java.util.List> component1() @NotNull @@ -6006,10 +5739,6 @@ public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction public int hashCode() @NotNull public String toString() - public static final net.corda.core.transactions.ContractUpgradeLedgerTransaction$Companion Companion -## -public static final class net.corda.core.transactions.ContractUpgradeLedgerTransaction$Companion extends java.lang.Object - public (kotlin.jvm.internal.DefaultConstructorMarker) ## @DoNotImplement @CordaSerializable @@ -6143,7 +5872,6 @@ public abstract class net.corda.core.transactions.FullTransaction extends net.co public final class net.corda.core.transactions.LedgerTransaction extends net.corda.core.transactions.FullTransaction public (java.util.List>, java.util.List>, java.util.List>, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt) public (java.util.List>, java.util.List>, java.util.List>, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters) - public (java.util.List, java.util.List, java.util.List, java.util.List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters, java.util.List, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final java.util.List> commandsOfType(Class) @NotNull @@ -6459,7 +6187,6 @@ public final class net.corda.core.transactions.SignedTransaction extends java.la public final net.corda.core.transactions.SignedTransaction withAdditionalSignatures(Iterable) public static final net.corda.core.transactions.SignedTransaction$Companion Companion ## -@CordaSerializable public static final class net.corda.core.transactions.SignedTransaction$SignaturesMissingException extends java.security.SignatureException implements net.corda.core.CordaThrowable, net.corda.core.contracts.NamedByHash public (java.util.Set, java.util.List, net.corda.core.crypto.SecureHash) public void addSuppressed(Throwable[]) @@ -6507,8 +6234,6 @@ public class net.corda.core.transactions.TransactionBuilder extends java.lang.Ob @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint) @NotNull - public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, net.corda.core.contracts.AttachmentConstraint) - @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, net.corda.core.identity.Party) @NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState) @@ -6901,7 +6626,6 @@ public final class net.corda.core.utilities.ProgressTracker extends java.lang.Ob public final net.corda.core.utilities.ProgressTracker$Step nextStep() public final void setChildProgressTracker(net.corda.core.utilities.ProgressTracker$Step, net.corda.core.utilities.ProgressTracker) public final void setCurrentStep(net.corda.core.utilities.ProgressTracker$Step) - public static final net.corda.core.utilities.ProgressTracker$Companion Companion ## @CordaSerializable public abstract static class net.corda.core.utilities.ProgressTracker$Change extends java.lang.Object @@ -6978,14 +6702,12 @@ public static class net.corda.core.utilities.ProgressTracker$Step extends java.l public (String) @Nullable public net.corda.core.utilities.ProgressTracker childProgressTracker() - public boolean equals(Object) @NotNull public rx.Observable getChanges() @NotNull public java.util.Map getExtraAuditData() @NotNull public String getLabel() - public int hashCode() ## @CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$UNSTARTED extends net.corda.core.utilities.ProgressTracker$Step @@ -7310,7 +7032,6 @@ public class net.corda.client.jackson.StringToMethodCallParser extends java.lang public final net.corda.client.jackson.StringToMethodCallParser.ParsedMethodCall parse(T, String) @NotNull public final Object[] parseArguments(String, java.util.List>, String) - public final void validateIsMatchingCtor(String, java.util.List>, String) public static final net.corda.client.jackson.StringToMethodCallParser$Companion Companion ## public static final class net.corda.client.jackson.StringToMethodCallParser$Companion extends java.lang.Object @@ -7339,9 +7060,6 @@ public static final class net.corda.client.jackson.StringToMethodCallParser$Unpa @NotNull public final String getParamName() ## -public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$NoSuchFile extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException - public (String) -## public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$ReflectionDataMissing extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException public (String, int) ## @@ -7368,7 +7086,6 @@ public interface net.corda.testing.driver.DriverDSL public abstract net.corda.core.concurrent.CordaFuture getDefaultNotaryNode() @NotNull public abstract java.util.List getNotaryHandles() - public abstract int nextPort() @NotNull public abstract net.corda.core.concurrent.CordaFuture startNode() @NotNull @@ -7376,8 +7093,6 @@ public interface net.corda.testing.driver.DriverDSL @NotNull public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) @NotNull - public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, String) - @NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle) @NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle, String) @@ -7542,8 +7257,6 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>) public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map, int, kotlin.jvm.internal.DefaultConstructorMarker) - public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>, String) - public (net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map, String, int, kotlin.jvm.internal.DefaultConstructorMarker) @Nullable public final net.corda.core.identity.CordaX500Name component1() @NotNull @@ -7560,14 +7273,10 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public final java.util.Collection component7() @NotNull public final java.util.Map>, Class>> component8() - @Nullable - public final String component9() @NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String) @NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>) - @NotNull - public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List, net.corda.testing.driver.VerifierType, java.util.Map, Boolean, String, java.util.Collection, java.util.Map>, ? extends Class>>, String) public boolean equals(Object) @NotNull public final java.util.Collection getAdditionalCordapps() @@ -7575,8 +7284,6 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj public final java.util.Map getCustomOverrides() @NotNull public final java.util.Map>, Class>> getFlowOverrides() - @Nullable - public final String getLogLevelOverride() @NotNull public final String getMaximumHeapSize() @Nullable @@ -7597,8 +7304,6 @@ public final class net.corda.testing.driver.NodeParameters extends java.lang.Obj @NotNull public final net.corda.testing.driver.NodeParameters withFlowOverrides(java.util.Map>, ? extends Class>>) @NotNull - public final net.corda.testing.driver.NodeParameters withLogLevelOverride(String) - @NotNull public final net.corda.testing.driver.NodeParameters withMaximumHeapSize(String) @NotNull public final net.corda.testing.driver.NodeParameters withProvidedName(net.corda.core.identity.CordaX500Name) @@ -7637,18 +7342,8 @@ public interface net.corda.testing.driver.OutOfProcess extends net.corda.testing public abstract class net.corda.testing.driver.PortAllocation extends java.lang.Object public () @NotNull - public static final net.corda.testing.driver.PortAllocation getDefaultAllocator() - @NotNull public final net.corda.core.utilities.NetworkHostAndPort nextHostAndPort() public abstract int nextPort() - public static final net.corda.testing.driver.PortAllocation$Companion Companion - public static final int DEFAULT_START_PORT = 10000 - public static final int FIRST_EPHEMERAL_PORT = 30000 -## -public static final class net.corda.testing.driver.PortAllocation$Companion extends java.lang.Object - public (kotlin.jvm.internal.DefaultConstructorMarker) - @NotNull - public final net.corda.testing.driver.PortAllocation getDefaultAllocator() ## @DoNotImplement public static class net.corda.testing.driver.PortAllocation$Incremental extends net.corda.testing.driver.PortAllocation @@ -7678,22 +7373,6 @@ public final class net.corda.testing.driver.WebserverHandle extends java.lang.Ob @NotNull public String toString() ## -public final class net.corda.testing.flows.FlowTestsUtilsKt extends java.lang.Object - @NotNull - public static final kotlin.Pair from(T, net.corda.core.flows.FlowSession) - @NotNull - public static final R from(java.util.Map>, net.corda.core.flows.FlowSession) - @NotNull - public static final kotlin.Pair> from(kotlin.reflect.KClass, net.corda.core.flows.FlowSession) - @Suspendable - @NotNull - public static final java.util.List> receiveAll(net.corda.core.flows.FlowLogic, Class, net.corda.core.flows.FlowSession, net.corda.core.flows.FlowSession...) - @Suspendable - @NotNull - public static final java.util.Map> receiveAll(net.corda.core.flows.FlowLogic, kotlin.Pair>, kotlin.Pair>...) - @NotNull - public static final rx.Observable registerCoreFlowFactory(net.corda.testing.node.internal.TestStartedNode, Class>, Class, kotlin.jvm.functions.Function1, boolean) -## @DoNotImplement public abstract class net.corda.testing.node.ClusterSpec extends java.lang.Object public () @@ -7887,21 +7566,16 @@ public final class net.corda.testing.node.MockNetworkNotarySpec extends java.lan public (net.corda.core.identity.CordaX500Name) public (net.corda.core.identity.CordaX500Name, boolean) public (net.corda.core.identity.CordaX500Name, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker) - public (net.corda.core.identity.CordaX500Name, boolean, String) - public (net.corda.core.identity.CordaX500Name, boolean, String, int, kotlin.jvm.internal.DefaultConstructorMarker) @NotNull public final net.corda.core.identity.CordaX500Name component1() public final boolean component2() @NotNull public final net.corda.testing.node.MockNetworkNotarySpec copy(net.corda.core.identity.CordaX500Name, boolean) public boolean equals(Object) - @Nullable - public final String getClassName() @NotNull public final net.corda.core.identity.CordaX500Name getName() public final boolean getValidating() public int hashCode() - public final void setClassName(String) @NotNull public String toString() ## @@ -8018,7 +7692,6 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public (Iterable, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...) public (Iterable, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair...) - public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair[], net.corda.core.node.services.KeyManagementService) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair...) public (Iterable, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) public (Iterable, net.corda.testing.core.TestIdentity, java.security.KeyPair...) @@ -8031,8 +7704,6 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService) public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, int, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...) - public (net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair[], int, kotlin.jvm.internal.DefaultConstructorMarker) - public (net.corda.nodeapi.internal.cordapp.CordappLoader, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, net.corda.testing.core.TestIdentity, java.security.KeyPair[], net.corda.core.node.services.KeyManagementService, kotlin.jvm.internal.DefaultConstructorMarker) public (net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, net.corda.testing.core.TestIdentity...) public (net.corda.testing.core.TestIdentity, net.corda.testing.core.TestIdentity...) public final void addMockCordapp(String) @@ -8096,12 +7767,6 @@ public class net.corda.testing.node.MockServices extends java.lang.Object implem public static final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...) @NotNull public static final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...) - @NotNull - public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, java.util.Set, java.util.Set) - @NotNull - public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set) - @NotNull - public static final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set, net.corda.testing.internal.TestingNamedCacheFactory) public void recordTransactions(Iterable) public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable) public void recordTransactions(net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...) @@ -8130,12 +7795,6 @@ public static final class net.corda.testing.node.MockServices$Companion extends public final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...) @NotNull public final kotlin.Pair makeTestDatabaseAndMockServices(java.util.List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...) - @NotNull - public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, java.util.Set, java.util.Set) - @NotNull - public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set) - @NotNull - public final kotlin.Pair makeTestDatabaseAndPersistentServices(java.util.List, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.util.Set, java.util.Set, net.corda.testing.internal.TestingNamedCacheFactory) ## public final class net.corda.testing.node.MockServicesKt extends java.lang.Object @NotNull @@ -8241,8 +7900,6 @@ public final class net.corda.testing.node.UnstartedMockNode extends java.lang.Ob public final int getId() @NotNull public final net.corda.testing.node.StartedMockNode getStarted() - @NotNull - public final T installCordaService(Class) public final boolean isStarted() @NotNull public final net.corda.testing.node.StartedMockNode start() @@ -8296,19 +7953,11 @@ public final class net.corda.client.rpc.CordaRPCClient extends java.lang.Object @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String) @NotNull - public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.client.rpc.GracefulReconnect) - @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor) @NotNull - public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.client.rpc.GracefulReconnect) - @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.identity.CordaX500Name) @NotNull - public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.identity.CordaX500Name, net.corda.client.rpc.GracefulReconnect) - @NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.identity.CordaX500Name) - @NotNull - public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.identity.CordaX500Name, net.corda.client.rpc.GracefulReconnect) public final A use(String, String, kotlin.jvm.functions.Function1) public static final net.corda.client.rpc.CordaRPCClient$Companion Companion ## @@ -8384,33 +8033,12 @@ public static final class net.corda.client.rpc.CordaRPCClientConfiguration$Compa @DoNotImplement public final class net.corda.client.rpc.CordaRPCConnection extends java.lang.Object implements net.corda.client.rpc.RPCConnection public (net.corda.client.rpc.RPCConnection) - public (net.corda.client.rpc.RPCConnection, java.util.concurrent.ExecutorService, net.corda.client.rpc.internal.ReconnectingCordaRPCOps, kotlin.jvm.internal.DefaultConstructorMarker) public void close() public void forceClose() @NotNull public net.corda.core.messaging.CordaRPCOps getProxy() public int getServerProtocolVersion() public void notifyServerAndClose() - public static final net.corda.client.rpc.CordaRPCConnection$Companion Companion -## -public static final class net.corda.client.rpc.CordaRPCConnection$Companion extends java.lang.Object - public (kotlin.jvm.internal.DefaultConstructorMarker) -## -public final class net.corda.client.rpc.GracefulReconnect extends java.lang.Object - public () - public (Runnable, Runnable) - public (Runnable, Runnable, int) - public (Runnable, Runnable, int, int, kotlin.jvm.internal.DefaultConstructorMarker) - public (kotlin.jvm.functions.Function0, kotlin.jvm.functions.Function0, int) - public (kotlin.jvm.functions.Function0, kotlin.jvm.functions.Function0, int, int, kotlin.jvm.internal.DefaultConstructorMarker) - public final int getMaxAttempts() - @NotNull - public final kotlin.jvm.functions.Function0 getOnDisconnect() - @NotNull - public final kotlin.jvm.functions.Function0 getOnReconnect() -## -public final class net.corda.client.rpc.MaxRpcRetryException extends net.corda.client.rpc.RPCException - public (int, Throwable) ## public final class net.corda.client.rpc.PermissionException extends net.corda.core.CordaRuntimeException implements net.corda.core.ClientRelevantError, net.corda.nodeapi.exceptions.RpcSerializableError public (String) @@ -8419,7 +8047,6 @@ public final class net.corda.client.rpc.PermissionException extends net.corda.co ## @DoNotImplement public interface net.corda.client.rpc.RPCConnection extends java.io.Closeable - public abstract void close() public abstract void forceClose() @NotNull public abstract I getProxy() @@ -8436,11 +8063,6 @@ public @interface net.corda.client.rpc.RPCSinceVersion public final class net.corda.client.rpc.UtilsKt extends java.lang.Object public static final void notUsed(rx.Observable) ## -public final class net.corda.client.rpc.reconnect.CouldNotStartFlowException extends net.corda.client.rpc.RPCException - public () - public (Throwable) - public (Throwable, int, kotlin.jvm.internal.DefaultConstructorMarker) -## public final class net.corda.finance.test.CashSchema extends java.lang.Object public static final net.corda.finance.test.CashSchema INSTANCE ## @@ -8604,10 +8226,6 @@ public final class net.corda.testing.contracts.DummyContractV2 extends java.lang @NotNull public net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint() @NotNull - public static final net.corda.core.transactions.TransactionBuilder move(java.util.List>, net.corda.core.identity.AbstractParty) - @NotNull - public static final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty) - @NotNull public net.corda.testing.contracts.DummyContractV2$State upgrade(net.corda.testing.contracts.DummyContract$State) public void verify(net.corda.core.transactions.LedgerTransaction) public static final net.corda.testing.contracts.DummyContractV2$Companion Companion @@ -8624,10 +8242,6 @@ public static final class net.corda.testing.contracts.DummyContractV2$Commands$M ## public static final class net.corda.testing.contracts.DummyContractV2$Companion extends java.lang.Object public (kotlin.jvm.internal.DefaultConstructorMarker) - @NotNull - public final net.corda.core.transactions.TransactionBuilder move(java.util.List>, net.corda.core.identity.AbstractParty) - @NotNull - public final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty) ## public static final class net.corda.testing.contracts.DummyContractV2$State extends java.lang.Object implements net.corda.core.contracts.ContractState public (int, java.util.List) @@ -8646,8 +8260,6 @@ public static final class net.corda.testing.contracts.DummyContractV2$State exte public int hashCode() @NotNull public String toString() - @NotNull - public final kotlin.Pair withNewOwner(net.corda.core.identity.AbstractParty) ## public final class net.corda.testing.contracts.DummyContractV3 extends java.lang.Object implements net.corda.core.contracts.UpgradedContractWithLegacyConstraint public ()