From d9f086cf9199cf8e0691d9f611716f8a96127f4a Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Fri, 6 Oct 2017 11:53:40 +0100 Subject: [PATCH] Modify the API Scanner plugin to filter method annotations. --- .ci/api-current.txt | 168 +++++++++--------- constants.properties | 2 +- .../main/java/net/corda/plugins/ScanApi.java | 25 ++- 3 files changed, 109 insertions(+), 86 deletions(-) diff --git a/.ci/api-current.txt b/.ci/api-current.txt index 6d69bc4289..86d889b83d 100644 --- a/.ci/api-current.txt +++ b/.ci/api-current.txt @@ -64,8 +64,8 @@ public final class net.corda.core.contracts.Amount extends java.lang.Object impl @org.jetbrains.annotations.NotNull public final Object component3() @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount copy(long, java.math.BigDecimal, Object) public boolean equals(Object) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object, java.math.RoundingMode) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object, java.math.RoundingMode) @org.jetbrains.annotations.NotNull public final java.math.BigDecimal getDisplayTokenSize() @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final java.math.BigDecimal getDisplayTokenSize(Object) public final long getQuantity() @@ -86,8 +86,8 @@ public final class net.corda.core.contracts.Amount extends java.lang.Object impl public static final net.corda.core.contracts.Amount$Companion Companion ## public static final class net.corda.core.contracts.Amount$Companion extends java.lang.Object - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object, java.math.RoundingMode) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object, java.math.RoundingMode) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final java.math.BigDecimal getDisplayTokenSize(Object) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount parseCurrency(String) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.Nullable public final net.corda.core.contracts.Amount sumOrNull(Iterable) @@ -100,8 +100,8 @@ public final class net.corda.core.contracts.AmountTransfer extends java.lang.Obj @org.jetbrains.annotations.NotNull public final List apply(List, Object) @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer copy(long, Object, Object, Object) public boolean equals(Object) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object, java.math.RoundingMode) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object, java.math.RoundingMode) @org.jetbrains.annotations.NotNull public final Object getDestination() public final long getQuantityDelta() @org.jetbrains.annotations.NotNull public final Object getSource() @@ -115,8 +115,8 @@ public final class net.corda.core.contracts.AmountTransfer extends java.lang.Obj public static final net.corda.core.contracts.AmountTransfer$Companion Companion ## public static final class net.corda.core.contracts.AmountTransfer$Companion extends java.lang.Object - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object, java.math.RoundingMode) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object, java.math.RoundingMode) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer zero(Object, Object, Object) ## public interface net.corda.core.contracts.Attachment extends net.corda.core.contracts.NamedByHash @@ -370,9 +370,9 @@ public final class net.corda.core.contracts.TransactionResolutionException exten @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash() ## public final class net.corda.core.contracts.TransactionState extends java.lang.Object - @kotlin.jvm.JvmOverloads public (net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party) - @kotlin.jvm.JvmOverloads public (net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer) - @kotlin.jvm.JvmOverloads public (net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint) + public (net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party) + public (net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer) + public (net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint) @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState component1() @org.jetbrains.annotations.NotNull public final String component2() @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component3() @@ -613,9 +613,9 @@ public final class net.corda.core.crypto.Crypto extends java.lang.Object @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(java.security.PrivateKey) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(java.security.PublicKey) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(org.bouncycastle.asn1.x509.AlgorithmIdentifier) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair() + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair() @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair(String) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair(net.corda.core.crypto.SignatureScheme) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair(net.corda.core.crypto.SignatureScheme) @kotlin.jvm.JvmStatic public static final boolean isSupportedSignatureScheme(net.corda.core.crypto.SignatureScheme) @kotlin.jvm.JvmStatic public static final boolean isValid(java.security.PublicKey, byte[], byte[]) @kotlin.jvm.JvmStatic public static final boolean isValid(net.corda.core.crypto.SecureHash, net.corda.core.crypto.TransactionSignature) @@ -920,10 +920,10 @@ public final class net.corda.core.flows.CollectSignatureFlow extends net.corda.c @org.jetbrains.annotations.NotNull public final List getSigningKeys() ## public final class net.corda.core.flows.CollectSignaturesFlow extends net.corda.core.flows.FlowLogic - @kotlin.jvm.JvmOverloads public (net.corda.core.transactions.SignedTransaction, Collection) - @kotlin.jvm.JvmOverloads public (net.corda.core.transactions.SignedTransaction, Collection, Iterable) - @kotlin.jvm.JvmOverloads public (net.corda.core.transactions.SignedTransaction, Collection, Iterable, net.corda.core.utilities.ProgressTracker) - @kotlin.jvm.JvmOverloads public (net.corda.core.transactions.SignedTransaction, Collection, net.corda.core.utilities.ProgressTracker) + public (net.corda.core.transactions.SignedTransaction, Collection) + public (net.corda.core.transactions.SignedTransaction, Collection, Iterable) + public (net.corda.core.transactions.SignedTransaction, Collection, Iterable, net.corda.core.utilities.ProgressTracker) + public (net.corda.core.transactions.SignedTransaction, Collection, net.corda.core.utilities.ProgressTracker) @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction call() @org.jetbrains.annotations.Nullable public final Iterable getMyOptionalKeys() @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction getPartiallySignedTx() @@ -1234,9 +1234,9 @@ public static final class net.corda.core.flows.StateMachineRunId$Companion exten @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId createRandom() ## public class net.corda.core.flows.StateReplacementException extends net.corda.core.flows.FlowException - @kotlin.jvm.JvmOverloads public () - @kotlin.jvm.JvmOverloads public (String) - @kotlin.jvm.JvmOverloads public (String, Throwable) + public () + public (String) + public (String, Throwable) ## public final class net.corda.core.flows.TransactionParts extends java.lang.Object public (net.corda.core.crypto.SecureHash, List, net.corda.core.contracts.TimeWindow, net.corda.core.identity.Party) @@ -1831,9 +1831,9 @@ public final class net.corda.core.node.services.vault.BinaryLogicalOperator exte public static net.corda.core.node.services.vault.BinaryLogicalOperator[] values() ## public final class net.corda.core.node.services.vault.Builder extends java.lang.Object - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field, List) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field, List) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$Between between(Comparable, Comparable) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression between(reflect.Field, Comparable, Comparable) @@ -1867,13 +1867,13 @@ public final class net.corda.core.node.services.vault.Builder extends java.lang. @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression lessThanOrEqual(kotlin.reflect.KProperty1, Comparable) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression like(reflect.Field, String) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression like(kotlin.reflect.KProperty1, String) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field, List) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field, List) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field, List) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field, List) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison notEqual(Object) @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notEqual(reflect.Field, Object) @@ -1887,9 +1887,9 @@ public final class net.corda.core.node.services.vault.Builder extends java.lang. @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notNull(kotlin.reflect.KProperty1) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression predicate(reflect.Field, net.corda.core.node.services.vault.ColumnPredicate) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression predicate(kotlin.reflect.KProperty1, net.corda.core.node.services.vault.ColumnPredicate) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field, List) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field, List) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction) public static final net.corda.core.node.services.vault.Builder INSTANCE ## @@ -2082,14 +2082,14 @@ public abstract static class net.corda.core.node.services.vault.QueryCriteria$Co @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser) ## public static final class net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @kotlin.jvm.JvmOverloads public () - @kotlin.jvm.JvmOverloads public (List) - @kotlin.jvm.JvmOverloads public (List, List) - @kotlin.jvm.JvmOverloads public (List, List, net.corda.core.node.services.vault.ColumnPredicate) - @kotlin.jvm.JvmOverloads public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List) - @kotlin.jvm.JvmOverloads public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List) - @kotlin.jvm.JvmOverloads public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus) - @kotlin.jvm.JvmOverloads public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus, Set) + public () + public (List) + public (List, List) + public (List, List, net.corda.core.node.services.vault.ColumnPredicate) + public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List) + public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List) + public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus) + public (List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus, Set) @org.jetbrains.annotations.Nullable public final List component1() @org.jetbrains.annotations.Nullable public final List component2() @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate component3() @@ -2111,12 +2111,12 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Fungi @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser) ## public static final class net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @kotlin.jvm.JvmOverloads public () - @kotlin.jvm.JvmOverloads public (List) - @kotlin.jvm.JvmOverloads public (List, List) - @kotlin.jvm.JvmOverloads public (List, List, List) - @kotlin.jvm.JvmOverloads public (List, List, List, net.corda.core.node.services.Vault$StateStatus) - @kotlin.jvm.JvmOverloads public (List, List, List, net.corda.core.node.services.Vault$StateStatus, Set) + public () + public (List) + public (List, List) + public (List, List, List) + public (List, List, List, net.corda.core.node.services.Vault$StateStatus) + public (List, List, List, net.corda.core.node.services.Vault$StateStatus, Set) public (List, List, net.corda.core.node.services.Vault$StateStatus, Set) @org.jetbrains.annotations.Nullable public final List component1() @org.jetbrains.annotations.Nullable public final List component2() @@ -2167,9 +2167,9 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$TimeI public static net.corda.core.node.services.vault.QueryCriteria$TimeInstantType[] values() ## public static final class net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.vault.CriteriaExpression) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, Set) + public (net.corda.core.node.services.vault.CriteriaExpression) + public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus) + public (net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, Set) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression component1() @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component2() @org.jetbrains.annotations.Nullable public final Set component3() @@ -2183,13 +2183,13 @@ public static final class net.corda.core.node.services.vault.QueryCriteria$Vault @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser) ## public static final class net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria - @kotlin.jvm.JvmOverloads public () - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.Vault$StateStatus) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.Vault$StateStatus, Set) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.Vault$StateStatus, Set, List) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.Vault$StateStatus, Set, List, List) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition) - @kotlin.jvm.JvmOverloads public (net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) + public () + public (net.corda.core.node.services.Vault$StateStatus) + public (net.corda.core.node.services.Vault$StateStatus, Set) + public (net.corda.core.node.services.Vault$StateStatus, Set, List) + public (net.corda.core.node.services.Vault$StateStatus, Set, List, List) + public (net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition) + public (net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition) @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component1() @org.jetbrains.annotations.Nullable public final Set component2() @org.jetbrains.annotations.Nullable public final List component3() @@ -2697,11 +2697,11 @@ public final class net.corda.core.transactions.SignedTransaction extends java.la @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction plus(Collection) @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction plus(net.corda.core.crypto.TransactionSignature) @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolveNotaryChangeTransaction(net.corda.core.node.ServiceHub) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub, boolean) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub, boolean) @org.jetbrains.annotations.NotNull public String toString() - @kotlin.jvm.JvmOverloads public final void verify(net.corda.core.node.ServiceHub) - @kotlin.jvm.JvmOverloads public final void verify(net.corda.core.node.ServiceHub, boolean) + public final void verify(net.corda.core.node.ServiceHub) + public final void verify(net.corda.core.node.ServiceHub, boolean) public void verifyRequiredSignatures() @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(java.security.KeyPair, net.corda.core.crypto.SignatureMetadata) @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(net.corda.core.crypto.TransactionSignature) @@ -2728,12 +2728,12 @@ public class net.corda.core.transactions.TransactionBuilder extends java.lang.Ob @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.Command) @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.CommandData, List) @org.jetbrains.annotations.NotNull public net.corda.core.transactions.TransactionBuilder addInputState(net.corda.core.contracts.StateAndRef) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.contracts.AttachmentConstraint) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.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) - @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.contracts.AttachmentConstraint) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer) + @org.jetbrains.annotations.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) + @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState) @org.jetbrains.annotations.NotNull public final List attachments() @org.jetbrains.annotations.NotNull public final List commands() @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder copy() @@ -2810,9 +2810,9 @@ public abstract class net.corda.core.utilities.ByteSequence extends java.lang.Ob public abstract int getOffset() public abstract int getSize() public int hashCode() - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[]) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[], int) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[], int, int) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[]) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[], int) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[], int, int) @org.jetbrains.annotations.NotNull public final java.io.ByteArrayInputStream open() @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence subSequence(int, int) @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence take(int) @@ -2820,9 +2820,9 @@ public abstract class net.corda.core.utilities.ByteSequence extends java.lang.Ob public static final net.corda.core.utilities.ByteSequence$Companion Companion ## public static final class net.corda.core.utilities.ByteSequence$Companion extends java.lang.Object - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[]) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[], int) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[], int, int) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[]) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[], int) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[], int, int) ## public final class net.corda.core.utilities.EncodingUtils extends java.lang.Object @org.jetbrains.annotations.NotNull public static final byte[] base58ToByteArray(String) @@ -3048,14 +3048,14 @@ public interface net.corda.core.utilities.VariablePropertyDelegate extends net.c public abstract void setValue(Object, kotlin.reflect.KProperty, Object) ## public final class net.corda.client.jackson.JacksonSupport extends java.lang.Object - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory, boolean) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory, boolean) - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper() - @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper(com.fasterxml.jackson.core.JsonFactory) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory, boolean) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory, boolean) + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper() + @kotlin.jvm.JvmStatic @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper(com.fasterxml.jackson.core.JsonFactory) @org.jetbrains.annotations.NotNull public final com.fasterxml.jackson.databind.Module getCordaModule() public static final net.corda.client.jackson.JacksonSupport INSTANCE ## @@ -3174,8 +3174,8 @@ public abstract static class net.corda.client.jackson.JacksonSupport$WireTransac @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract List getOutputStates() ## public class net.corda.client.jackson.StringToMethodCallParser extends java.lang.Object - @kotlin.jvm.JvmOverloads public (Class) - @kotlin.jvm.JvmOverloads public (Class, com.fasterxml.jackson.databind.ObjectMapper) + public (Class) + public (Class, com.fasterxml.jackson.databind.ObjectMapper) public (kotlin.reflect.KClass) @org.jetbrains.annotations.NotNull public final Map getAvailableCommands() @org.jetbrains.annotations.NotNull protected final com.google.common.collect.Multimap getMethodMap() @@ -3216,8 +3216,8 @@ public static final class net.corda.client.jackson.StringToMethodCallParser$Unpa @org.jetbrains.annotations.NotNull public final String getMethodName() ## public final class net.corda.client.rpc.CordaRPCClient extends java.lang.Object - @kotlin.jvm.JvmOverloads public (net.corda.core.utilities.NetworkHostAndPort) - @kotlin.jvm.JvmOverloads public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration) + public (net.corda.core.utilities.NetworkHostAndPort) + public (net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration) @org.jetbrains.annotations.NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String) public final Object use(String, String, kotlin.jvm.functions.Function1) ## diff --git a/constants.properties b/constants.properties index 286d4dbc1c..1965e53715 100644 --- a/constants.properties +++ b/constants.properties @@ -1,4 +1,4 @@ -gradlePluginsVersion=1.1.0 +gradlePluginsVersion=1.1.1 kotlinVersion=1.1.50 guavaVersion=21.0 bouncycastleVersion=1.57 diff --git a/gradle-plugins/api-scanner/src/main/java/net/corda/plugins/ScanApi.java b/gradle-plugins/api-scanner/src/main/java/net/corda/plugins/ScanApi.java index 53f7ee9fc0..6e10ec1fe3 100644 --- a/gradle-plugins/api-scanner/src/main/java/net/corda/plugins/ScanApi.java +++ b/gradle-plugins/api-scanner/src/main/java/net/corda/plugins/ScanApi.java @@ -36,6 +36,13 @@ public class ScanApi extends DefaultTask { private static final int FIELD_MASK = Modifier.fieldModifiers(); private static final int VISIBILITY_MASK = Modifier.PUBLIC | Modifier.PROTECTED; + private static final Set ANNOTATION_BLACKLIST; + static { + Set blacklist = new LinkedHashSet<>(); + blacklist.add("kotlin.jvm.JvmOverloads"); + ANNOTATION_BLACKLIST = unmodifiableSet(blacklist); + } + /** * This information has been lifted from: * @link Metadata.kt @@ -251,7 +258,7 @@ public class ScanApi extends DefaultTask { if (isVisible(method.getAccessFlags()) // Only public and protected methods && isValid(method.getAccessFlags(), METHOD_MASK) // Excludes bridge and synthetic methods && !isKotlinInternalScope(method)) { - writer.append(" ").println(method); + writer.append(" ").println(filterAnnotationsFor(method)); } } } @@ -278,6 +285,22 @@ public class ScanApi extends DefaultTask { } return 0; } + + private String filterAnnotationsFor(MethodInfo method) { + return new MethodInfo( + method.getClassName(), + method.getMethodName(), + method.getAccessFlags(), + method.getTypeDescriptor(), + method.getAnnotationNames().stream() + .filter(ScanApi::isVisibleAnnotation) + .collect(toList()) + ).toString(); + } + } + + private static boolean isVisibleAnnotation(String annotationName) { + return !ANNOTATION_BLACKLIST.contains(annotationName); } private static boolean isKotlinInternalScope(MethodInfo method) {