Skip to content
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

Jump to bottom

[WIP] remove json4s from linkis #4368

Merged
merged 11 commits into from
Apr 13, 2023
Merged

[WIP] remove json4s from linkis #4368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aebe8b3
remove json4s from linkis
GuoPhilipse Mar 13, 2023
09ee6e4
use jsonpath to read json value
tclxgf13871 Mar 17, 2023
ef222cf
fix unknown dependency
tclxgf13871 Mar 17, 2023
9e32859
improve jsonpath usage
GuoPhilipse Mar 18, 2023
b35f4df
optimize code
GuoPhilipse Mar 20, 2023
ee99897
trigger rebuild
GuoPhilipse Mar 20, 2023
cbb22f7
trigger rebuild
GuoPhilipse Mar 21, 2023
b62d481
optimize code
GuoPhilipse Mar 22, 2023
28817f3
optimize code
GuoPhilipse Mar 23, 2023
4211d25
fix circular reference object
tclxgf13871 Apr 4, 2023
5774be3
remove unused jackson
GuoPhilipse Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 0 additions & 25 deletions linkis-commons/linkis-httpclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +42,6 @@
<artifactId>httpmime</artifactId>
<version>${httpmime.version}</version>
</dependency>

<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
<version>${json4s.version}</version>
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>

<build>
Expand Down
16 changes: 0 additions & 16 deletions linkis-commons/linkis-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,22 +399,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
<version>${json4s.version}</version>
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
Expand Down
50 changes: 0 additions & 50 deletions .../linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/JavaCollectionSerializer.scala
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCFormats.scala
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/RPCProduct.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.linkis.rpc.transform

import org.apache.linkis.DataWorkCloudApplication
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.protocol.message.RequestProtocol
import org.apache.linkis.rpc.errorcode.LinkisRpcErrorCodeSummary.TRANSMITTED_BEAN_IS_NULL
Expand All @@ -28,13 +27,6 @@ import org.apache.linkis.server.{EXCEPTION_MSG, Message}

import org.apache.commons.lang3.ClassUtils

import java.lang.reflect.{ParameterizedType, Type}
import java.util

import scala.collection.JavaConverters.mapAsScalaMapConverter

import org.json4s.{DefaultFormats, Formats, Serializer}

private[linkis] trait RPCProduct {

def toMessage(t: Any): Message
Expand All @@ -52,21 +44,10 @@ private[linkis] object RPCProduct extends Logging {
private[rpc] val CLASS_VALUE = "rpc_object_class"
private[rpc] val OBJECT_VALUE = "rpc_object_value"

private[rpc] implicit var formats: Formats =
DefaultFormats + JavaCollectionSerializer + JavaMapSerializer

private var serializerClasses: List[Class[_]] = List.empty

private val rpcProduct: RPCProduct = new RPCProduct {

private val rpcFormats =
DataWorkCloudApplication.getApplicationContext.getBeansOfType(classOf[RPCFormats])

if (rpcFormats != null && !rpcFormats.isEmpty) {
val serializers = rpcFormats.asScala.map(_._2.getSerializers).toArray.flatMap(_.iterator)
setFormats(serializers)
}

override def toMessage(t: Any): Message = {
if (t == null) {
throw new DWCURIException(
Expand Down Expand Up @@ -106,29 +87,6 @@ private[linkis] object RPCProduct extends Logging {

}

private[rpc] def setFormats(serializer: Array[Serializer[_]]): Unit = {
this.formats = (serializer :+ JavaCollectionSerializer :+ JavaMapSerializer).foldLeft(
DefaultFormats.asInstanceOf[Formats]
)(_ + _)
serializerClasses = formats.customSerializers
.map(s => getActualTypeClass(s.getClass.getGenericSuperclass))
.filter(_ != null) ++: List(classOf[util.List[_]], classOf[util.Map[_, _]])
logger.info(
"RPC Serializers: " + this.formats.customSerializers
.map(_.getClass.getSimpleName) + ", serializerClasses: " +
"" + serializerClasses
)
}

private def getActualTypeClass(classType: Type): Class[_] = classType match {
case p: ParameterizedType =>
val params = p.getActualTypeArguments
if (params == null || params.isEmpty) null
else getActualTypeClass(params(0))
case c: Class[_] => c
case _ => null
}

private[rpc] def isRequestProtocol(obj: Any): Boolean = obj.isInstanceOf[RequestProtocol]

private[rpc] def isScalaClass(obj: Any): Boolean =
Expand Down
93 changes: 0 additions & 93 deletions linkis-commons/linkis-rpc/src/test/scala/org/apache/linkis/rpc/RPCFormatsTest.scala
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions linkis-commons/linkis-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,6 @@
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>

<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
<version>${json4s.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
Expand Down
8 changes: 2 additions & 6 deletions ...commons/linkis-storage/src/main/scala/org/apache/linkis/storage/domain/MethodEntity.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ package org.apache.linkis.storage.domain
import java.lang.reflect.Type

import com.google.gson.GsonBuilder
import org.json4s.DefaultFormats
import org.json4s.jackson.Serialization.write

/**
* @param id
Expand Down Expand Up @@ -58,23 +56,21 @@ case class MethodEntity(

object MethodEntitySerializer {

implicit val formats = DefaultFormats
import org.json4s.jackson.JsonMethods._
val gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").create

/**
* Serialized to code as a MethodEntity object 序列化为code为MethodEntity对象
* @param code
* @return
*/
def deserializer(code: String): MethodEntity = parse(code).extract[MethodEntity]
def deserializer(code: String): MethodEntity = gson.fromJson(code, classOf[MethodEntity])

/**
* Serialize MethodEntity to code 序列化MethodEntity为code
* @param methodEntity
* @return
*/
def serializer(methodEntity: MethodEntity): String = write(methodEntity)
def serializer(methodEntity: MethodEntity): String = gson.toJson(methodEntity)

/**
* Serialize a java object as a string 序列化java对象为字符串
Expand Down
4 changes: 0 additions & 4 deletions linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.json4s</groupId>
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down