From 1bb353ff68d85efe2a67c8f63822741ef34a9e59 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Wed, 31 May 2023 23:58:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4vin=E5=88=B0core=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/data}/vin/AlphanumericVinCode.java | 3 +-- .../hutool/core/data}/vin/MaskVinCode.java | 2 +- .../hutool/core/data}/vin/NumericVinCode.java | 2 +- .../dromara/hutool/core/data}/vin/Vds.java | 2 +- .../dromara/hutool/core/data}/vin/Vin.java | 2 +- .../hutool/core/data}/vin/VinCode.java | 2 +- .../core/data}/vin/VinCodeMaskEnum.java | 2 +- .../dromara/hutool/core/data}/vin/Vis.java | 2 +- .../dromara/hutool/core/data}/vin/Wmi.java | 2 +- .../org/dromara/hutool/core/data/VinTest.java | 6 ++--- .../hutool/extra/vehicle/VehicleUtil.java | 22 ------------------- 11 files changed, 12 insertions(+), 35 deletions(-) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/AlphanumericVinCode.java (89%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/MaskVinCode.java (92%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/NumericVinCode.java (95%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/Vds.java (97%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/Vin.java (99%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/VinCode.java (79%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/VinCodeMaskEnum.java (95%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/Vis.java (98%) rename {hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle => hutool-core/src/main/java/org/dromara/hutool/core/data}/vin/Wmi.java (97%) rename hutool-extra/src/test/java/org/dromara/hutool/extra/vehicle/VehicleTest.java => hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java (89%) delete mode 100644 hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/VehicleUtil.java diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/AlphanumericVinCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/AlphanumericVinCode.java similarity index 89% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/AlphanumericVinCode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/AlphanumericVinCode.java index fadb39449..0aba7ba30 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/AlphanumericVinCode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/AlphanumericVinCode.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; /** * 可以是字母或者数字的字码 @@ -17,7 +17,6 @@ class AlphanumericVinCode implements MaskVinCode { * * @param code 字码值 * @param index 索引位 - * @throws IllegalArgumentException the illegal argument exception */ AlphanumericVinCode(String code, int index) { this.code = code; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/MaskVinCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/MaskVinCode.java similarity index 92% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/MaskVinCode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/MaskVinCode.java index bcf664559..888204e3c 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/MaskVinCode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/MaskVinCode.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; import java.util.Arrays; import java.util.List; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/NumericVinCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/NumericVinCode.java similarity index 95% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/NumericVinCode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/NumericVinCode.java index ed02b28f0..706cfd7f7 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/NumericVinCode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/NumericVinCode.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; /** * 数字字码. diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vds.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vds.java similarity index 97% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vds.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vds.java index 9878249cd..1b42c11bc 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vds.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vds.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; import java.util.List; import java.util.stream.Collectors; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vin.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vin.java similarity index 99% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vin.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vin.java index 2c2e45b1c..086083866 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vin.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vin.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; import java.time.Year; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/VinCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/VinCode.java similarity index 79% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/VinCode.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/VinCode.java index b79ce0be7..6b7542cb2 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/VinCode.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/VinCode.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; /** diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/VinCodeMaskEnum.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/VinCodeMaskEnum.java similarity index 95% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/VinCodeMaskEnum.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/VinCodeMaskEnum.java index fa0fd5783..458d89795 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/VinCodeMaskEnum.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/VinCodeMaskEnum.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; /** * Vin掩码枚举 diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vis.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vis.java similarity index 98% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vis.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vis.java index ff6b42689..8bcaaf8e2 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Vis.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Vis.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; import java.time.Year; import java.util.Arrays; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Wmi.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Wmi.java similarity index 97% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Wmi.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Wmi.java index 8f03a3933..740507458 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/vin/Wmi.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/vin/Wmi.java @@ -1,4 +1,4 @@ -package org.dromara.hutool.extra.vehicle.vin; +package org.dromara.hutool.core.data.vin; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/vehicle/VehicleTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java similarity index 89% rename from hutool-extra/src/test/java/org/dromara/hutool/extra/vehicle/VehicleTest.java rename to hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java index de1b904e0..b07bfff4f 100644 --- a/hutool-extra/src/test/java/org/dromara/hutool/extra/vehicle/VehicleTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/data/VinTest.java @@ -1,6 +1,6 @@ -package org.dromara.hutool.extra.vehicle; +package org.dromara.hutool.core.data; -import org.dromara.hutool.extra.vehicle.vin.Vin; +import org.dromara.hutool.core.data.vin.Vin; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,7 +10,7 @@ import java.time.Year; * @author VampireAchao * @since 2023/5/31 14:43 */ -public class VehicleTest { +public class VinTest { @Test public void parseVinTest() { diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/VehicleUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/VehicleUtil.java deleted file mode 100644 index 386ac1a5b..000000000 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/vehicle/VehicleUtil.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.dromara.hutool.extra.vehicle; - -import org.dromara.hutool.extra.vehicle.vin.Vin; - -/** - * 汽车工具类封装 - * - * @author VampireAchao - */ -public class VehicleUtil { - - /** - * 解析车辆识别代码 - * - * @param vin 车辆识别代码 - * @return 解析后的结果 - */ - public static Vin parseVin(String vin) { - return Vin.of(vin); - } - -}