Skip to content

Commit

Permalink
fixing json querying in web UI
Browse files Browse the repository at this point in the history
  • Loading branch information
ivangiangreco committed Nov 22, 2018
1 parent 12228da commit 9f78e3b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion grpcclient/build.sbt
Expand Up @@ -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" }
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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))
}
}
Expand Down

0 comments on commit 9f78e3b

Please sign in to comment.