mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to Java EE 10 for zxing.org (#1621)

Browse source 
* Update to Java EE 10 for zxing.org
* Just remove reactor convergence
This commit is contained in:
Sean Owen 2023-04-26 21:34:53 -05:00 committed by GitHub
parent 1d2379df34
commit a24f93093e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 83 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pom.xml
View file

@ -57,7 +57,7 @@
<module>core</module> <module>core</module>
<module>javase</module> <module>javase</module>
<!-- android modules are activated by a profile below --> <!-- android modules are activated by a profile below -->
<module>zxingorg</module> <!-- zxingorg activated by a profile below -->
<!-- appspot app activated by a profile below --> <!-- appspot app activated by a profile below -->
</modules> </modules>
@ -119,7 +119,6 @@
<id>enforce</id> <id>enforce</id>
<configuration> <configuration>
<rules> <rules>
<reactorModuleConvergence />
<requireUpperBoundDeps /> <requireUpperBoundDeps />
<dependencyConvergence /> <dependencyConvergence />
<requireMavenVersion> <requireMavenVersion>
@ -757,6 +756,15 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>zxingorg</id>
<activation>
<jdk>[17,)</jdk> <!-- Requires Java 17+ for Java EE 10+ -->
</activation>
<modules>
<module>zxingorg</module>
</modules>
</profile>
<profile> <profile>
<id>appspot</id> <id>appspot</id>
<activation> <activation>

14
zxingorg/pom.xml
View file

@ -31,9 +31,9 @@
<artifactId>javase</artifactId> <artifactId>javase</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax</groupId> <groupId>jakarta.platform</groupId>
<artifactId>javaee-web-api</artifactId> <artifactId>jakarta.jakartaee-web-api</artifactId>
<version>8.0.1</version> <version>10.0.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -58,12 +58,6 @@
<version>${spring.version}</version> <version>${spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<parent> <parent>
@ -73,7 +67,7 @@
</parent> </parent>
<properties> <properties>
<spring.version>5.3.24</spring.version> <spring.version>6.0.8</spring.version>
</properties> </properties>
<build> <build>

10
zxingorg/src/main/java/com/google/zxing/web/AbstractFilter.java
View file

@ -18,10 +18,10 @@ package com.google.zxing.web;
import com.google.common.net.HttpHeaders; import com.google.common.net.HttpHeaders;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import javax.servlet.FilterConfig; import jakarta.servlet.FilterConfig;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* Provides no-op default implementations for convenience of subclasses. * Provides no-op default implementations for convenience of subclasses.
@ -37,7 +37,7 @@ abstract class AbstractFilter implements Filter {
public final void destroy() { public final void destroy() {
// do nothing // do nothing
} }
static void redirect(ServletResponse servletResponse, String location) { static void redirect(ServletResponse servletResponse, String location) {
HttpServletResponse response = (HttpServletResponse) servletResponse; HttpServletResponse response = (HttpServletResponse) servletResponse;
response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);

4
zxingorg/src/main/java/com/google/zxing/web/ChartDoSFilter.java
View file

@ -16,8 +16,8 @@
package com.google.zxing.web; package com.google.zxing.web;
import javax.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import javax.servlet.annotation.WebInitParam; import jakarta.servlet.annotation.WebInitParam;
/** /**
* Protect the /chart endpoint from too many requests. * Protect the /chart endpoint from too many requests.

10
zxingorg/src/main/java/com/google/zxing/web/ChartServlet.java
View file

@ -27,11 +27,11 @@ import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.annotation.WebServlet; import jakarta.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;

4
zxingorg/src/main/java/com/google/zxing/web/DecodeDoSFilter.java
View file

@ -16,8 +16,8 @@
package com.google.zxing.web; package com.google.zxing.web;
import javax.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import javax.servlet.annotation.WebInitParam; import jakarta.servlet.annotation.WebInitParam;
/** /**
* Protect the /decode endpoint from too many requests. * Protect the /decode endpoint from too many requests.

22
zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
View file

@ -65,17 +65,17 @@ import java.util.logging.Logger;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.RequestDispatcher; import jakarta.servlet.RequestDispatcher;
import javax.servlet.ServletConfig; import jakarta.servlet.ServletConfig;
import javax.servlet.ServletContext; import jakarta.servlet.ServletContext;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.annotation.MultipartConfig; import jakarta.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebInitParam; import jakarta.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet; import jakarta.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.http.Part; import jakarta.servlet.http.Part;
/** /**
* {@link HttpServlet} which decodes images containing barcodes. Given a URL, it will * {@link HttpServlet} which decodes images containing barcodes. Given a URL, it will

16
zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java
View file

@ -18,14 +18,14 @@ package com.google.zxing.web;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.FilterConfig; import jakarta.servlet.FilterConfig;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Timer; import java.util.Timer;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

12
zxingorg/src/main/java/com/google/zxing/web/HTTPSFilter.java
View file

@ -16,12 +16,12 @@
package com.google.zxing.web; package com.google.zxing.web;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.util.regex.Pattern; import java.util.regex.Pattern;

6
zxingorg/src/main/java/com/google/zxing/web/ServletContextLogHandler.java
View file

@ -16,14 +16,14 @@
package com.google.zxing.web; package com.google.zxing.web;
import javax.servlet.ServletContext; import jakarta.servlet.ServletContext;
import java.util.logging.Formatter; import java.util.logging.Formatter;
import java.util.logging.Handler; import java.util.logging.Handler;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;
/** /**
* A {@link Handler} that redirects log messages to the servlet container log. * A {@link Handler} that redirects log messages to the servlet container log.
* *
* @author Sean Owen * @author Sean Owen
*/ */
final class ServletContextLogHandler extends Handler { final class ServletContextLogHandler extends Handler {
@ -61,4 +61,4 @@ final class ServletContextLogHandler extends Handler {
// do nothing // do nothing
} }
} }

18
zxingorg/src/main/java/com/google/zxing/web/TimeoutFilter.java
View file

@ -19,15 +19,15 @@ package com.google.zxing.web;
import com.google.common.util.concurrent.SimpleTimeLimiter; import com.google.common.util.concurrent.SimpleTimeLimiter;
import com.google.common.util.concurrent.TimeLimiter; import com.google.common.util.concurrent.TimeLimiter;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.FilterConfig; import jakarta.servlet.FilterConfig;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
import javax.servlet.annotation.WebInitParam; import jakarta.servlet.annotation.WebInitParam;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;

8
zxingorg/src/main/java/com/google/zxing/web/WelcomeFilter.java
View file

@ -16,10 +16,10 @@
package com.google.zxing.web; package com.google.zxing.web;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter; import jakarta.servlet.annotation.WebFilter;
/** /**
* Handles redirects to the app landing page. * Handles redirects to the app landing page.

2
zxingorg/src/test/java/com/google/zxing/web/ChartServletTestCase.java
View file

@ -23,7 +23,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* Tests {@link ChartServlet}. * Tests {@link ChartServlet}.

2
zxingorg/src/test/java/com/google/zxing/web/DecodeServletTestCase.java
View file

@ -25,7 +25,7 @@ import org.springframework.mock.web.MockServletConfig;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* Tests {@link DecodeServlet}. * Tests {@link DecodeServlet}.

6
zxingorg/src/test/java/com/google/zxing/web/DoSFilterTestCase.java
View file

@ -23,9 +23,9 @@ import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import javax.servlet.ServletException; import jakarta.servlet.ServletException;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;

2
zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java
View file

@ -24,7 +24,7 @@ import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* Tests {@link HTTPSFilter}. * Tests {@link HTTPSFilter}.

12
zxingorg/src/test/java/com/google/zxing/web/TimeoutFilterTestCase.java
View file

@ -23,12 +23,12 @@ import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.GenericServlet; import jakarta.servlet.GenericServlet;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* Tests {@link TimeoutFilter}. * Tests {@link TimeoutFilter}.

4
zxingorg/src/test/java/com/google/zxing/web/WelcomeFilterTestCase.java
View file

@ -23,8 +23,8 @@ import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import javax.servlet.FilterChain; import jakarta.servlet.FilterChain;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* Tests {@link WelcomeFilter}. * Tests {@link WelcomeFilter}.