From 7387150f1a4c479cfcb2e249903ac875979ecb7a Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 21 Apr 2023 20:13:00 +0800
Subject: [PATCH] fix code

---
 hutool-extra/pom.xml                             |  8 --------
 .../{ => spring}/cglib/BeanCopierCache.java      |  6 +++---
 .../extra/{ => spring}/cglib/CglibUtil.java      |  8 ++++----
 .../extra/{ => spring}/cglib/package-info.java   |  4 ++--
 .../extra/{ => spring}/cglib/CglibUtilTest.java  | 16 ++++++++++++++--
 5 files changed, 23 insertions(+), 19 deletions(-)
 rename hutool-extra/src/main/java/org/dromara/hutool/extra/{ => spring}/cglib/BeanCopierCache.java (94%)
 rename hutool-extra/src/main/java/org/dromara/hutool/extra/{ => spring}/cglib/CglibUtil.java (96%)
 rename hutool-extra/src/main/java/org/dromara/hutool/extra/{ => spring}/cglib/package-info.java (87%)
 rename hutool-extra/src/test/java/org/dromara/hutool/extra/{ => spring}/cglib/CglibUtilTest.java (68%)

diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index cb3cb3adf..6bffc873b 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -44,7 +44,6 @@
 		<net.version>3.9.0</net.version>
 		<emoji-java.version>5.1.1</emoji-java.version>
 		<spring-boot.version>2.7.10</spring-boot.version>
-		<cglib.version>3.3.0</cglib.version>
 	</properties>
 
 	<dependencies>
@@ -411,13 +410,6 @@
 			</exclusions>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib</artifactId>
-			<version>${cglib.version}</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>net.bytebuddy</groupId>
 			<artifactId>byte-buddy</artifactId>
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/BeanCopierCache.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/BeanCopierCache.java
similarity index 94%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/BeanCopierCache.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/BeanCopierCache.java
index 9155de2dc..48670f652 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/BeanCopierCache.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/BeanCopierCache.java
@@ -10,12 +10,12 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.extra.cglib;
+package org.dromara.hutool.extra.spring.cglib;
 
 import org.dromara.hutool.core.map.WeakConcurrentMap;
 import org.dromara.hutool.core.text.StrUtil;
-import net.sf.cglib.beans.BeanCopier;
-import net.sf.cglib.core.Converter;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.cglib.core.Converter;
 
 /**
  * BeanCopier属性缓存<br>
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/CglibUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/CglibUtil.java
similarity index 96%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/CglibUtil.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/CglibUtil.java
index 543df6c0c..5883dd767 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/CglibUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/CglibUtil.java
@@ -10,13 +10,13 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.extra.cglib;
+package org.dromara.hutool.extra.spring.cglib;
 
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.reflect.ConstructorUtil;
-import net.sf.cglib.beans.BeanCopier;
-import net.sf.cglib.beans.BeanMap;
-import net.sf.cglib.core.Converter;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.cglib.core.Converter;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/package-info.java
similarity index 87%
rename from hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/package-info.java
rename to hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/package-info.java
index a2e611278..9013c06b2 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/cglib/package-info.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/cglib/package-info.java
@@ -11,9 +11,9 @@
  */
 
 /**
- * Cglib库方法封装
+ * Spring cglib相关工具封装
  *
  * @author looly
  *
  */
-package org.dromara.hutool.extra.cglib;
+package org.dromara.hutool.extra.spring.cglib;
diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/cglib/CglibUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java
similarity index 68%
rename from hutool-extra/src/test/java/org/dromara/hutool/extra/cglib/CglibUtilTest.java
rename to hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java
index 3762983c2..c7f62ec59 100644
--- a/hutool-extra/src/test/java/org/dromara/hutool/extra/cglib/CglibUtilTest.java
+++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java
@@ -1,7 +1,19 @@
-package org.dromara.hutool.extra.cglib;
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+package org.dromara.hutool.extra.spring.cglib;
 
-import org.dromara.hutool.core.convert.Convert;
 import lombok.Data;
+import org.dromara.hutool.core.convert.Convert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;