Skip to content

Expose underlying Java members #8

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose underlying Java members #8

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
33 changes: 23 additions & 10 deletions src/main/scala/org/scalastuff/scalabeans/PropertyDescriptor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@ trait ConstructorParameter extends DeserializablePropertyDescriptor {
*/
def defaultValue: Option[() => Any]

def index: Int
}

trait FieldPropertyDescriptor extends PropertyDescriptor {
def field: Field
}

trait GetterPropertyDescriptor extends PropertyDescriptor {
def getter: Method
}

trait GetterSetterPropertyDescriptor extends GetterPropertyDescriptor {
def setter: Method
}

object PropertyDescriptor {
Expand Down Expand Up @@ -144,25 +157,25 @@ object PropertyDescriptor {

def getterPropertyDescriptor(getter: Method, typeHint: Option[ScalaType], ctorParameterIndex: Int) = {
if (ctorParameterIndex < 0) {
new GetterPropertyDescriptor(getter, typeHint)
new GetterPropertyDescriptorImpl(getter, typeHint)
} else {
new GetterPropertyDescriptor(getter, typeHint) with ConstructorParameterImpl
new GetterPropertyDescriptorImpl(getter, typeHint) with ConstructorParameterImpl
}
}

def getterSetterPropertyDescriptor(getter: Method, setter: Method, typeHint: Option[ScalaType], ctorParameterIndex: Int) = {
if (ctorParameterIndex < 0) {
new GetterSetterPropertyDescriptor(getter, setter, typeHint) { def index = _index }
new GetterSetterPropertyDescriptorImpl(getter, setter, typeHint) { def index = _index }
} else {
new GetterSetterPropertyDescriptor(getter, setter, typeHint) with ConstructorParameterImpl
new GetterSetterPropertyDescriptorImpl(getter, setter, typeHint) with ConstructorParameterImpl
}
}

//
// Field Property Descriptors
//

abstract class FieldPropertyDescriptor(field: Field, typeHint: Option[ScalaType] = None) extends PropertyDescriptorImpl {
abstract class FieldPropertyDescriptorImpl(val field: Field, typeHint: Option[ScalaType] = None) extends PropertyDescriptorImpl with FieldPropertyDescriptor {
field.setAccessible(true)

val name = field.getName
Expand All @@ -173,10 +186,10 @@ object PropertyDescriptor {
}

class ImmutableFieldPropertyDescriptor(field: Field, typeHint: Option[ScalaType])
extends FieldPropertyDescriptor(field, typeHint) with ImmutablePropertyDescriptor
extends FieldPropertyDescriptorImpl(field, typeHint) with ImmutablePropertyDescriptor

abstract class MutableFieldPropertyDescriptor(field: Field, typeHint: Option[ScalaType])
extends FieldPropertyDescriptor(field, typeHint) with MutablePropertyDescriptor {
extends FieldPropertyDescriptorImpl(field, typeHint) with MutablePropertyDescriptor {

def set(obj: AnyRef, value: Any) = field.set(obj, value)
}
Expand All @@ -185,7 +198,7 @@ object PropertyDescriptor {
// Method Property Descriptors
//

abstract class MethodPropertyDescriptor(getter: Method, typeHint: Option[ScalaType] = None) extends PropertyDescriptorImpl {
abstract class MethodPropertyDescriptor(val getter: Method, typeHint: Option[ScalaType] = None) extends PropertyDescriptorImpl with GetterPropertyDescriptor {
getter.setAccessible(true)

val name = getter.getName
Expand All @@ -196,9 +209,9 @@ object PropertyDescriptor {

}

class GetterPropertyDescriptor(getter: Method, typeHint: Option[ScalaType]) extends MethodPropertyDescriptor(getter, typeHint) with ImmutablePropertyDescriptor
class GetterPropertyDescriptorImpl(getter: Method, typeHint: Option[ScalaType]) extends MethodPropertyDescriptor(getter, typeHint) with ImmutablePropertyDescriptor

abstract class GetterSetterPropertyDescriptor(getter: Method, setter: Method, typeHint: Option[ScalaType]) extends MethodPropertyDescriptor(getter, typeHint) with MutablePropertyDescriptor {
abstract class GetterSetterPropertyDescriptorImpl(getter: Method, val setter: Method, typeHint: Option[ScalaType]) extends MethodPropertyDescriptor(getter, typeHint) with MutablePropertyDescriptor with GetterSetterPropertyDescriptor {
setter.setAccessible(true)

def set(obj: AnyRef, value: Any): Unit = setter.invoke(obj, value.asInstanceOf[AnyRef])
Expand Down