Merge commit '6ae9151012797172b2b2b12de908872ae276674c' into chrisr3-os-4.3-4.4

core/build.gradle

@@ -9,8 +9,6 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Corda core'
 
-evaluationDependsOn(':node:capsule')
-
 // required by DJVM and Avian JVM (for running inside the SGX enclave) which only supports Java 8.
 targetCompatibility = VERSION_1_8
 

detekt-config.yml

@@ -1,27 +1,4 @@
-autoCorrect: true
-failFast: false
-
-test-pattern: # Configure exclusions for test sources
-  active: true
-  patterns: # Test file regexes
-    - '.*/test/.*'
-    - '.*Test.kt'
-    - '.*Spec.kt'
-  exclude-rule-sets:
-    - 'comments'
-  exclude-rules:
-    - 'NamingRules'
-    - 'WildcardImport'
-    - 'MagicNumber'
-    - 'MaxLineLength'
-    - 'LateinitUsage'
-    - 'StringLiteralDuplication'
-    - 'SpreadOperator'
-    - 'TooManyFunctions'
-
 build:
-  warningThreshold: 5
-  failThreshold: 10
   maxIssues: 0
   weights:
   # complexity: 2
@@ -29,99 +6,44 @@ build:
   # style: 1
   # comments: 1
 
-processors:
-  active: true
-  exclude:
-  # - 'FunctionCountProcessor'
-  # - 'PropertyCountProcessor'
-  # - 'ClassCountProcessor'
-  # - 'PackageCountProcessor'
-  # - 'KtFileCountProcessor'
-
-console-reports:
-  active: true
-  exclude:
-  #  - 'ProjectStatisticsReport'
-  #  - 'ComplexityReport'
-  #  - 'NotificationReport'
-  #  - 'FindingsReport'
-  #  - 'BuildFailureReport'
-
-output-reports:
-  active: true
-  exclude:
-  #  - 'HtmlOutputReport'
-  #  - 'PlainOutputReport'
-  #  - 'XmlOutputReport'
-
-comments:
-  active: true
-  CommentOverPrivateFunction:
-    active: false
-  CommentOverPrivateProperty:
-    active: false
-  EndOfSentenceFormat:
-    active: false
-    endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!]$)
-  UndocumentedPublicClass:
-    active: false
-    searchInNestedClass: true
-    searchInInnerClass: true
-    searchInInnerObject: true
-    searchInInnerInterface: true
-  UndocumentedPublicFunction:
-    active: false
-
 complexity:
   active: true
   ComplexCondition:
     active: true
     threshold: 4
-  ComplexInterface:
-    active: false
-    threshold: 10
-    includeStaticDeclarations: false
   ComplexMethod:
     active: true
     threshold: 10
     ignoreSingleWhenExpression: true
-  LabeledExpression:
-    active: false
   LargeClass:
     active: true
-    threshold: 150
+    excludes: "**/test/**,**/integration-test/**,**/integration-test-slow/**,**/*Test.kt,**/*Tests.kt"
+    threshold: 600
   LongMethod:
     active: true
+    excludes: "**/test/**,**/integration-test/**,**/integration-test-slow/**,**/*Test.kt,**/*Tests.kt"
     threshold: 120
   LongParameterList:
     active: true
     threshold: 6
     ignoreDefaultParameters: false
-  MethodOverloading:
-    active: false
-    threshold: 6
   NestedBlockDepth:
     active: true
     threshold: 4
-  StringLiteralDuplication:
-    active: false
-    threshold: 3
-    ignoreAnnotation: true
-    excludeStringsWithLessThan5Characters: true
-    ignoreStringsRegex: '$^'
   TooManyFunctions:
     active: true
-    thresholdInFiles: 11
-    thresholdInClasses: 11
-    thresholdInInterfaces: 11
-    thresholdInObjects: 11
-    thresholdInEnums: 11
+    excludes: "**/test/**,**/integration-test/**,**/integration-test-slow/**,**/*Test.kt,**/*Tests.kt"
+    thresholdInFiles: 15
+    thresholdInClasses: 15
+    thresholdInInterfaces: 15
+    thresholdInObjects: 15
+    thresholdInEnums: 15
 
 empty-blocks:
   active: true
   EmptyCatchBlock:
     active: true
-    allowedExceptionNameRegex: "^(ignore|expected).*"
+    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
   EmptyClassBlock:
     active: true
   EmptyDefaultConstructor:
@@ -134,8 +56,6 @@ empty-blocks:
     active: true
   EmptyForBlock:
     active: true
-  EmptyFunctionBlock:
-    active: false
   EmptyIfBlock:
     active: true
   EmptyInitBlock:
@@ -151,30 +71,6 @@ empty-blocks:
 
 exceptions:
   active: true
-  ExceptionRaisedInUnexpectedLocation:
-    active: false
-    methodNames: 'toString,hashCode,equals,finalize'
-  InstanceOfCheckForException:
-    active: false
-  NotImplementedDeclaration:
-    active: false
-  PrintStackTrace:
-    active: false
-  RethrowCaughtException:
-    active: false
-  ReturnFromFinally:
-    active: false
-  SwallowedException:
-    active: false
-  ThrowingExceptionFromFinally:
-    active: false
-  ThrowingExceptionInMain:
-    active: false
-  ThrowingExceptionsWithoutMessageOrCause:
-    active: false
-    exceptions: 'IllegalArgumentException,IllegalStateException,IOException'
-  ThrowingNewInstanceOfSameException:
-    active: false
   TooGenericExceptionCaught:
     active: true
     exceptionNames:
