vrr/airsonic-pulse
2
0
Fork 0
mirror of https://github.com/Airsonic-Pulse/airsonic-pulse.git synced 2026-10-19 01:48:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

#350 bump up spring boot to 3.x

Browse source
This commit is contained in:
Y.Tory 2024-01-26 00:02:28 +00:00
parent 7d07b7e6af
commit c0bc1dfea4
154 changed files with 482 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airsonic-main/pom.xml
View file

@ -38,7 +38,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>
<!-- Metrics
@ -272,6 +271,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
@ -301,7 +301,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
<version>2.7.8</version>
<version>3.0.4</version>
</dependency>
<dependency>
@ -351,6 +351,7 @@
<artifactId>mockito-inline</artifactId>
<version>5.2.0</version>
<scope>test</scope>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@ -453,7 +454,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.8.0</version>
<version>2.9.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@ -596,11 +597,6 @@
<artifactId>cuelib-core</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>

2
airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueWSController.java
View file

@ -15,7 +15,7 @@ import org.springframework.messaging.simp.annotation.SendToUser;
import org.springframework.messaging.simp.annotation.SubscribeMapping;
import org.springframework.stereotype.Controller;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;

2
airsonic-main/src/main/java/org/airsonic/player/ajax/TagWSController.java
View file

@ -16,7 +16,7 @@ import org.springframework.messaging.simp.annotation.SendToUser;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Controller
@MessageMapping("/tags")

6
airsonic-main/src/main/java/org/airsonic/player/command/CredentialsManagementCommand.java
View file

@ -9,9 +9,9 @@ import org.airsonic.player.validator.CredentialsManagementValidators.CredentialU
import org.airsonic.player.validator.CredentialsManagementValidators.EncoderValid;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.Instant;
import java.util.Date;

2
airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java
View file

