ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-11 11:51:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed incorrect package declarations in CommonSchema and VaultSchema

Browse Source
This commit is contained in:
Shams Asari 2017-07-12 15:46:28 +01:00
parent 6e570b4d65
commit 7eed258bcb
15 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt
View File

@ -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.contracts.UniqueIdentifier
import net.corda.core.crypto.toBase58String import net.corda.core.crypto.toBase58String
import net.corda.core.identity.AbstractParty 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 java.util.*
import javax.persistence.* 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?) @Column(name = "party_key", length = 65535) // TODO What is the upper limit on size of CompositeKey?)
var key: String var key: String
) { ) {
constructor(party: net.corda.core.identity.AbstractParty) constructor(party: AbstractParty)
: this(0, party.nameOrNull()?.toString() ?: party.toString(), party.owningKey.toBase58String()) : this(0, party.nameOrNull()?.toString() ?: party.toString(), party.owningKey.toBase58String())
} }
} }

1
finance/src/main/kotlin/net/corda/schemas/CashSchemaV1.kt
View File

@ -2,7 +2,6 @@ package net.corda.schemas
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1
import javax.persistence.* import javax.persistence.*
/** /**

1
finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV1.kt
View File

@ -2,7 +2,6 @@ package net.corda.schemas
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1
import javax.persistence.* import javax.persistence.*
/** /**

2
finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV2.kt
View File

@ -2,7 +2,7 @@ package net.corda.schemas
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema 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.Column
import javax.persistence.Entity import javax.persistence.Entity
import javax.persistence.Index import javax.persistence.Index

2
finance/src/test/kotlin/net/corda/schemas/SampleCashSchemaV3.kt
View File

@ -3,7 +3,7 @@ package net.corda.schemas
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import javax.persistence.* import javax.persistence.*
/** /**

4
finance/src/test/kotlin/net/corda/schemas/SampleCommercialPaperSchemaV2.kt
View File

@ -1,10 +1,8 @@
package net.corda.schemas package net.corda.schemas
import net.corda.core.crypto.toBase58String
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import java.security.PublicKey
import java.time.Instant import java.time.Instant
import javax.persistence.Column import javax.persistence.Column
import javax.persistence.Entity import javax.persistence.Entity

4
node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
View File

@ -9,8 +9,8 @@ import net.corda.core.schemas.PersistentState
import net.corda.core.schemas.QueryableState import net.corda.core.schemas.QueryableState
import net.corda.core.serialization.SingletonSerializeAsToken import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.node.services.api.SchemaService import net.corda.node.services.api.SchemaService
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 import net.corda.node.services.vault.VaultSchemaV1
import net.corda.schemas.CashSchemaV1 import net.corda.schemas.CashSchemaV1
/** /**

3
node/src/main/kotlin/net/corda/node/services/vault/HibernateQueryCriteriaParser.kt
View File

@ -14,8 +14,7 @@ import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.toHexString import net.corda.core.utilities.toHexString
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor
import net.corda.core.utilities.trace import net.corda.core.utilities.trace
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1
import org.bouncycastle.asn1.x500.X500Name import org.bouncycastle.asn1.x500.X500Name
import java.util.* import java.util.*
import javax.persistence.Tuple import javax.persistence.Tuple

1
node/src/main/kotlin/net/corda/node/services/vault/HibernateVaultQueryImpl.kt
View File

@ -19,7 +19,6 @@ import net.corda.core.serialization.storageKryo
import net.corda.core.utilities.debug import net.corda.core.utilities.debug
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor
import net.corda.node.services.database.HibernateConfiguration import net.corda.node.services.database.HibernateConfiguration
import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1
import org.jetbrains.exposed.sql.transactions.TransactionManager import org.jetbrains.exposed.sql.transactions.TransactionManager
import rx.subjects.PublishSubject import rx.subjects.PublishSubject
import java.lang.Exception import java.lang.Exception

11
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
View File

@ -21,8 +21,14 @@ import net.corda.core.identity.AbstractParty
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.messaging.DataFeed import net.corda.core.messaging.DataFeed
import net.corda.core.node.ServiceHub import net.corda.core.node.ServiceHub
import net.corda.core.node.services.* import net.corda.core.node.services.StatesNotAvailableException
import net.corda.core.serialization.* 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.tee
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.transactions.WireTransaction 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.database.RequeryConfiguration
import net.corda.node.services.statemachine.FlowStateMachineImpl import net.corda.node.services.statemachine.FlowStateMachineImpl
import net.corda.node.services.vault.schemas.requery.* 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.bufferUntilDatabaseCommit
import net.corda.node.utilities.wrapWithDatabaseTransaction import net.corda.node.utilities.wrapWithDatabaseTransaction
import rx.Observable import rx.Observable

3
node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt
View File

@ -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.contracts.UniqueIdentifier
import net.corda.core.identity.AbstractParty import net.corda.core.identity.AbstractParty
import net.corda.core.node.services.Vault import net.corda.core.node.services.Vault
import net.corda.core.schemas.CommonSchemaV1
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.core.schemas.PersistentState import net.corda.core.schemas.PersistentState
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes

6
node/src/test/kotlin/net/corda/node/services/database/HibernateConfigurationTest.kt
View File

@ -24,8 +24,8 @@ import net.corda.testing.DUMMY_NOTARY
import net.corda.node.services.schema.HibernateObserver import net.corda.node.services.schema.HibernateObserver
import net.corda.node.services.schema.NodeSchemaService import net.corda.node.services.schema.NodeSchemaService
import net.corda.node.services.vault.NodeVaultService import net.corda.node.services.vault.NodeVaultService
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1 import net.corda.core.schemas.CommonSchemaV1
import net.corda.node.services.vault.schemas.jpa.VaultSchemaV1 import net.corda.node.services.vault.VaultSchemaV1
import net.corda.node.utilities.configureDatabase import net.corda.node.utilities.configureDatabase
import net.corda.node.utilities.transaction import net.corda.node.utilities.transaction
import net.corda.schemas.CashSchemaV1 import net.corda.schemas.CashSchemaV1
@ -649,7 +649,7 @@ class HibernateConfigurationTest {
// search predicate // search predicate
val cashStatesSchema = criteriaQuery.from(SampleCashSchemaV3.PersistentCashState::class.java) val cashStatesSchema = criteriaQuery.from(SampleCashSchemaV3.PersistentCashState::class.java)
val joinCashToParty = cashStatesSchema.join<SampleCashSchemaV3.PersistentCashState,CommonSchemaV1.Party>("owner") val joinCashToParty = cashStatesSchema.join<SampleCashSchemaV3.PersistentCashState, CommonSchemaV1.Party>("owner")
val queryOwnerKey = BOB_PUBKEY.toBase58String() val queryOwnerKey = BOB_PUBKEY.toBase58String()
criteriaQuery.where(criteriaBuilder.equal(joinCashToParty.get<CommonSchemaV1.Party>("key"), queryOwnerKey)) criteriaQuery.where(criteriaBuilder.equal(joinCashToParty.get<CommonSchemaV1.Party>("key"), queryOwnerKey))

1
node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
View File

@ -19,7 +19,6 @@ import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.toHexString import net.corda.core.utilities.toHexString
import net.corda.node.services.database.HibernateConfiguration import net.corda.node.services.database.HibernateConfiguration
import net.corda.node.services.schema.NodeSchemaService 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.configureDatabase
import net.corda.node.utilities.transaction import net.corda.node.utilities.transaction
import net.corda.schemas.CashSchemaV1 import net.corda.schemas.CashSchemaV1

2
test-utils/src/main/kotlin/net/corda/testing/schemas/DummyDealStateSchemaV1.kt
View File

@ -1,8 +1,8 @@
package net.corda.testing.schemas package net.corda.testing.schemas
import net.corda.core.contracts.UniqueIdentifier import net.corda.core.contracts.UniqueIdentifier
import net.corda.core.schemas.CommonSchemaV1
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1
import javax.persistence.Column import javax.persistence.Column
import javax.persistence.Entity import javax.persistence.Entity
import javax.persistence.Table import javax.persistence.Table

2
test-utils/src/main/kotlin/net/corda/testing/schemas/DummyLinearStateSchemaV2.kt
View File

@ -1,8 +1,8 @@
package net.corda.testing.schemas package net.corda.testing.schemas
import net.corda.core.contracts.UniqueIdentifier import net.corda.core.contracts.UniqueIdentifier
import net.corda.core.schemas.CommonSchemaV1
import net.corda.core.schemas.MappedSchema import net.corda.core.schemas.MappedSchema
import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1
import javax.persistence.Column import javax.persistence.Column
import javax.persistence.Entity import javax.persistence.Entity
import javax.persistence.Table import javax.persistence.Table