This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 87d1cb016 linkis-storage module replace cglib with Use spring inline
cglib (#2116)
87d1cb016 is described below
commit 87d1cb0168e8e7c106656b6747f496a12c12d8fe
Author: Jack Xu <[email protected]>
AuthorDate: Mon May 16 21:49:26 2022 +0800
linkis-storage module replace cglib with Use spring inline cglib (#2116)
* feat(linkis-storage): replace cglib with spring's inline cglib
---
linkis-commons/linkis-storage/pom.xml | 4 ++--
.../storage/factory/impl/BuildHDFSFileSystem.java | 2 +-
.../storage/factory/impl/BuildLocalFileSystem.java | 2 +-
.../storage/io/IOMethodInterceptorCreator.scala | 3 ++-
.../entity/persistence/PersistenceLabel.java | 2 ++
.../io/iteraceptor/IOMethodInterceptor.scala | 22 +++++++++-------------
.../IOMethodInterceptorCreatorImpl.scala | 6 +++---
7 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/linkis-commons/linkis-storage/pom.xml
b/linkis-commons/linkis-storage/pom.xml
index 4c095c2b8..7d7dd5e9d 100644
--- a/linkis-commons/linkis-storage/pom.xml
+++ b/linkis-commons/linkis-storage/pom.xml
@@ -71,8 +71,8 @@
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</dependency>
<dependency>
diff --git
a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildHDFSFileSystem.java
b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildHDFSFileSystem.java
index 6a107dfea..693b12940 100644
---
a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildHDFSFileSystem.java
+++
b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildHDFSFileSystem.java
@@ -24,7 +24,7 @@ import org.apache.linkis.storage.fs.impl.HDFSFileSystem;
import org.apache.linkis.storage.io.IOMethodInterceptorCreator$;
import org.apache.linkis.storage.utils.StorageUtils;
-import net.sf.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Enhancer;
public class BuildHDFSFileSystem implements BuildFactory {
diff --git
a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildLocalFileSystem.java
b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildLocalFileSystem.java
index 4a1e837ae..569ff7bef 100644
---
a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildLocalFileSystem.java
+++
b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/factory/impl/BuildLocalFileSystem.java
@@ -25,7 +25,7 @@ import
org.apache.linkis.storage.io.IOMethodInterceptorCreator$;
import org.apache.linkis.storage.utils.StorageConfiguration;
import org.apache.linkis.storage.utils.StorageUtils;
-import net.sf.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Enhancer;
public class BuildLocalFileSystem implements BuildFactory {
diff --git
a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/io/IOMethodInterceptorCreator.scala
b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/io/IOMethodInterceptorCreator.scala
index 889f44431..251ad9424 100644
---
a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/io/IOMethodInterceptorCreator.scala
+++
b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/io/IOMethodInterceptorCreator.scala
@@ -18,7 +18,8 @@
package org.apache.linkis.storage.io
import org.apache.linkis.storage.exception.StorageErrorException
-import net.sf.cglib.proxy.MethodInterceptor
+import org.springframework.cglib.proxy.MethodInterceptor
+
trait IOMethodInterceptorCreator {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
b/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
index 5844cadeb..f0602aa64 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabel.java
@@ -83,10 +83,12 @@ public class PersistenceLabel extends GenericLabel {
this.creator = creator;
}
+ @Override
public void setStringValue(String stringValue) {
this.stringValue = stringValue;
}
+ @Override
public String getStringValue() {
return this.stringValue == null ? LabelUtils.Jackson.toJson(value,
null) : this.stringValue;
}
diff --git
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
index 55b54a188..a74c4ee84 100644
---
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
+++
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptor.scala
@@ -17,18 +17,12 @@
package org.apache.linkis.storage.io.iteraceptor
-import java.io.{IOException, InputStream, OutputStream}
-import java.lang.reflect.Method
-import java.net.InetAddress
-
import com.google.gson.reflect.TypeToken
+import org.apache.commons.lang.StringUtils
import org.apache.linkis.common.io.FsPath
import org.apache.linkis.common.utils.{Logging, Utils}
-import org.apache.linkis.storage.io.client.IOClient
-import org.apache.linkis.storage.io.utils.IOClientUtils
import org.apache.linkis.manager.label.constant.LabelKeyConstant
-import org.apache.linkis.manager.label.entity.engine.EngineInstanceLabel
-import org.apache.linkis.manager.label.entity.entrance.{BindEngineLabel,
LoadBalanceLabel}
+import org.apache.linkis.manager.label.entity.entrance.BindEngineLabel
import org.apache.linkis.storage.domain.{FsPathListWithError, MethodEntity,
MethodEntitySerializer}
import org.apache.linkis.storage.exception.{FSNotInitException,
StorageErrorException}
import org.apache.linkis.storage.io.client.IOClient
@@ -36,10 +30,11 @@ import org.apache.linkis.storage.io.utils.IOClientUtils
import org.apache.linkis.storage.resultset.io.{IOMetaData, IORecord}
import org.apache.linkis.storage.resultset.{ResultSetFactory, ResultSetReader,
ResultSetWriter}
import org.apache.linkis.storage.utils.{StorageConfiguration, StorageUtils}
-import org.apache.linkis.storage.io.conf.IOFileClientConf
-import net.sf.cglib.proxy.{MethodInterceptor, MethodProxy}
-import org.apache.commons.lang.StringUtils
+import org.springframework.cglib.proxy.{MethodInterceptor, MethodProxy}
+import java.io.{IOException, InputStream, OutputStream}
+import java.lang.reflect.Method
+import java.net.InetAddress
import scala.beans.BeanProperty
import scala.collection.JavaConversions._
import scala.collection.mutable
@@ -199,7 +194,7 @@ class IOMethodInterceptor(fsType: String) extends
MethodInterceptor with Logging
class IOInputStream(args: Array[AnyRef]) extends InputStream {
private var fetched: Array[Byte] = _
private var index = 0
- private var position = 0l
+ private var position = 0L
private var markPosition = 0L
private var readable = true
private var canContinueFetch = true
@@ -240,8 +235,9 @@ class IOMethodInterceptor(fsType: String) extends
MethodInterceptor with Logging
override def available(): Int = {
if (!readable) return 0
- if (!canContinueFetch)
+ if (!canContinueFetch) {
return fetched.length - index
+ }
beforeOperation()
val params = Array(MethodEntitySerializer.serializerJavaObject(args(0)),
position).map(_.asInstanceOf[AnyRef])
val available = if (fetched != null) fetched.length - index else 0
diff --git
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptorCreatorImpl.scala
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptorCreatorImpl.scala
index ccc8ef80e..d1f59eccd 100644
---
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptorCreatorImpl.scala
+++
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/iteraceptor/IOMethodInterceptorCreatorImpl.scala
@@ -18,14 +18,14 @@
package org.apache.linkis.storage.io.iteraceptor
import org.apache.linkis.common.utils.Logging
-import org.apache.linkis.storage.io.client.IOClient
import org.apache.linkis.storage.io.IOMethodInterceptorCreator
import org.apache.linkis.storage.io.client.IOClient
-import javax.annotation.PostConstruct
-import net.sf.cglib.proxy.MethodInterceptor
import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.cglib.proxy.MethodInterceptor
import org.springframework.stereotype.Component
+import javax.annotation.PostConstruct
+
@Component("ioMethod")
class IOMethodInterceptorCreatorImpl extends IOMethodInterceptorCreator with
Logging {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
