ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Eliminate warnings in Java and Kotlin code

Browse Source 
Functionally this change is a NOP
This commit is contained in:
Viktor Kolomeyko 2017-08-18 16:29:56 +01:00 committed by Viktor Kolomeyko
parent 82173bc1a7
commit 06ad2ddd45
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
finance/src/main/java/net/corda/contracts/JavaCommercialPaper.java
View File

@ -81,7 +81,7 @@ public class JavaCommercialPaper implements Contract {
return owner;
}
public Amount<Issued<Currency>> getFaceValue() {
Amount<Issued<Currency>> getFaceValue() {
return faceValue;
}
@ -119,7 +119,7 @@ public class JavaCommercialPaper implements Contract {
return result;
}
public State withoutOwner() {
State withoutOwner() {
return new State(issuance, new AnonymousParty(NullPublicKey.INSTANCE), faceValue, maturityDate);
}
@ -171,9 +171,7 @@ public class JavaCommercialPaper implements Contract {
// There are two possible things that can be done with this CP. The first is trading it. The second is redeeming
// it for cash on or after the maturity date.
final List<AuthenticatedObject<CommandData>> commands = tx.getCommands().stream().filter(
it -> {
return it.getValue() instanceof Commands;
}
it -> it.getValue() instanceof Commands
).collect(Collectors.toList());
final AuthenticatedObject<CommandData> command = Iterables.getOnlyElement(commands);
final TimeWindow timeWindow = tx.getTimeWindow();
@ -247,7 +245,7 @@ public class JavaCommercialPaper implements Contract {
@Suspendable
public void generateRedeem(TransactionBuilder tx, StateAndRef<State> paper, ServiceHub services) throws InsufficientBalanceException {
Cash.generateSpend(services, tx, Structures.withoutIssuer(paper.getState().getData().getFaceValue()), paper.getState().getData().getOwner(), Collections.EMPTY_SET);
Cash.generateSpend(services, tx, Structures.withoutIssuer(paper.getState().getData().getFaceValue()), paper.getState().getData().getOwner(), Collections.emptySet());
tx.addInputState(paper);
tx.addCommand(new Command<>(new Commands.Redeem(), paper.getState().getData().getOwner().getOwningKey()));
}

23
node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt
View File

@ -14,8 +14,6 @@ import net.corda.nodeapi.RPCException
import net.corda.nodeapi.internal.serialization.AbstractAMQPSerializationScheme
import net.corda.nodeapi.internal.serialization.EmptyWhitelist
import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory.Companion.isPrimitive
import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
import net.corda.nodeapi.internal.serialization.AMQPServerSerializationScheme
import net.corda.nodeapi.internal.serialization.AllWhitelist
import net.corda.testing.MEGA_CORP
import net.corda.testing.MEGA_CORP_PUBKEY
@ -96,35 +94,35 @@ class SerializationOutputTests {
data class SortedSetWrapper(val set: SortedSet<Int>)
open class InheritedGeneric<X>(val foo: X)
open class InheritedGeneric<out X>(val foo: X)
data class ExtendsGeneric(val bar: Int, val pub: String) : InheritedGeneric<String>(pub)
interface GenericInterface<X> {
interface GenericInterface<out X> {
val pub: X
}
data class ImplementsGenericString(val bar: Int, override val pub: String) : GenericInterface<String>
data class ImplementsGenericX<Y>(val bar: Int, override val pub: Y) : GenericInterface<Y>
data class ImplementsGenericX<out Y>(val bar: Int, override val pub: Y) : GenericInterface<Y>
abstract class AbstractGenericX<Z> : GenericInterface<Z>
abstract class AbstractGenericX<out Z> : GenericInterface<Z>
data class InheritGenericX<A>(val duke: Double, override val pub: A) : AbstractGenericX<A>()
data class InheritGenericX<out A>(val duke: Double, override val pub: A) : AbstractGenericX<A>()
data class CapturesGenericX(val foo: GenericInterface<String>)
object KotlinObject
class Mismatch(fred: Int) {
val ginger: Int = fred
private val ginger: Int = fred
override fun equals(other: Any?): Boolean = (other as? Mismatch)?.ginger == ginger
override fun hashCode(): Int = ginger
}
class MismatchType(fred: Long) {
val ginger: Int = fred.toInt()
private val ginger: Int = fred.toInt()
override fun equals(other: Any?): Boolean = (other as? MismatchType)?.ginger == ginger
override fun hashCode(): Int = ginger
@ -246,7 +244,7 @@ class SerializationOutputTests {
@Test(expected = IllegalArgumentException::class)
fun `test dislike of HashMap`() {
val obj = WrapHashMap(HashMap<String, String>())
val obj = WrapHashMap(HashMap())
serdes(obj)
}
@ -358,7 +356,7 @@ class SerializationOutputTests {
@Test
fun `test TreeMap property`() {
val obj = TreeMapWrapper(TreeMap<Int, Foo>())
val obj = TreeMapWrapper(TreeMap())
obj.tree[456] = Foo("Fred", 123)
serdes(obj)
}
@ -438,11 +436,10 @@ class SerializationOutputTests {
}
}
fun assertSerializedThrowableEquivalent(t: Throwable, desThrowable: Throwable) {
private fun assertSerializedThrowableEquivalent(t: Throwable, desThrowable: Throwable) {
assertTrue(desThrowable is CordaRuntimeException) // Since we don't handle the other case(s) yet
if (desThrowable is CordaRuntimeException) {
assertEquals("${t.javaClass.name}: ${t.message}", desThrowable.message)
assertTrue(desThrowable is CordaRuntimeException)
assertTrue(Objects.deepEquals(t.stackTrace, desThrowable.stackTrace))
assertEquals(t.suppressed.size, desThrowable.suppressed.size)
t.suppressed.zip(desThrowable.suppressed).forEach { (before, after) -> assertSerializedThrowableEquivalent(before, after) }