Minor: run IntelliJ 'code cleanup'

core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt

@@ -19,7 +19,7 @@ fun newSecureRandom(): SecureRandom {
 }
 
 // "sealed" here means there can't be any subclasses other than the ones defined here.
-sealed class SecureHash private constructor(bits: ByteArray) : OpaqueBytes(bits) {
+sealed class SecureHash constructor(bits: ByteArray) : OpaqueBytes(bits) {
     class SHA256(bits: ByteArray) : SecureHash(bits) {
         init {
             require(bits.size == 32)

core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt

@@ -326,7 +326,7 @@ fun createKryo(k: Kryo = Kryo()): Kryo {
         // no-arg constructor available.
         instantiatorStrategy = DefaultInstantiatorStrategy(StdInstantiatorStrategy())
 
-        register(Arrays.asList("").javaClass, ArraysAsListSerializer());
+        register(Arrays.asList("").javaClass, ArraysAsListSerializer())
 
         // Because we like to stick a Kryo object in a ThreadLocal to speed things up a bit, we can end up trying to
         // serialise the Kryo object itself when suspending a fiber. That's dumb, useless AND can cause crashes, so

core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.kt

@@ -32,7 +32,7 @@ class Base58Test {
     @Test
     fun testDecode() {
         val testbytes = "Hello World".toByteArray()
-        val actualbytes = Base58.decode("JxF12TrwUP45BMd");
+        val actualbytes = Base58.decode("JxF12TrwUP45BMd")
         assertTrue(String(actualbytes)) { Arrays.equals(testbytes, actualbytes) }
 
         assertTrue("1") { Arrays.equals(ByteArray(1), Base58.decode("1")) }

core/src/test/kotlin/com/r3corda/core/utilities/NonEmptySetTest.kt

@@ -43,8 +43,8 @@ class NonEmptySetTest {
                     .suppressing(CollectionAddAllTester::class.java.getMethod("testAddAll_nullCollectionReference"))
                     // Disable tests that try to remove everything:
                     .suppressing(CollectionRemoveAllTester::class.java.getMethod("testRemoveAll_nullCollectionReferenceNonEmptySubject"))
-                    .suppressing(CollectionClearTester::class.java.getMethods().toList())
-                    .suppressing(CollectionRetainAllTester::class.java.getMethods().toList())
+                    .suppressing(CollectionClearTester::class.java.methods.toList())
+                    .suppressing(CollectionRetainAllTester::class.java.methods.toList())
                     .createTestSuite()
         }
 

docs/build/html/_static/js/theme.js

@@ -69,7 +69,7 @@ function ThemeNav () {
             })
             .on('click', "[data-toggle='rst-current-version']", function() {
                 $("[data-toggle='rst-versions']").toggleClass("shift-up");
-            })
+            });
 
         // Make tables responsive
         $("table.docutils:not(.field-list)")
@@ -139,11 +139,10 @@ function ThemeNav () {
         parent_li.siblings().find('li.current').removeClass('current');
         parent_li.find('> ul li.current').removeClass('current');
         parent_li.toggleClass('current');
-    }
-
-    return nav;
     };
 
+    return nav;
+}
     module.exports.ThemeNav = ThemeNav();
 
 if (typeof(window) != 'undefined') {

docs/build/html/_static/searchtools.js

@@ -191,7 +191,7 @@ var Stemmer = function() {
       w = firstch.toLowerCase() + w.substr(1);
     return w;
   }
-}
+};
 
 
 
@@ -564,7 +564,7 @@ var Search = {
       $u.each(_o, function(o) {
         var _files = o.files;
         if (_files === undefined)
-          return
+          return;
 
         if (_files.length === undefined)
           _files = [_files];
@@ -574,7 +574,7 @@ var Search = {
         for (j = 0; j < _files.length; j++) {
           file = _files[j];
           if (!(file in scoreMap))
-            scoreMap[file] = {}
+            scoreMap[file] = {};
           scoreMap[file][word] = o.score;
         }
       });

node/src/main/kotlin/com/r3corda/node/utilities/ClockUtils.kt

@@ -49,7 +49,7 @@ abstract class MutableClock : Clock() {
      */
     val mutations: Observable<Long> by lazy {
         Observable.create({ subscriber: Subscriber<in Long> ->
-            if (!subscriber.isUnsubscribed()) {
+            if (!subscriber.isUnsubscribed) {
                 mutationObservers.add(subscriber)
                 // This is not very intuitive, but subscribing to a subscriber observes unsubscribes.
                 subscriber.add(Subscriptions.create { mutationObservers.remove(subscriber) })

node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt

@@ -29,7 +29,7 @@ object JsonSupport {
 
     fun createDefaultMapper(identities: IdentityService): ObjectMapper {
         val mapper = ServiceHubObjectMapper(identities)
-        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT)
         mapper.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
         mapper.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
 

node/src/test/kotlin/com/r3corda/node/visualiser/GraphStream.kt

@@ -32,7 +32,7 @@ var Node.styleClass: String
     get() = getAttribute("ui.class")
 
 fun createGraph(name: String, styles: String): SingleGraph {
-    System.setProperty("org.graphstream.ui.renderer", "org.graphstream.ui.j2dviewer.J2DGraphRenderer");
+    System.setProperty("org.graphstream.ui.renderer", "org.graphstream.ui.j2dviewer.J2DGraphRenderer")
     return SingleGraph(name).apply {
         stylesheet = styles
         setAttribute("ui.quality")

src/integration-test/kotlin/com/r3corda/core/testing/TraderDemoTest.kt

@@ -51,7 +51,7 @@ class TraderDemoTest {
                     "--base-directory", baseDirectory
             )
             val proc = spawn("com.r3corda.demos.TraderDemoKt", args, "TradeDemoSeller")
-            assertExitOrKill(proc);
+            assertExitOrKill(proc)
             assertEquals(proc.exitValue(), 0)
         }
 

src/integration-test/kotlin/com/r3corda/core/testing/utilities/JVMSpawner.kt

@@ -12,7 +12,7 @@ fun spawn(className: String, args: List<String>, appName: String): Process {
     val builder = ProcessBuilder(javaArgs + args)
     builder.redirectError(Paths.get("error.$className.log").toFile())
     builder.inheritIO()
-    val process = builder.start();
+    val process = builder.start()
     return process
 }
 

src/main/kotlin/com/r3corda/demos/utilities/HttpUtils.kt

@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit
 private val client by lazy {
     OkHttpClient.Builder()
         .connectTimeout(5, TimeUnit.SECONDS)
-        .readTimeout(60, TimeUnit.SECONDS).build();
+        .readTimeout(60, TimeUnit.SECONDS).build()
 }
 
 fun putJson(url: URL, data: String) : Boolean {
@@ -27,12 +27,12 @@ fun uploadFile(url: URL, file: String) : Boolean {
     val body = MultipartBody.Builder()
             .setType(MultipartBody.FORM)
             .addFormDataPart("rates", "example.rates.txt", RequestBody.create(MediaType.parse("text/plain"), file))
-            .build();
+            .build()
     return makeRequest(Request.Builder().url(url).post(body).build())
 }
 
 private fun makeRequest(request: Request): Boolean {
-    val response = client.newCall(request).execute();
+    val response = client.newCall(request).execute()
 
     if (!response.isSuccessful) {
         println("Could not fulfill HTTP request. Status Code: ${response.code()}. Message: ${response.body()}")