Skip to content
Permalink
Browse files

fixing json querying in web UI

  • Loading branch information...
ivangiangreco committed Nov 22, 2018
1 parent 12228da commit 9f78e3bb70dc24df3c40fbf78e95041557f16a44
@@ -7,7 +7,7 @@ libraryDependencies ++= Seq(
"io.grpc" % "grpc-stub" % "1.12.0",
"org.apache.logging.log4j" % "log4j-api" % "2.11.0",
"org.apache.logging.log4j" % "log4j-core" % "2.11.0",
"com.trueaccord.scalapb" %% "scalapb-json4s" % "0.3.2"
"com.thesamet.scalapb" %% "scalapb-json4s" % "0.7.0"
)

unmanagedBase <<= baseDirectory { base => base / ".." / "lib" }
@@ -2,7 +2,7 @@ package org.vitrivr.adampro.communication

import java.util.concurrent.TimeUnit

import com.trueaccord.scalapb.json.JsonFormat
import scalapb.json4s.JsonFormat
import io.grpc.internal.DnsNameResolverProvider
import io.grpc.netty.NettyChannelBuilder
import io.grpc.stub.StreamObserver
@@ -349,6 +349,7 @@ class AdamController(rpcClient: RPCClient) extends Controller with Logging {
if (res.isSuccess) {
response.ok.json(new SearchCompoundResponse(200, new SearchResponse(res.get)))
} else {
log.error(res.failed.get.getMessage)
response.ok.json(GeneralResponse(500, res.failed.get.getMessage))
}
}

0 comments on commit 9f78e3b

Please sign in to comment.
You can’t perform that action at this time.