@@ -202,46 +98,32 @@ naming:
   EnumNaming:
     active: true
     enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
-  ForbiddenClassName:
-    active: false
-    forbiddenName: ''
-  FunctionMaxLength:
-    active: false
-    maximumFunctionNameLength: 30
-  FunctionMinLength:
-    active: false
-    minimumFunctionNameLength: 3
   FunctionNaming:
     active: true
     functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
     excludeClassPattern: '$^'
+    ignoreOverridden: true
   MatchingDeclarationName:
     active: true
-  MemberNameEqualsClassName:
-    active: false
-    ignoreOverriddenFunction: true
   ObjectPropertyNaming:
     active: true
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
     propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
   PackageNaming:
     active: true
-    packagePattern: '^[a-z]+(\.[a-z][a-z0-9]*)*$'
+    packagePattern: '^[a-z]+(\.[a-z][A-Za-z0-9]*)*$'
   TopLevelPropertyNaming:
     active: true
     constantPattern: '[A-Z][_A-Z0-9]*'
-    propertyPattern: '[a-z][A-Za-z\d]*'
-    privatePropertyPattern: '(_)?[a-z][A-Za-z0-9]*'
-  VariableMaxLength:
-    active: false
-    maximumVariableNameLength: 64
-  VariableMinLength:
-    active: false
-    minimumVariableNameLength: 1
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
   VariableNaming:
     active: true
     variablePattern: '[a-z][A-Za-z0-9]*'
     privateVariablePattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
     excludeClassPattern: '$^'
+    ignoreOverridden: true
 
 performance:
   active: true
@@ -256,63 +138,23 @@ potential-bugs:
   active: true
   DuplicateCaseInWhenExpression:
     active: true
-  EqualsAlwaysReturnsTrueOrFalse:
-    active: false
   EqualsWithHashCodeExist:
     active: true
   ExplicitGarbageCollectionCall:
     active: true
-  InvalidRange:
-    active: false
-  IteratorHasNextCallsNextMethod:
-    active: false
-  IteratorNotThrowingNoSuchElementException:
-    active: false
-  LateinitUsage:
-    active: false
-    excludeAnnotatedProperties: ""
-    ignoreOnClassesPattern: ""
-  UnconditionalJumpStatementInLoop:
-    active: false
   UnreachableCode:
     active: true
-  UnsafeCallOnNullableType:
-    active: false
-  UnsafeCast:
-    active: false
-  UselessPostfixExpression:
-    active: false
-  WrongEqualsTypeParameter:
-    active: false
 
 style:
   active: true
-  CollapsibleIfStatements:
-    active: false
-  DataClassContainsFunctions:
-    active: false
-    conversionFunctionPrefix: 'to'
-  EqualsNullCall:
-    active: false
-  ExpressionBodySyntax:
-    active: false
   ForbiddenComment:
     active: true
     values: 'TODO:,FIXME:,STOPSHIP:'
-  ForbiddenImport:
-    active: false
-    imports: ''
-  FunctionOnlyReturningConstant:
-    active: false
-    ignoreOverridableFunction: true
-    excludedFunctions: 'describeContents'
-  LoopWithTooManyJumpStatements:
-    active: false
-    maxJumpCount: 1
   MagicNumber:
     active: true
+    excludes: "**/test/**,**/integration-test/**,**/integration-test-slow/**,**/*Test.kt,**/*Tests.kt"
     ignoreNumbers: '-1,0,1,2'
-    ignoreHashCodeFunction: false
+    ignoreHashCodeFunction: true
     ignorePropertyDeclaration: false
     ignoreConstantDeclaration: true
     ignoreCompanionObjectPropertyDeclaration: true
@@ -322,60 +164,22 @@ style:
   MaxLineLength:
     active: true
     maxLineLength: 140
-    excludePackageStatements: false
-    excludeImportStatements: false
-  MayBeConst:
-    active: false
+    excludePackageStatements: true
+    excludeImportStatements: true
   ModifierOrder:
     active: true
-  NestedClassesVisibility:
-    active: false
-  NewLineAtEndOfFile:
-    active: false
-  NoTabs:
-    active: false
   OptionalAbstractKeyword:
     active: true
-  OptionalUnit:
-    active: false
-  OptionalWhenBraces:
-    active: false
-  ProtectedMemberInFinalClass:
-    active: false
-  RedundantVisibilityModifierRule:
-    active: false
   ReturnCount:
     active: true
     max: 2
     excludedFunctions: "equals"
+    excludeReturnFromLambda: true
   SafeCast:
     active: true
-  SerialVersionUIDInSerializableClass:
-    active: false
-  SpacingBetweenPackageAndImports:
-    active: false
   ThrowsCount:
     active: true
     max: 2
-  TrailingWhitespace:
-    active: false
-  UnnecessaryAbstractClass:
-    active: false
-  UnnecessaryInheritance:
-    active: false
-  UnnecessaryParentheses:
-    active: false
-  UntilInsteadOfRangeTo:
-    active: false
-  UnusedImports:
-    active: false
-  UnusedPrivateMember:
-    active: false
-  UseDataClass:
-    active: false
-    excludeAnnotatedClasses: ""
-  UtilityClassWithPublicConstructor:
-    active: false
   WildcardImport:
     active: true
     excludeImports: 'java.util.*,kotlinx.android.synthetic.*'