@ -1,6 +1,6 @@
package org.airsonic.player.command;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
public class DatabaseSettingsCommand {

2
airsonic-main/src/main/java/org/airsonic/player/config/AirsonicCueConfig.java
View file

@ -1,10 +1,8 @@
package org.airsonic.player.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding;
@ConfigurationProperties(prefix = "airsonic.cue")
@ConstructorBinding
public class AirsonicCueConfig {
// properties

2
airsonic-main/src/main/java/org/airsonic/player/config/AirsonicDefaultFolderConfig.java
View file

@ -20,11 +20,9 @@ package org.airsonic.player.config;
import org.airsonic.player.util.Util;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding;
import org.springframework.util.StringUtils;
@ConfigurationProperties(prefix = "airsonic")
@ConstructorBinding
public class AirsonicDefaultFolderConfig {
// constants

2
airsonic-main/src/main/java/org/airsonic/player/config/AirsonicHomeConfig.java
View file

@ -25,7 +25,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.StringUtils;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.nio.file.Files;
import java.nio.file.Path;

4
airsonic-main/src/main/java/org/airsonic/player/config/AirsonicScanConfig.java
View file

@ -22,15 +22,13 @@ package org.airsonic.player.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.Positive;
import jakarta.validation.constraints.Positive;
import java.util.Objects;
@ConfigurationProperties(prefix = "airsonic.scan")
@ConstructorBinding
@Validated
public class AirsonicScanConfig {

4
airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java
View file

@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* Spring MVC Controller that serves the login page.

2
airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java
View file

@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.nio.file.Path;

2
airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java
View file

@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

2
airsonic-main/src/main/java/org/airsonic/player/controller/BookmarksController.java
View file

@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.Map;

6
airsonic-main/src/main/java/org/airsonic/player/controller/CaptionsController.java
View file

@ -12,7 +12,7 @@ import org.airsonic.player.service.metadata.MetaData;
import org.airsonic.player.service.metadata.MetaDataParser;
import org.airsonic.player.service.metadata.MetaDataParserFactory;
import org.airsonic.player.util.NetworkUtil;
import org.apache.commons.compress.utils.FileNameUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.input.BOMInputStream;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.util.UriComponentsBuilder;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URLEncoder;
@ -270,7 +270,7 @@ public class CaptionsController {
try (Stream<Path> children = Files.walk(parentPath)) {
return children.parallel()
.filter(c -> Files.isRegularFile(c))
.filter(c -> CAPTIONS_FORMATS.contains(FileNameUtils.getExtension(c)))
.filter(c -> CAPTIONS_FORMATS.contains(FilenameUtils.getExtension(c.toString())))
.collect(Collectors.toList());
} catch (IOException e) {
LOG.warn("Could not retrieve directory list for {} to find subtitle files for {}", parentPath, video, e);

4
airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java
View file

@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**

2
airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java
View file

@ -3,7 +3,7 @@ package org.airsonic.player.controller;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.servlet.HandlerMapping;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* This class has been created to refactor code previously present

13
airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
View file

@ -19,7 +19,6 @@
*/
package org.airsonic.player.controller;
import com.google.common.io.MoreFiles;
import org.airsonic.player.config.AirsonicHomeConfig;
import org.airsonic.player.domain.*;
import org.airsonic.player.domain.CoverArt.EntityType;
@ -29,6 +28,7 @@ import org.airsonic.player.util.FileUtil;
import org.airsonic.player.util.ImageUtil;
import org.airsonic.player.util.StringUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.jaudiotagger.tag.images.Artwork;
@ -39,16 +39,15 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
//import org.springframework.web.context.request.ServletWebRequest;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
import javax.imageio.stream.ImageOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.*;
import java.awt.image.BufferedImage;
@ -225,7 +224,7 @@ public class CoverArtController {
}
private void sendImage(Path file, HttpServletResponse response) throws IOException {
response.setContentType(StringUtil.getMimeType(MoreFiles.getFileExtension(file)));
response.setContentType(StringUtil.getMimeType(FilenameUtils.getExtension(file.toString())));
Files.copy(file, response.getOutputStream());
}
@ -330,7 +329,7 @@ public class CoverArtController {
}
} else {
is = new BufferedInputStream(Files.newInputStream(file));
mimeType = StringUtil.getMimeType(MoreFiles.getFileExtension(file));
mimeType = StringUtil.getMimeType(FilenameUtils.getExtension(file.toString()));
}
return Pair.of(is, mimeType);
}

4
airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtJspController.java
View file

@ -5,8 +5,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

2
airsonic-main/src/main/java/org/airsonic/player/controller/CredentialsManagementController.java
View file

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.validation.groups.Default;
import jakarta.validation.groups.Default;
import java.security.Principal;
import java.util.Comparator;

2
airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java
View file

@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* Controller for the page used to administrate the UPnP/DLNA server settings.

2
airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java
View file

@ -57,7 +57,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;

4
airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java
View file

@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

4
airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java
View file

@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* Spring MVC Controller that serves the login page.

4
airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java
View file

@ -39,8 +39,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.util.UriComponentsBuilder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.nio.file.Files;
import java.time.Instant;

2
airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java
View file

@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java
View file

@ -62,8 +62,8 @@ import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.util.UriComponentsBuilder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.InputStream;

4
airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java
View file

@ -34,8 +34,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.Charset;

2
airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java
View file

@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.time.Instant;
import java.time.LocalDate;

2
airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java
View file

@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

2
airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java
View file

@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

10
airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
View file

@ -34,10 +34,10 @@ import org.subsonic.restapi.ObjectFactory;
import org.subsonic.restapi.Response;
import org.subsonic.restapi.ResponseStatus;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
@ -59,7 +59,7 @@ public class JAXBWriter {
private static final Logger LOG = LoggerFactory.getLogger(JAXBWriter.class);
private final javax.xml.bind.JAXBContext jaxbContext;
private final jakarta.xml.bind.JAXBContext jaxbContext;
private final DatatypeFactory datatypeFactory;
private static final String restProtocolVersion = parseRESTProtocolVersion();

4
airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java
View file

@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.support.RequestContextUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.nio.file.Path;
import java.time.Instant;

4
airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java
View file

@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java
View file

@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java
View file

@ -34,8 +34,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.List;

4
airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java
View file

@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Stream;

4
airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java
View file

@ -34,8 +34,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.nio.file.Path;
import java.time.LocalDate;

4
airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java
View file

@ -5,8 +5,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* Spring MVC Controller that serves the login page.

4
airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java
View file

@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Objects;
import java.util.Optional;

2
airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java
View file

@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Locale;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java
View file

@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

2
airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java
View file

@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;

4
airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java
View file

@ -35,8 +35,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

2
airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java
View file

@ -28,7 +28,7 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java
View file

@ -28,8 +28,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java
View file

@ -28,8 +28,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java
View file

@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;

4
airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java
View file

@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.InputStream;

4
airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java
View file

@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.time.Instant;
import java.time.temporal.ChronoUnit;

4
airsonic-main/src/main/java/org/airsonic/player/controller/RatingJspController.java
View file

@ -5,8 +5,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

14
airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
View file

@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.mail.Message;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.mail.Message;
import jakarta.mail.Session;
import jakarta.mail.Transport;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.security.SecureRandom;
import java.time.Instant;

2
airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java
View file

@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java
View file

@ -39,8 +39,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Objects;

2
airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java
View file

@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* Controller for updating music file metadata.

2
airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java
View file

@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* Controller for updating music file ratings.

2
airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java
View file

@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* Controller for the main settings page.

4
airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java
View file

@ -33,8 +33,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

2
airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java
View file

@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.time.Instant;
import java.time.temporal.ChronoUnit;

2
airsonic-main/src/main/java/org/airsonic/player/controller/SonosLinkController.java
View file

@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.time.Instant;
import java.util.Collections;

2
airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java
View file

@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;

4
airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java
View file

@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;

2
airsonic-main/src/main/java/org/airsonic/player/controller/StatisticsController.java
View file

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.support.RequestContextUtils;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;

4
airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java
View file

@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* Controller for the status page.

2
airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
View file

@ -54,7 +54,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.context.request.ServletWebRequest;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.awt.*;
import java.io.FilterInputStream;

6
airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java
View file

@ -56,9 +56,9 @@ import org.springframework.web.context.request.ServletWebRequest;
import org.subsonic.restapi.*;
import org.subsonic.restapi.PodcastStatus;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletResponse;
import javax.xml.datatype.XMLGregorianCalendar;
import java.nio.charset.StandardCharsets;

2
airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java
View file

@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;

4
airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java
View file

@ -58,8 +58,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.BufferedInputStream;
import java.io.IOException;

2
airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
View file

@ -52,7 +52,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;

8
airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java
View file

@ -20,7 +20,6 @@
package org.airsonic.player.controller;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.MoreFiles;
import org.airsonic.player.domain.Bookmark;
import org.airsonic.player.domain.MediaFile;
import org.airsonic.player.domain.User;
@ -34,6 +33,7 @@ import org.airsonic.player.service.SecurityService;
import org.airsonic.player.service.metadata.MetaData;
import org.airsonic.player.util.NetworkUtil;
import org.airsonic.player.util.StringUtil;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
@ -43,8 +43,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.LinkedHashMap;
@ -115,7 +115,7 @@ public class VideoPlayerController {
map.put("captions", captions);
map.put("streamUrls", streamUrls.getRight());
map.put("contentType", !streamable ? "application/x-mpegurl"
: StringUtil.getMimeType(MoreFiles.getFileExtension(file.getRelativePath())));
: StringUtil.getMimeType(FilenameUtils.getExtension(file.getPath())));
map.put("remoteStreamUrl", streamUrls.getRight().get("remoteStreamUrl"));
map.put("remoteCoverArtUrl", url + jwtSecurityService.addJWTToken(user.getUsername(), "ext/coverArt.view?id=" + file.getId()));
map.put("remoteCaptionsUrl", url + jwtSecurityService.addJWTToken(user.getUsername(), "ext/captions/list?id=" + file.getId()));

2
airsonic-main/src/main/java/org/airsonic/player/domain/Album.java
View file

@ -24,7 +24,7 @@ import org.airsonic.player.domain.entity.StarredAlbum;
import org.airsonic.player.repository.AtomicDoubleConverter;
import org.airsonic.player.repository.AtomicIntegerConverter;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.ArrayList;

2
airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java
View file

@ -22,7 +22,7 @@ package org.airsonic.player.domain;
import org.airsonic.player.repository.AtomicIntegerConverter;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.Objects;

2
airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java
View file

@ -20,7 +20,7 @@
*/
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.Objects;

22
airsonic-main/src/main/java/org/airsonic/player/domain/CoverArt.java
View file

@ -2,17 +2,17 @@ package org.airsonic.player.domain;
import org.airsonic.player.domain.entity.CoverArtKey;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import java.nio.file.Path;
import java.nio.file.Paths;

2
airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java
View file

@ -22,7 +22,7 @@ package org.airsonic.player.domain;
import org.airsonic.player.repository.AtomicIntegerConverter;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;

2
airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java
View file

@ -20,7 +20,7 @@
*/
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;

2
airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java
View file

@ -23,7 +23,7 @@ package org.airsonic.player.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.commons.io.FilenameUtils;
import javax.persistence.*;
import jakarta.persistence.*;
import java.nio.file.Path;
import java.nio.file.Paths;

2
airsonic-main/src/main/java/org/airsonic/player/domain/MusicFileInfo.java
View file

@ -1,6 +1,6 @@
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;

2
airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java
View file

@ -20,7 +20,7 @@
*/
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.io.Serializable;
import java.nio.file.Path;

2
airsonic-main/src/main/java/org/airsonic/player/domain/Player.java
View file

@ -22,7 +22,7 @@ package org.airsonic.player.domain;
import org.apache.commons.lang.StringUtils;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.ArrayList;

2
airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java
View file

@ -21,7 +21,7 @@ package org.airsonic.player.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.ArrayList;

2
airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java
View file

@ -21,7 +21,7 @@ package org.airsonic.player.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.persistence.*;
import jakarta.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;

2
airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannelRule.java
View file

@ -1,6 +1,6 @@
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.Objects;

2
airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java
View file

@ -19,7 +19,7 @@
*/
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.Objects;

6
airsonic-main/src/main/java/org/airsonic/player/domain/PodcastExportOPML.java
View file

@ -1,8 +1,8 @@
package org.airsonic.player.domain;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;

2
airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java
View file

@ -20,7 +20,7 @@
package org.airsonic.player.domain;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.ArrayList;

10
airsonic-main/src/main/java/org/airsonic/player/domain/SonosLink.java
View file

@ -1,10 +1,10 @@
package org.airsonic.player.domain;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import java.time.Instant;

14
airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java
View file

@ -22,13 +22,13 @@ package org.airsonic.player.domain;
import org.airsonic.player.util.StringUtil;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.Table;
import java.util.ArrayList;
import java.util.List;

2
airsonic-main/src/main/java/org/airsonic/player/domain/User.java
View file

@ -22,7 +22,7 @@ package org.airsonic.player.domain;
import org.airsonic.player.repository.RolesConverter;
import org.airsonic.player.util.Util;
import javax.persistence.*;
import jakarta.persistence.*;
import java.util.ArrayList;
import java.util.Collections;

20
airsonic-main/src/main/java/org/airsonic/player/domain/UserCredential.java
View file

@ -4,16 +4,16 @@ import org.airsonic.player.security.GlobalSecurityConfig;
import org.airsonic.player.security.PasswordDecoder;
import org.springframework.util.StringUtils;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import java.time.Instant;
import java.time.temporal.ChronoUnit;

14
airsonic-main/src/main/java/org/airsonic/player/domain/entity/CustomAvatar.java
View file

@ -3,13 +3,13 @@ package org.airsonic.player.domain.entity;
import org.airsonic.player.domain.Avatar;
import org.airsonic.player.repository.PathConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Convert;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import java.nio.file.Path;
import java.nio.file.Paths;

2
airsonic-main/src/main/java/org/airsonic/player/domain/entity/Share.java
View file

@ -19,7 +19,7 @@
*/
package org.airsonic.player.domain.entity;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;
import java.util.ArrayList;

16
airsonic-main/src/main/java/org/airsonic/player/domain/entity/ShareFile.java
View file

@ -19,14 +19,14 @@
*/
package org.airsonic.player.domain.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
@Entity
@Table(name = "share_file")

18
airsonic-main/src/main/java/org/airsonic/player/domain/entity/StarredAlbum.java
View file

@ -2,15 +2,15 @@ package org.airsonic.player.domain.entity;
import org.airsonic.player.domain.Album;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import java.time.Instant;

16
airsonic-main/src/main/java/org/airsonic/player/domain/entity/StarredArtist.java
View file

@ -20,14 +20,14 @@ package org.airsonic.player.domain.entity;
import org.airsonic.player.domain.Artist;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import java.time.Instant;

2
airsonic-main/src/main/java/org/airsonic/player/domain/entity/StarredMediaFile.java
View file

@ -2,7 +2,7 @@ package org.airsonic.player.domain.entity;
import org.airsonic.player.domain.MediaFile;
import javax.persistence.*;
import jakarta.persistence.*;
import java.time.Instant;

8
airsonic-main/src/main/java/org/airsonic/player/domain/entity/SystemAvatar.java
View file

@ -3,13 +3,7 @@ package org.airsonic.player.domain.entity;
import org.airsonic.player.domain.Avatar;
import org.airsonic.player.repository.PathConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.*;
import java.nio.file.Path;
import java.time.Instant;

14
airsonic-main/src/main/java/org/airsonic/player/domain/entity/UserRating.java
View file

@ -19,13 +19,13 @@
package org.airsonic.player.domain.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.Table;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.Table;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
@Entity
@Table(name = "user_rating")

6
airsonic-main/src/main/java/org/airsonic/player/domain/entity/UserSetting.java
View file

@ -21,11 +21,7 @@ package org.airsonic.player.domain.entity;
import org.airsonic.player.repository.UserSettingDetailConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.*;
@Entity
@Table(name = "user_settings")

4
airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java
View file

@ -24,8 +24,8 @@ import org.airsonic.player.config.AirsonicHomeConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.nio.file.Files;

4
airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java
View file

@ -3,8 +3,8 @@ package org.airsonic.player.filter;
import org.airsonic.player.monitor.MetricsManager;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;

Some files were not shown because too many files have changed in this diff Show more