Skip to content

Fixed type on provider instance variable #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2016
Merged

Fixed type on provider instance variable #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions phantom-connectors/src/main/scala/com/websudos/phantom/connectors/Keyspace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,9 @@ class KeySpaceDef(
clusterBuilder: ClusterBuilder,
autoinit: Boolean,
keyspaceFn: Option[(Session, KeySpace) => String] = None
) {
) { outer ⇒
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@polymorphic Could you replace this with a standard ASCII based =>? Our static analysis tools are complaining, for consistency purposes we don't use fancier versions of characters just yet.


val provider = new DefaultSessionProvider(KeySpace(name), clusterBuilder, autoinit, keyspaceFn)

val self = this
lazy val provider: SessionProvider = new DefaultSessionProvider(KeySpace(name), clusterBuilder, autoinit, keyspaceFn)

/**
* The Session associated with this keySpace.
Expand Down Expand Up @@ -135,15 +133,15 @@ class KeySpaceDef(
*/
trait Connector extends com.websudos.phantom.connectors.Connector with SessionAugmenterImplicits {

lazy val provider = self.provider
lazy val provider = outer.provider

lazy val keySpace = self.name
lazy val keySpace = outer.name

implicit val space: KeySpace = KeySpace(self.name)
implicit val space: KeySpace = KeySpace(outer.name)

def cassandraVersion: Option[VersionNumber] = self.cassandraVersion
def cassandraVersion: Option[VersionNumber] = outer.cassandraVersion

def cassandraVersions: Set[VersionNumber] = self.cassandraVersions
def cassandraVersions: Set[VersionNumber] = outer.cassandraVersions
}

}
Expand Down
2 changes: 1 addition & 1 deletion project/Publishing.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import scala.util.Properties
object Publishing {

val defaultPublishingSettings = Seq(
version := "1.29.5"
version := "1.29.6-SNAPSHOT"
)

lazy val noPublishSettings = Seq(
Expand Down