Skip to content

Commit

Permalink
Merge pull request #375 from kagemomiji/issue250-update-view-technology
Browse files Browse the repository at this point in the history 
#250 update view technology
  • Loading branch information
@kagemomiji
kagemomiji authored Feb 20, 2024
2 parents f03ee90 + 8c3b78f commit 064fcd8
Show file tree
Hide file tree
Showing 1,238 changed files with 8,478 additions and 7,772 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,5 @@ local.properties

# Code Recommenders
.recommenders/

tmp-home/
142 changes: 69 additions & 73 deletions airsonic-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
<!-- For fixing import/export due to https://github.com/liquibase/liquibase/issues/1598 -->
<liquibase.version>4.22.0</liquibase.version>
<logback.version>1.2.13</logback.version>
<mockito.version>5.8.0</mockito.version>
<mariadb.version>3.3.2</mariadb.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -57,16 +59,26 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>2.3.6</version>
<scope>provided</scope>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -87,6 +99,20 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</exclusion>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
Expand Down Expand Up @@ -150,20 +176,6 @@
</dependency>
<!-- END Spring -->

<!-- taglibs -->
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.5</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>string</artifactId>
<version>1.1.0</version>
<scope>runtime</scope>
</dependency>
<!-- END taglibs -->

<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
Expand Down Expand Up @@ -219,6 +231,7 @@
<version>1.24.0</version>
</dependency>
<dependency>
<!-- compression library-->
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.9</version>
Expand Down Expand Up @@ -302,18 +315,14 @@
<version>1.2.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sargue</groupId>
<artifactId>java-time-jsptags</artifactId>
<version>1.1.4</version>
</dependency>

<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
</dependency>

<dependency>

<groupId>com.hoodcomputing</groupId>
<artifactId>natpmp</artifactId>
<version>0.1</version>
Expand All @@ -339,6 +348,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -354,6 +364,12 @@
<!-- Cling removed the org.fourthline.cling.transport.impl.apache package in 2.1, which is needed to make Cling work with Tomcat. -->
<!-- Don't upgrade this unless you can test UPnP/DLNA support properly! -->
<version>2.0.1</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -368,6 +384,20 @@
<groupId>org.seamless</groupId>
<artifactId>seamless-util</artifactId>
<version>1.1.0</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -428,6 +458,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Fixes liquibase not using slf4j -->
Expand All @@ -453,6 +487,12 @@
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>${liquibase.version}</version>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -462,6 +502,7 @@
</dependency>

<dependency>
<!-- playlist tooling-->
<groupId>com.github.muff1nman.chameleon</groupId>
<artifactId>core</artifactId>
<version>${chameleon.version}</version>
Expand Down Expand Up @@ -515,6 +556,10 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -528,17 +573,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- Embedded tomcat -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>${tomcat.server.scope}</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<scope>${tomcat.server.scope}</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId>
Expand Down Expand Up @@ -615,24 +649,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<language>jsp</language>
<rulesets>
<ruleset>/category/jsp/codestyle.xml</ruleset>
<ruleset>/category/jsp/errorprone.xml</ruleset>
</rulesets>
<includes>
<include>**/*.jsp</include>
<include>**/*.jspf</include>
</includes>
<compileSourceRoots>
<compileSourceRoot>${basedir}/src/main/webapp/WEB-INF/jsp</compileSourceRoot>
</compileSourceRoots>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down Expand Up @@ -669,6 +685,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand Down Expand Up @@ -721,27 +738,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jspc-maven-plugin</artifactId>
<version>9.4.41.v20210516</version>
<executions>
<execution>
<id>jspc</id>
<goals>
<goal>jspc</goal>
</goals>
<phase>compile</phase>
<configuration>
<!-- Since we are using spring boot - we do not have a web.xml so there is no sense
enabling merging. Furthermore, we output the webXmlFragment to the target/classes
directory such that it will be on the classpath for use during runtime -->
<mergeFragment>false</mergeFragment>
<webXmlFragment>${project.build.outputDirectory}/precompiled-jsp-web.xml</webXmlFragment>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<reporting>
Expand Down
4 changes: 3 additions & 1 deletion airsonic-main/src/main/java/org/airsonic/player/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
Expand All @@ -17,7 +18,8 @@
import java.lang.reflect.Method;

@SpringBootApplication(exclude = {
JmxAutoConfiguration.class
JmxAutoConfiguration.class,
JmxEndpointAutoConfiguration.class
})
@EnableTransactionManagement(mode = AdviceMode.ASPECTJ)
@ConfigurationPropertiesScan
Expand Down
68 changes: 68 additions & 0 deletions airsonic-main/src/main/java/org/airsonic/player/command/ChangeCoverArtCommand.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
This file is part of Airsonic.
Airsonic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Airsonic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Airsonic. If not, see <http://www.gnu.org/licenses/>.
Copyright 2024 (C) Y.Tory
Copyright 2016 (C) Airsonic Authors
Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
*/
package org.airsonic.player.command;

import javax.validation.constraints.NotNull;

/**
* Command used in ChangeCoverArtController.
*/
public class ChangeCoverArtCommand {

@NotNull
private Integer id;
private String artist;
private String album;

public ChangeCoverArtCommand() {
}

public ChangeCoverArtCommand(Integer id, String artist, String album) {
this.id = id;
this.artist = artist;
this.album = album;
}

public Integer getId() {
return id;
}

public String getArtist() {
return artist;
}

public String getAlbum() {
return album;
}

public void setId(int id) {
this.id = id;
}

public void setArtist(String artist) {
this.artist = artist;
}

public void setAlbum(String album) {
this.album = album;
}

}
Loading

0 comments on commit 064fcd8

Please sign in to comment.