Skip to content

Refactor: extract ValueClassExtractor/Wrapper macros to scala-2 sources #612

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
TimvdLippe merged 1 commit into from
Feb 19, 2026
Merged

Refactor: extract ValueClassExtractor/Wrapper macros to scala-2 sources #612

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
31 changes: 31 additions & 0 deletions macro-common/src/main/scala-2/org/mockito/internal/ValueClassExtractorMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package org.mockito.internal

import org.mockito.internal.MacroDebug.debugResult

import scala.reflect.macros.blackbox

/**
* Scala 2 macro implementation for ValueClassExtractor.
*/
trait ValueClassExtractorCompat {
implicit def instance[VC]: ValueClassExtractor[VC] = macro ValueClassExtractorMacro.materialise[VC]
}

object ValueClassExtractorMacro {
def materialise[VC: c.WeakTypeTag](c: blackbox.Context): c.Expr[ValueClassExtractor[VC]] = {
import c.universe.*
val tpe = weakTypeOf[VC]
val typeSymbol = tpe.typeSymbol
val isValueClass = typeSymbol.isClass && typeSymbol.asClass.isDerivedValueClass

val r =
if (isValueClass) {
c.Expr[ValueClassExtractor[VC]](q"new _root_.org.mockito.internal.ReflectionExtractor[$tpe]")

@jozic jozic Feb 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

dropped case V2_12 | V2_13 as those are only versions available, so that was redundant

} else
c.Expr[ValueClassExtractor[VC]](q"new _root_.org.mockito.internal.NormalClassExtractor[$tpe]")

debugResult(c)("mockito-print-extractor")(r.tree)

r
}
}
29 changes: 29 additions & 0 deletions macro-common/src/main/scala-2/org/mockito/internal/ValueClassWrapperMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.mockito.internal

import scala.reflect.macros.blackbox

/**
* Scala 2 macro implementation for ValueClassWrapper.
*/
trait ValueClassWrapperCompat {
implicit def instance[VC]: ValueClassWrapper[VC] = macro ValueClassWrapperMacro.materialise[VC]
}

object ValueClassWrapperMacro {
def materialise[VC: c.WeakTypeTag](c: blackbox.Context): c.Expr[ValueClassWrapper[VC]] = {
import c.universe.*
val tpe = weakTypeOf[VC]
val typeSymbol = tpe.typeSymbol
val isValueClass = typeSymbol.isClass && typeSymbol.asClass.isDerivedValueClass

val r =
if (isValueClass)
c.Expr[ValueClassWrapper[VC]](q"new _root_.org.mockito.internal.ReflectionWrapper[$tpe]")
else
c.Expr[ValueClassWrapper[VC]](q"new _root_.org.mockito.internal.NormalClassWrapper[$tpe]")

MacroDebug.debugResult(c)("mockito-print-wrapper")(r.tree)

r
}
}
29 changes: 1 addition & 28 deletions macro-common/src/main/scala/org/mockito/internal/ValueClassExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package org.mockito.internal

import org.mockito.internal.MacroDebug.debugResult
import org.mockito.internal.ScalaVersion.{ V2_12, V2_13 }

import scala.reflect.macros.blackbox

trait ValueClassExtractor[VC] extends Serializable {
def isValueClass: Boolean = true
def extract(vc: VC): Any
Expand All @@ -27,28 +22,6 @@ class ReflectionExtractor[VC] extends ValueClassExtractor[VC] {
}
}

object ValueClassExtractor {
object ValueClassExtractor extends ValueClassExtractorCompat {
def apply[T: ValueClassExtractor]: ValueClassExtractor[T] = implicitly[ValueClassExtractor[T]]

implicit def instance[VC]: ValueClassExtractor[VC] = macro materialise[VC]

def materialise[VC: c.WeakTypeTag](c: blackbox.Context): c.Expr[ValueClassExtractor[VC]] = {
import c.universe.*
val tpe = weakTypeOf[VC]
val typeSymbol = tpe.typeSymbol
val isValueClass = typeSymbol.isClass && typeSymbol.asClass.isDerivedValueClass

val r =
if (isValueClass) {
ScalaVersion.Current match {
case V2_12 | V2_13 =>
c.Expr[ValueClassExtractor[VC]](q"new _root_.org.mockito.internal.ReflectionExtractor[$tpe]")
}
} else
c.Expr[ValueClassExtractor[VC]](q"new _root_.org.mockito.internal.NormalClassExtractor[$tpe]")

debugResult(c)("mockito-print-extractor")(r.tree)

r
}
}
24 changes: 1 addition & 23 deletions macro-common/src/main/scala/org/mockito/internal/ValueClassWrapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package org.mockito.internal

import org.mockito.internal.MacroDebug.debugResult

import scala.reflect.ClassTag
import scala.reflect.macros.blackbox

trait ValueClassWrapper[VC] extends Serializable {
def isValueClass: Boolean = true
Expand All @@ -27,25 +24,6 @@ class ReflectionWrapper[VC: ClassTag] extends ValueClassWrapper[VC] {
.getOrElse(throw new RuntimeException(s"Can't find a constructor for $clazz that takes a single param"))
}

object ValueClassWrapper {
object ValueClassWrapper extends ValueClassWrapperCompat {
def apply[T: ValueClassWrapper]: ValueClassWrapper[T] = implicitly[ValueClassWrapper[T]]

implicit def instance[VC]: ValueClassWrapper[VC] = macro materialise[VC]

def materialise[VC: c.WeakTypeTag](c: blackbox.Context): c.Expr[ValueClassWrapper[VC]] = {
import c.universe.*
val tpe = weakTypeOf[VC]
val typeSymbol = tpe.typeSymbol
val isValueClass = typeSymbol.isClass && typeSymbol.asClass.isDerivedValueClass

val r =
if (isValueClass)
c.Expr[ValueClassWrapper[VC]](q"new _root_.org.mockito.internal.ReflectionWrapper[$tpe]")
else
c.Expr[ValueClassWrapper[VC]](q"new _root_.org.mockito.internal.NormalClassWrapper[$tpe]")

debugResult(c)("mockito-print-wrapper")(r.tree)

r
}
}