From 7eed258bcbe4e52cacd877820e024ab6fab44c1e Mon Sep 17 00:00:00 2001 From: Shams Asari Date: Wed, 12 Jul 2017 15:46:28 +0100 Subject: [PATCH] Fixed incorrect package declarations in CommonSchema and VaultSchema --- .../kotlin/net/corda/core/schemas/CommonSchema.kt | 10 +++++----- .../src/main/kotlin/net/corda/schemas/CashSchemaV1.kt | 1 - .../kotlin/net/corda/schemas/SampleCashSchemaV1.kt | 1 - .../kotlin/net/corda/schemas/SampleCashSchemaV2.kt | 2 +- .../kotlin/net/corda/schemas/SampleCashSchemaV3.kt | 2 +- .../corda/schemas/SampleCommercialPaperSchemaV2.kt | 4 +--- .../corda/node/services/schema/NodeSchemaService.kt | 4 ++-- .../services/vault/HibernateQueryCriteriaParser.kt | 3 +-- .../node/services/vault/HibernateVaultQueryImpl.kt | 1 - .../net/corda/node/services/vault/NodeVaultService.kt | 11 +++++++++-- .../net/corda/node/services/vault/VaultSchema.kt | 3 ++- .../services/database/HibernateConfigurationTest.kt | 6 +++--- .../net/corda/node/services/vault/VaultQueryTests.kt | 1 - .../corda/testing/schemas/DummyDealStateSchemaV1.kt | 2 +- .../corda/testing/schemas/DummyLinearStateSchemaV2.kt | 2 +- 15 files changed, 27 insertions(+), 26 deletions(-) diff --git a/core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt b/core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt index 1fe600300a..a74001d912 100644 --- a/core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt +++ b/core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt @@ -1,11 +1,11 @@ -package net.corda.node.services.vault.schemas.jpa +package net.corda.core.schemas +import net.corda.core.contracts.ContractState +import net.corda.core.contracts.FungibleAsset +import net.corda.core.contracts.OwnableState import net.corda.core.contracts.UniqueIdentifier import net.corda.core.crypto.toBase58String import net.corda.core.identity.AbstractParty -import net.corda.core.schemas.MappedSchema -import net.corda.core.schemas.PersistentState -import net.corda.core.schemas.StatePersistable import java.util.* import javax.persistence.* @@ -90,7 +90,7 @@ object CommonSchemaV1 : MappedSchema(schemaFamily = CommonSchema.javaClass, vers @Column(name = "party_key", length = 65535) // TODO What is the upper limit on size of CompositeKey?) var key: String ) { - constructor(party: net.corda.core.identity.AbstractParty) + constructor(party: AbstractParty) : this(0, party.nameOrNull()?.toString() ?: party.toString(), party.owningKey.toBase58String()) } } \ No newline at end of file diff --git a/finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt b/finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt index 05bc37c1c3..e2ede7a16e 100644 --- a/finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt +++ b/finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt @@ -2,7 +2,6 @@ package net.corda.schemas import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.PersistentState -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import javax.persistence.* /** diff --git a/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV1.kt b/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV1.kt index 08cda83d92..453dff0203 100644 --- a/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV1.kt +++ b/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV1.kt @@ -2,7 +2,6 @@ package net.corda.schemas import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.PersistentState -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import javax.persistence.* /** diff --git a/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV2.kt b/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV2.kt index a48b664023..83755a4110 100644 --- a/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV2.kt +++ b/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV2.kt @@ -2,7 +2,7 @@ package net.corda.schemas import net.corda.core.identity.AbstractParty import net.corda.core.schemas.MappedSchema -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 +import net.corda.core.schemas.CommonSchemaV1 import javax.persistence.Column import javax.persistence.Entity import javax.persistence.Index diff --git a/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV3.kt b/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV3.kt index 33bd6e2a19..d1d7e46d79 100644 --- a/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV3.kt +++ b/finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV3.kt @@ -3,7 +3,7 @@ package net.corda.schemas import net.corda.core.identity.AbstractParty import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.PersistentState -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 +import net.corda.core.schemas.CommonSchemaV1 import javax.persistence.* /** diff --git a/finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV2.kt b/finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV2.kt index e52df55695..735eda7afc 100644 --- a/finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV2.kt +++ b/finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV2.kt @@ -1,10 +1,8 @@ package net.corda.schemas -import net.corda.core.crypto.toBase58String import net.corda.core.identity.AbstractParty import net.corda.core.schemas.MappedSchema -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 -import java.security.PublicKey +import net.corda.core.schemas.CommonSchemaV1 import java.time.Instant import javax.persistence.Column import javax.persistence.Entity diff --git a/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt b/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt index 03c9f35a7d..1483ac4e9a 100644 --- a/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt +++ b/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt @@ -9,8 +9,8 @@ import net.corda.core.schemas.PersistentState import net.corda.core.schemas.QueryableState import net.corda.core.serialization.SingletonSerializeAsToken import net.corda.node.services.api.SchemaService -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 -import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 +import net.corda.core.schemas.CommonSchemaV1 +import net.corda.node.services.vault.VaultSchemaV1 import net.corda.schemas.CashSchemaV1 /** diff --git a/node/src/main/kotlin/net/corda/node/services/vault/HibernateQueryCriteriaParser.kt b/node/src/main/kotlin/net/corda/node/services/vault/HibernateQueryCriteriaParser.kt index 9cc3fad23d..6ad1d928f5 100644 --- a/node/src/main/kotlin/net/corda/node/services/vault/HibernateQueryCriteriaParser.kt +++ b/node/src/main/kotlin/net/corda/node/services/vault/HibernateQueryCriteriaParser.kt @@ -14,8 +14,7 @@ import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.toHexString import net.corda.core.utilities.loggerFor import net.corda.core.utilities.trace -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 -import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 +import net.corda.core.schemas.CommonSchemaV1 import org.bouncycastle.asn1.x500.X500Name import java.util.* import javax.persistence.Tuple diff --git a/node/src/main/kotlin/net/corda/node/services/vault/HibernateVaultQueryImpl.kt b/node/src/main/kotlin/net/corda/node/services/vault/HibernateVaultQueryImpl.kt index c325c673b4..fe91e3f579 100644 --- a/node/src/main/kotlin/net/corda/node/services/vault/HibernateVaultQueryImpl.kt +++ b/node/src/main/kotlin/net/corda/node/services/vault/HibernateVaultQueryImpl.kt @@ -19,7 +19,6 @@ import net.corda.core.serialization.storageKryo import net.corda.core.utilities.debug import net.corda.core.utilities.loggerFor import net.corda.node.services.database.HibernateConfiguration -import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 import org.jetbrains.exposed.sql.transactions.TransactionManager import rx.subjects.PublishSubject import java.lang.Exception diff --git a/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt b/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt index 597e9f2595..b93d90137c 100644 --- a/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt +++ b/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt @@ -21,8 +21,14 @@ import net.corda.core.identity.AbstractParty import net.corda.core.identity.Party import net.corda.core.messaging.DataFeed import net.corda.core.node.ServiceHub -import net.corda.core.node.services.* -import net.corda.core.serialization.* +import net.corda.core.node.services.StatesNotAvailableException +import net.corda.core.node.services.Vault +import net.corda.core.node.services.VaultService +import net.corda.core.node.services.unconsumedStates +import net.corda.core.serialization.SingletonSerializeAsToken +import net.corda.core.serialization.deserialize +import net.corda.core.serialization.serialize +import net.corda.core.serialization.storageKryo import net.corda.core.tee import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.WireTransaction @@ -33,6 +39,7 @@ import net.corda.core.utilities.trace import net.corda.node.services.database.RequeryConfiguration import net.corda.node.services.statemachine.FlowStateMachineImpl import net.corda.node.services.vault.schemas.requery.* +import net.corda.node.services.vault.schemas.requery.VaultSchema import net.corda.node.utilities.bufferUntilDatabaseCommit import net.corda.node.utilities.wrapWithDatabaseTransaction import rx.Observable diff --git a/node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt b/node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt index 316ea64e03..5ef516971a 100644 --- a/node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt +++ b/node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt @@ -1,8 +1,9 @@ -package net.corda.node.services.vault.schemas.jpa +package net.corda.node.services.vault import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.AbstractParty import net.corda.core.node.services.Vault +import net.corda.core.schemas.CommonSchemaV1 import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.PersistentState import net.corda.core.utilities.OpaqueBytes diff --git a/node/src/test/kotlin/net/corda/node/services/database/HibernateConfigurationTest.kt b/node/src/test/kotlin/net/corda/node/services/database/HibernateConfigurationTest.kt index 48e56ddc55..cc8c9a98b1 100644 --- a/node/src/test/kotlin/net/corda/node/services/database/HibernateConfigurationTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/database/HibernateConfigurationTest.kt @@ -24,8 +24,8 @@ import net.corda.testing.DUMMY_NOTARY import net.corda.node.services.schema.HibernateObserver import net.corda.node.services.schema.NodeSchemaService import net.corda.node.services.vault.NodeVaultService -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 -import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 +import net.corda.core.schemas.CommonSchemaV1 +import net.corda.node.services.vault.VaultSchemaV1 import net.corda.node.utilities.configureDatabase import net.corda.node.utilities.transaction import net.corda.schemas.CashSchemaV1 @@ -649,7 +649,7 @@ class HibernateConfigurationTest { // search predicate val cashStatesSchema = criteriaQuery.from(SampleCashSchemaV3.PersistentCashState::class.java) - val joinCashToParty = cashStatesSchema.join("owner") + val joinCashToParty = cashStatesSchema.join("owner") val queryOwnerKey = BOB_PUBKEY.toBase58String() criteriaQuery.where(criteriaBuilder.equal(joinCashToParty.get("key"), queryOwnerKey)) diff --git a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt index b669b07f6d..587e95081a 100644 --- a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt +++ b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt @@ -19,7 +19,6 @@ import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.toHexString import net.corda.node.services.database.HibernateConfiguration import net.corda.node.services.schema.NodeSchemaService -import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 import net.corda.node.utilities.configureDatabase import net.corda.node.utilities.transaction import net.corda.schemas.CashSchemaV1 diff --git a/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyDealStateSchemaV1.kt b/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyDealStateSchemaV1.kt index b28e8cfe44..c59a09b192 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyDealStateSchemaV1.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyDealStateSchemaV1.kt @@ -1,8 +1,8 @@ package net.corda.testing.schemas import net.corda.core.contracts.UniqueIdentifier +import net.corda.core.schemas.CommonSchemaV1 import net.corda.core.schemas.MappedSchema -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import javax.persistence.Column import javax.persistence.Entity import javax.persistence.Table diff --git a/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyLinearStateSchemaV2.kt b/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyLinearStateSchemaV2.kt index 91f3e49cbf..44b2df08e0 100644 --- a/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyLinearStateSchemaV2.kt +++ b/test-utils/src/main/kotlin/net/corda/testing/schemas/DummyLinearStateSchemaV2.kt @@ -1,8 +1,8 @@ package net.corda.testing.schemas import net.corda.core.contracts.UniqueIdentifier +import net.corda.core.schemas.CommonSchemaV1 import net.corda.core.schemas.MappedSchema -import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import javax.persistence.Column import javax.persistence.Entity import javax.persistence.Table