From 9d7e42eda88b9f7564051b88ccd8e81f6b61b691 Mon Sep 17 00:00:00 2001
From: "rick.liu" <842001597@qq.com>
Date: Mon, 16 Nov 2026 15:23:01 +0800
Subject: [PATCH] fix(maven): resolve Named Locks and proxy auth, add missing
dependencies and improve types
---
.gitignore | 1 -
.idea/jarRepositories.xml | 5 +
.idea/vcs.xml | 6 +
.mvn/jvm.config | 4 +
.mvn/maven.config | 3 +
pom.xml | 24 +
.../app/converter/JsonElementConverter.java | 2 +-
.../app/converter/JsonObjectConverter.java | 2 +-
.../java/com/midm/model/file/BaseFile.java | 6 +-
.../java/com/midm/model/file/OtaFile.java | 4 +-
.../java/com/midm/model/org/SiteInfo.java | 4 +-
src/main/java/com/midm/model/org/User.java | 10 +-
.../midm/service/news/NewsMessageService.java | 10 +-
.../com/midm/service/org/UserService.java | 2 +-
src/main/java/com/mitac/cell/db/DbObject.java | 10 +-
.../java/com/mitac/cell/io/Vector2Svg.java | 10 +-
.../java/com/mitac/cell/system/HwInfo.java | 2 +-
.../boot/loader/ClassPathIndexFile.java | 119 ----
.../loader/ExecutableArchiveLauncher.java | 135 ----
.../boot/loader/JarLauncher.java | 30 -
.../boot/loader/LaunchedURLClassLoader.java | 303 --------
.../springframework/boot/loader/Launcher.java | 95 ---
.../boot/loader/MainMethodRunner.java | 21 -
.../boot/loader/PropertiesLauncher.java | 658 ------------------
.../boot/loader/WarLauncher.java | 32 -
.../boot/loader/archive/Archive.java | 69 --
.../boot/loader/archive/ExplodedArchive.java | 276 --------
.../boot/loader/archive/JarFileArchive.java | 290 --------
.../boot/loader/data/RandomAccessData.java | 16 -
.../loader/data/RandomAccessDataFile.java | 181 -----
.../boot/loader/jar/AbstractJarFile.java | 28 -
.../boot/loader/jar/AsciiBytes.java | 214 ------
.../boot/loader/jar/Bytes.java | 16 -
.../loader/jar/CentralDirectoryEndRecord.java | 152 ----
.../jar/CentralDirectoryFileHeader.java | 172 -----
.../loader/jar/CentralDirectoryParser.java | 68 --
.../loader/jar/CentralDirectoryVisitor.java | 11 -
.../boot/loader/jar/FileHeader.java | 13 -
.../boot/loader/jar/Handler.java | 390 -----------
.../boot/loader/jar/JarEntry.java | 84 ---
.../loader/jar/JarEntryCertification.java | 29 -
.../boot/loader/jar/JarEntryFilter.java | 5 -
.../boot/loader/jar/JarFile.java | 361 ----------
.../boot/loader/jar/JarFileEntries.java | 435 ------------
.../boot/loader/jar/JarFileWrapper.java | 90 ---
.../boot/loader/jar/JarURLConnection.java | 334 ---------
.../boot/loader/jar/StringSequence.java | 116 ---
.../loader/jar/ZipInflaterInputStream.java | 58 --
.../boot/loader/jarmode/JarMode.java | 7 -
.../boot/loader/jarmode/JarModeLauncher.java | 28 -
.../boot/loader/jarmode/TestJarMode.java | 13 -
.../boot/loader/util/SystemPropertyUtils.java | 143 ----
52 files changed, 74 insertions(+), 5023 deletions(-)
create mode 100644 .idea/vcs.xml
create mode 100644 .mvn/jvm.config
create mode 100644 .mvn/maven.config
delete mode 100644 src/main/java/org/springframework/boot/loader/ClassPathIndexFile.java
delete mode 100644 src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java
delete mode 100644 src/main/java/org/springframework/boot/loader/JarLauncher.java
delete mode 100644 src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
delete mode 100644 src/main/java/org/springframework/boot/loader/Launcher.java
delete mode 100644 src/main/java/org/springframework/boot/loader/MainMethodRunner.java
delete mode 100644 src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
delete mode 100644 src/main/java/org/springframework/boot/loader/WarLauncher.java
delete mode 100644 src/main/java/org/springframework/boot/loader/archive/Archive.java
delete mode 100644 src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
delete mode 100644 src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java
delete mode 100644 src/main/java/org/springframework/boot/loader/data/RandomAccessData.java
delete mode 100644 src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/AbstractJarFile.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/AsciiBytes.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/Bytes.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/CentralDirectoryParser.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/CentralDirectoryVisitor.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/FileHeader.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/Handler.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarEntry.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarEntryCertification.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarEntryFilter.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarFile.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarFileWrapper.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/StringSequence.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jar/ZipInflaterInputStream.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jarmode/JarMode.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jarmode/JarModeLauncher.java
delete mode 100644 src/main/java/org/springframework/boot/loader/jarmode/TestJarMode.java
delete mode 100644 src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java
diff --git a/.gitignore b/.gitignore
index fb22c6a..7decc11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ hs_err_pid*
replay_pid*
# Maven
-.mvn/
mvnw
mvnw.cmd
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 712ab9d..c7ea920 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,5 +16,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000..db93c14
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1,4 @@
+-Daether.syncContext.named.factory=noop
+-Daether.connector.basic.threads=1
+-Daether.connector.http.preemptiveAuth=true
+-Djdk.http.auth.tunneling.disabledSchemes=""
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000..a18d38b
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,3 @@
+-Daether.syncContext.named.factory=noop
+-Daether.connector.basic.threads=1
+-Daether.connector.http.preemptiveAuth=true
diff --git a/pom.xml b/pom.xml
index 7bff065..6ceb3b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,10 @@
org.springframework.boot
spring-boot-starter-websocket
+
+ org.springframework.boot
+ spring-boot-starter-mail
+
org.springframework.boot
spring-boot-starter-tomcat
@@ -62,6 +66,26 @@
aws-java-sdk-s3
${aws.sdk.version}
+
+ software.amazon.awssdk
+ kinesisvideo
+ 2.25.21
+
+
+ software.amazon.awssdk
+ kinesisvideosignaling
+ 2.25.21
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.1
+
+
+ com.fatboyindustrial.gson-jodatime-serialisers
+ gson-jodatime-serialisers
+ 1.8.0
+
com.azure
azure-storage-blob
diff --git a/src/main/java/com/midm/app/converter/JsonElementConverter.java b/src/main/java/com/midm/app/converter/JsonElementConverter.java
index 0c6b836..31f0254 100644
--- a/src/main/java/com/midm/app/converter/JsonElementConverter.java
+++ b/src/main/java/com/midm/app/converter/JsonElementConverter.java
@@ -8,7 +8,7 @@ import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
@Component
-public class JsonElementConverter implements Converter {
+public class JsonElementConverter implements Converter {
public JsonElement convert(String source) {
try {
source = URLDecoder.decode(source, Charset.defaultCharset());
diff --git a/src/main/java/com/midm/app/converter/JsonObjectConverter.java b/src/main/java/com/midm/app/converter/JsonObjectConverter.java
index c314452..11185aa 100644
--- a/src/main/java/com/midm/app/converter/JsonObjectConverter.java
+++ b/src/main/java/com/midm/app/converter/JsonObjectConverter.java
@@ -8,7 +8,7 @@ import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
@Component
-public class JsonObjectConverter implements Converter {
+public class JsonObjectConverter implements Converter {
public JsonObject convert(String source) {
try {
source = URLDecoder.decode(source, Charset.defaultCharset());
diff --git a/src/main/java/com/midm/model/file/BaseFile.java b/src/main/java/com/midm/model/file/BaseFile.java
index 30cf45b..0953ff7 100644
--- a/src/main/java/com/midm/model/file/BaseFile.java
+++ b/src/main/java/com/midm/model/file/BaseFile.java
@@ -116,8 +116,10 @@ public class BaseFile {
this.extra = new DbObject();
}
- parameters.forEach((key, value) -> {
- if (value.length > 0 && key.startsWith("extra.")) {
+ parameters.forEach((k, v) -> {
+ String key = (String) k;
+ String[] value = (String[]) v;
+ if (value != null && value.length > 0 && key.startsWith("extra.")) {
this.extra.put(key.substring(6), value.length == 1 ? value[0] : Arrays.asList(value));
}
diff --git a/src/main/java/com/midm/model/file/OtaFile.java b/src/main/java/com/midm/model/file/OtaFile.java
index 10d2454..645e7ae 100644
--- a/src/main/java/com/midm/model/file/OtaFile.java
+++ b/src/main/java/com/midm/model/file/OtaFile.java
@@ -42,7 +42,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
* @author MiDM Core Platform Team
*/
@Document
-public class OtaFile extends BaseFile implements Comparable {
+public class OtaFile extends BaseFile implements Comparable {
/** Android Recovery 固件升级脚本入口 */
private static final String ENTRY_META_INF = "META-INF/com/";
private static final String ENTRY_UPDATE_SCRIPT = "META-INF/com/google/android/updater-script";
@@ -643,7 +643,7 @@ public class OtaFile extends BaseFile implements Comparable {
break;
case "display-id":
case "ro.build.display.id":
- String curDisplayId = this.getDisplayId();
+ curDisplayId = this.getDisplayId();
if (Strings.isNullOrEmpty(curDisplayId) || !curDisplayId.equals(value)) {
this.setDisplayId(value);
}
diff --git a/src/main/java/com/midm/model/org/SiteInfo.java b/src/main/java/com/midm/model/org/SiteInfo.java
index 65e56fb..63996e2 100644
--- a/src/main/java/com/midm/model/org/SiteInfo.java
+++ b/src/main/java/com/midm/model/org/SiteInfo.java
@@ -52,7 +52,7 @@ public class SiteInfo {
return this.isEnabled() && !this.getRoles().isEmpty() && this.getRoles().contains(role);
}
- public boolean hasRole(Collection roles) {
+ public boolean hasRole(Collection roles) {
if (this.isEnabled() && !this.getRoles().isEmpty()) {
for(String role : roles) {
if (this.getRoles().contains(role)) {
@@ -72,7 +72,7 @@ public class SiteInfo {
}
- public void setRoles(Set roles) {
+ public void setRoles(Set roles) {
if (roles != null && !roles.isEmpty()) {
for(String role : roles) {
role = UserRole.toRole(role);
diff --git a/src/main/java/com/midm/model/org/User.java b/src/main/java/com/midm/model/org/User.java
index de7467b..4b43916 100644
--- a/src/main/java/com/midm/model/org/User.java
+++ b/src/main/java/com/midm/model/org/User.java
@@ -35,7 +35,7 @@ public class User extends GeneralProfile {
serialize = false
)
private String password;
- private List sites;
+ private List sites;
@Transient
private boolean isMultiSiteUser;
@Transient
@@ -172,7 +172,7 @@ public class User extends GeneralProfile {
this.siteInfo = siteInfo;
}
- public List getSites() {
+ public List getSites() {
if (this.sites == null) {
this.sites = new ArrayList();
}
@@ -180,8 +180,8 @@ public class User extends GeneralProfile {
return this.sites;
}
- public List getSiteUuids() {
- return this.sites != null && !this.sites.isEmpty() ? (List)this.sites.stream().map((item) -> item.getSiteUuid()).collect(Collectors.toList()) : null;
+ public List getSiteUuids() {
+ return this.sites != null && !this.sites.isEmpty() ? (List)this.sites.stream().map(SiteInfo::getSiteUuid).collect(Collectors.toList()) : null;
}
public boolean clearUndefinedSites() {
@@ -201,7 +201,7 @@ public class User extends GeneralProfile {
return hasChanges;
}
- public void setSites(List sites) {
+ public void setSites(List sites) {
this.sites = sites;
}
diff --git a/src/main/java/com/midm/service/news/NewsMessageService.java b/src/main/java/com/midm/service/news/NewsMessageService.java
index d40f344..3e51979 100644
--- a/src/main/java/com/midm/service/news/NewsMessageService.java
+++ b/src/main/java/com/midm/service/news/NewsMessageService.java
@@ -136,7 +136,7 @@ public class NewsMessageService extends BaseService {
this.messageLogService.deleteByNewsMessage(newsMessage);
}
- public void delete(List newsMessage) {
+ public void delete(List newsMessage) {
List uuids = (List)newsMessage.stream().map(NewsMessage::getUuid).collect(Collectors.toList());
Query query = Query.query(Criteria.where("_id").in(uuids));
this.mongoTemplate.remove(query, NewsMessage.class);
@@ -204,7 +204,7 @@ public class NewsMessageService extends BaseService {
this.sendNotification(mails, newsMessage);
}
- private void sendNotification(Collection mails, NewsMessage message) {
+ private void sendNotification(Collection mails, NewsMessage message) {
Map recipients = (Map)mails.stream().collect(Collectors.toMap(UserMail::getEmail, (user) -> user.toAddress()));
List mailsTo = message.getMailsTo();
if (mailsTo != null && !mailsTo.isEmpty()) {
@@ -229,8 +229,8 @@ public class NewsMessageService extends BaseService {
}
}
- private void sendMail(McMailSender sender, List addresses) {
- for(List oneList : Lists.partition(addresses, 40)) {
+ private void sendMail(McMailSender sender, List addresses) {
+ for(List oneList : Lists.partition(addresses, 40)) {
sender.clearBcc();
sender.addBcc(oneList);
sender.send();
@@ -528,7 +528,7 @@ public class NewsMessageService extends BaseService {
ref.put("errorCode", error.getValue());
Set ssnSet = null;
if (REPORT_ERROR.COLLECT_SSN.contains(error)) {
- Set ssnSet = new HashSet(Arrays.asList(device.getSerialNo()));
+ ssnSet = new HashSet(Arrays.asList(device.getSerialNo()));
ref.put("device", new HashSet(ssnSet));
}
diff --git a/src/main/java/com/midm/service/org/UserService.java b/src/main/java/com/midm/service/org/UserService.java
index 87ad84c..ead894c 100644
--- a/src/main/java/com/midm/service/org/UserService.java
+++ b/src/main/java/com/midm/service/org/UserService.java
@@ -96,7 +96,7 @@ public class UserService extends BaseService {
this.mongoTemplate.updateMulti(query, update, User.class);
}
- public List saveUsers(List users) {
+ public List saveUsers(List users) {
List savedUsers = new ArrayList();
for(User user : users) {
diff --git a/src/main/java/com/mitac/cell/db/DbObject.java b/src/main/java/com/mitac/cell/db/DbObject.java
index 3902cd9..a003a70 100644
--- a/src/main/java/com/mitac/cell/db/DbObject.java
+++ b/src/main/java/com/mitac/cell/db/DbObject.java
@@ -134,17 +134,17 @@ public class DbObject extends Document {
for(String key : keys) {
Object value = dbObject.get(key);
if (value == null) {
- Object var8 = new DbObject();
+ DbObject var8 = new DbObject();
dbObject.put(key, var8);
dbObject = var8;
} else if (value instanceof DbObject) {
dbObject = (DbObject)value;
} else if (value instanceof Map) {
- Object var9 = new DbObject((Map)value);
+ DbObject var9 = new DbObject((Map)value);
dbObject.put(key, var9);
dbObject = var9;
} else {
- Object var10 = new DbObject();
+ DbObject var10 = new DbObject();
dbObject.put(key, var10);
dbObject = var10;
}
@@ -157,7 +157,7 @@ public class DbObject extends Document {
if (clazz.equals(DbObject.class)) {
List