Skip to content

Commit

Permalink
spline #1135 Add "--add-opens" to scalatest plugin arg line, upgrade …
Browse files Browse the repository at this point in the history
…RapidGen, fix some minor deprecations.
  • Loading branch information
wajda committed Nov 16, 2022
1 parent f436773 commit 03df1f6
Show file tree
Hide file tree
Showing 6 changed files with 6,140 additions and 3,127 deletions.
5 changes: 5 additions & 0 deletions build/parent-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED
</argLine>
</configuration>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ExecutionEventsController @Autowired()(
@ApiParam(value = "Sort order", example = "asc")
@RequestParam(value = "sortOrder", defaultValue = "desc") sortOrder: String,

@ApiParam(value = "Labels in format <name>:<value1>,<value2>,...")
@ApiParam(value = "Labels in format &lt;name&gt;:&lt;value1&gt;,&lt;value2&gt;,...")
@RequestParam(value = "label", required = false) labelQueries: Array[String],

@ApiParam(value = "Text to filter the results")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.arangodb.internal.velocystream.internal.VstConnection
import org.apache.commons.lang3.StringUtils
import org.apache.http.auth.UsernamePasswordCredentials
import za.co.absa.commons.reflect.ReflectionUtils
import za.co.absa.commons.reflect.ReflectionUtils.extractFieldValue
import za.co.absa.spline.common.rest.{HttpStatusException, RESTClient, RESTClientApacheHttpImpl}

import java.net.URI
Expand All @@ -42,14 +41,14 @@ class InternalArangoDatabaseOps(db: ArangoDatabaseAsync)(implicit ec: ExecutionC
val vstComm = {
val asyncExecutable = db.asInstanceOf[ArangoExecuteable[ArangoExecutorAsync]]
val executor = asyncExecutable.executor
ReflectionUtils.extractFieldValue[ArangoExecutorAsync, VstCommunication[_, VstConnection[_]]](executor, "communication")
ReflectionUtils.extractValue[ArangoExecutorAsync, VstCommunication[_, VstConnection[_]]](executor, "communication")
}
val connection = vstComm.connect(AccessType.WRITE)

val maybeSslContext = Option(extractFieldValue[VstConnection[_], SSLContext](connection, "sslContext"))
val maybeSslContext = Option(ReflectionUtils.extractValue[VstConnection[_], SSLContext](connection, "sslContext"))
val scheme = if (maybeSslContext.isDefined) "https" else "http"

val hostDescription = extractFieldValue[VstConnection[_], HostDescription](connection, "host")
val hostDescription = ReflectionUtils.extractValue[VstConnection[_], HostDescription](connection, "host")
val host = hostDescription.getHost
val port = hostDescription.getPort
val database = db.dbName
Expand Down
Loading

0 comments on commit 03df1f6

Please sign in to comment.