summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authordoufenghu <[email protected]>2024-03-17 19:38:07 +0800
committerdoufenghu <[email protected]>2024-03-17 19:38:07 +0800
commitd7cf09110fa9d6750a95f1ec03de93df9b2dec9f (patch)
treedc35bf06b513edf54db9fe2247708d47f1bc777d /src/main/java
parentcd30fa62ea4a03609aee1cc19ece7e23ec4c8c72 (diff)
[Fix] Replace google guava-jre-33.0 to guava-shade-jre-33.0.HEADv2.0.2master
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java2
-rw-r--r--src/main/java/com/geedgenetworks/utils/AsnLookup.java7
-rw-r--r--src/main/java/com/geedgenetworks/utils/DateUtils.java3
-rw-r--r--src/main/java/com/geedgenetworks/utils/FormatUtils.java3
-rw-r--r--src/main/java/com/geedgenetworks/utils/IpLookupV2.java9
5 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java b/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java
index 28be192..4104b67 100644
--- a/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java
+++ b/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java
@@ -1,6 +1,6 @@
package com.geedgenetworks.utils;
-import com.google.common.collect.ObjectArrays;
+import com.geedgenetworks.shaded.com.google.common.collect.ObjectArrays;
import com.maxmind.db.CHMCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/geedgenetworks/utils/AsnLookup.java b/src/main/java/com/geedgenetworks/utils/AsnLookup.java
index 6bb9e9b..37fecab 100644
--- a/src/main/java/com/geedgenetworks/utils/AsnLookup.java
+++ b/src/main/java/com/geedgenetworks/utils/AsnLookup.java
@@ -1,9 +1,10 @@
package com.geedgenetworks.utils;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.geedgenetworks.model.LocationResponse;
+import com.geedgenetworks.shaded.com.google.common.base.Joiner;
+import com.geedgenetworks.shaded.com.google.common.collect.Lists;
+import com.geedgenetworks.shaded.com.google.common.collect.Maps;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/com/geedgenetworks/utils/DateUtils.java b/src/main/java/com/geedgenetworks/utils/DateUtils.java
index a8b8321..a0060d7 100644
--- a/src/main/java/com/geedgenetworks/utils/DateUtils.java
+++ b/src/main/java/com/geedgenetworks/utils/DateUtils.java
@@ -1,6 +1,5 @@
package com.geedgenetworks.utils;
-
-import com.google.common.collect.Lists;
+import com.geedgenetworks.shaded.com.google.common.collect.Lists;
import org.joda.time.*;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/geedgenetworks/utils/FormatUtils.java b/src/main/java/com/geedgenetworks/utils/FormatUtils.java
index 41837bd..4a2f00f 100644
--- a/src/main/java/com/geedgenetworks/utils/FormatUtils.java
+++ b/src/main/java/com/geedgenetworks/utils/FormatUtils.java
@@ -6,11 +6,10 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
+import com.geedgenetworks.shaded.com.google.common.net.InternetDomainName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.net.InternetDomainName;
-
public class FormatUtils {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/src/main/java/com/geedgenetworks/utils/IpLookupV2.java b/src/main/java/com/geedgenetworks/utils/IpLookupV2.java
index 41db7f9..68c99dd 100644
--- a/src/main/java/com/geedgenetworks/utils/IpLookupV2.java
+++ b/src/main/java/com/geedgenetworks/utils/IpLookupV2.java
@@ -4,10 +4,11 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSONWriter;
import com.geedgenetworks.model.LocationResponse;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import com.geedgenetworks.shaded.com.google.common.base.Function;
+import com.geedgenetworks.shaded.com.google.common.base.Joiner;
+import com.geedgenetworks.shaded.com.google.common.collect.Lists;
+import com.geedgenetworks.shaded.com.google.common.collect.Maps;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;