Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.11.12, 2.12.20, 2.13.16, 3.3.5]
scala: [2.12.20, 2.13.16, 3.3.5]
java: [zulu@17, zulu@21]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -100,16 +100,6 @@ jobs:
- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Download target directories (2.11.12)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }}

- name: Inflate target directories (2.11.12)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.20)
uses: actions/download-artifact@v4
with:
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ThisBuild / version := "3.0.0-rc1-SNAPSHOT"
val scala213Version = "2.13.16"
ThisBuild / scalaVersion := scala213Version

ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.20", scala213Version, "3.3.5")
ThisBuild / crossScalaVersions := Seq("2.12.20", scala213Version, "3.3.5")

sonatypeCredentialHost := "s01.oss.sonatype.org"
sonatypeRepository := "s01.oss.sonatype.org"
Expand Down Expand Up @@ -110,14 +110,13 @@ Test / unmanagedSourceDirectories ++= {
libraryDependencies ++= Seq(
"tools.jackson.core" % "jackson-core" % jacksonVersion changing(),
"tools.jackson.core" % "jackson-databind" % jacksonVersion changing(),
"com.thoughtworks.paranamer" % "paranamer" % "2.8",
"tools.jackson.datatype" % "jackson-datatype-joda" % jacksonVersion % Test changing(),
"tools.jackson.datatype" % "jackson-datatype-guava" % jacksonVersion % Test changing(),
"org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" % Test,
"tools.jackson.jaxrs" % "jackson-jaxrs-json-provider" % jacksonVersion % Test changing(),
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1" % Test,
"io.swagger" % "swagger-core" % "1.6.8" % Test,
"org.scalatest" %% "scalatest" % "3.2.18" % Test
"org.scalatest" %% "scalatest" % "3.2.19" % Test
)

// build.properties
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
package tools.jackson.module.scala.introspect

import com.thoughtworks.paranamer.{BytecodeReadingParanamer, CachingParanamer}

import java.lang.reflect.{Constructor, Field, Method, Parameter}
import scala.util.Try

private[introspect] object JavaParameterIntrospector {

private val paranamer = new CachingParanamer(new BytecodeReadingParanamer)

def getCtorParamNames(ctor: Constructor[_]): IndexedSeq[String] = {
Try(paranamer.lookupParameterNames(ctor, false))
.getOrElse(ctor.getParameters.map(_.getName))
.toIndexedSeq
ctor.getParameters.map(_.getName).toIndexedSeq
}

def getMethodParamNames(mtd: Method): IndexedSeq[String] = {
Try(paranamer.lookupParameterNames(mtd, false))
.getOrElse(mtd.getParameters.map(_.getName))
.toIndexedSeq
mtd.getParameters.map(_.getName).toIndexedSeq
}

def getFieldName(field: Field): String = {
Try(paranamer.lookupParameterNames(field, false).headOption.getOrElse(None.orNull))
.getOrElse(field.getName)
}
def getFieldName(field: Field): String = field.getName

def getParameterName(parameter: Parameter): String = parameter.getName
}
Loading