mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-04-25 18:51:40 +00:00
Code Issues Releases Wiki Activity

Upgrade to Jakarta EE 10 Servlet (#2362)

Browse Source 
Upgrade to using Jakarta EE 10 from Java EE 8 by mostly following the upgrade instructions. Only the servlet package is upgrade. Other Jakarta EE components (like the persistence package that Hibernate depends on) need to be upgraded separately.

TESTED=deployed and successfully communicated with the pubapi endpoint for web WHOIS.

Note that this currently requires packaing the App Engine runtime per instructions here due to GoogleCloudPlatform/appengine-java-standard#98. This PR will only be merged until the fix is deployed to production (https://rapid.corp.google.com/#/release/serverless_runtimes_run_java/java21_20240310_21_0).
This commit is contained in:
Lai Jiang
2024-03-18 14:00:55 -04:00
committed by GitHub
parent ff211fb4f9
commit e7bf74d91d
200 changed files with 389 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/google/registry/batch/BatchModule.java
View File

@@ -32,8 +32,8 @@ import com.google.common.collect.ImmutableSet;
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
/** Dagger module for injecting common settings for batch actions. */

6
core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java
View File

@@ -20,10 +20,10 @@ import static google.registry.flows.FlowUtils.marshalWithLenientRetry;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.ResourceUtils.readResourceUtf8;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;

4
core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java
View File

@@ -20,8 +20,8 @@ import static google.registry.model.common.Cursor.CursorType.RECURRING_BILLING;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.request.RequestParameters.PARAM_DRY_RUN;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;

4
core/src/main/java/google/registry/batch/RelockDomainAction.java
View File

@@ -19,8 +19,8 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.request.Action.Method.POST;
import static google.registry.tools.LockOrUnlockDomainCommand.REGISTRY_LOCK_STATUSES;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableSet;
import com.google.common.flogger.FluentLogger;

4
core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java
View File

@@ -16,8 +16,8 @@ package google.registry.batch;
import static google.registry.batch.BatchModule.PARAM_FAST;
import static google.registry.beam.BeamUtils.createJobName;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;

4
core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java
View File

@@ -16,8 +16,8 @@ package google.registry.batch;
import static google.registry.beam.BeamUtils.createJobName;
import static google.registry.request.RequestParameters.PARAM_DRY_RUN;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;

2
core/src/main/java/google/registry/bsa/BlockListFetcher.java
View File

@@ -14,8 +14,8 @@
package google.registry.bsa;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.client.http.HttpMethods;
import com.google.common.collect.ImmutableMap;

2
core/src/main/java/google/registry/bsa/BsaDownloadAction.java
View File

@@ -23,7 +23,7 @@ import static google.registry.bsa.persistence.LabelDiffUpdates.applyLabelDiff;
import static google.registry.request.Action.Method.GET;
import static google.registry.request.Action.Method.POST;
import static google.registry.util.BatchedStreams.toBatches;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

2
core/src/main/java/google/registry/bsa/BsaRefreshAction.java
View File

@@ -18,7 +18,7 @@ import static com.google.common.base.Throwables.getStackTraceAsString;
import static google.registry.bsa.BsaStringUtils.LINE_SPLITTER;
import static google.registry.request.Action.Method.GET;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;

2
core/src/main/java/google/registry/bsa/api/BsaCredential.java
View File

@@ -15,8 +15,8 @@
package google.registry.bsa.api;
import static google.registry.request.UrlConnectionUtils.getResponseBytes;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.client.http.HttpMethods;
import com.google.common.annotations.VisibleForTesting;

4
core/src/main/java/google/registry/bsa/api/BsaReportSender.java
View File

@@ -14,9 +14,9 @@
package google.registry.bsa.api;
import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.client.http.HttpMethods;
import com.google.common.flogger.FluentLogger;

2
core/src/main/java/google/registry/cron/CronModule.java
View File

@@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableSet;
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
/** Dagger module for the cron package. */
@Module

2
core/src/main/java/google/registry/dns/DnsModule.java
View File

@@ -31,9 +31,9 @@ import google.registry.dns.DnsUtils.TargetType;
import google.registry.dns.writer.DnsWriterZone;
import google.registry.request.Parameter;
import google.registry.request.RequestParameters;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
/** Dagger module for the dns package. */

2
core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java
View File

@@ -30,7 +30,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
import static google.registry.request.Action.Method.POST;
import static google.registry.request.RequestParameters.PARAM_TLD;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;

2
core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java
View File

@@ -18,7 +18,7 @@ import static google.registry.dns.DnsUtils.requestDomainDnsRefresh;
import static google.registry.dns.RefreshDnsOnHostRenameAction.PATH;
import static google.registry.model.EppResourceUtils.getLinkedDomainKeys;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import com.google.common.net.MediaType;
import google.registry.model.EppResourceUtils;

1
core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/alpha/bsa/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

7
core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml vendored
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<!-- Servlets -->
<!-- Servlet for injected backends actions -->

7
core/src/main/java/google/registry/env/common/bsa/WEB-INF/web.xml vendored
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<!-- Servlets -->
<!-- Servlet for injected backends actions -->

9
core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml vendored
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<!-- Servlets -->
<!-- Servlet for injected frontend actions -->

9
core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml vendored
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<!-- Servlets -->
<!-- Servlet for injected frontend actions -->

9
core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml vendored
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
version="6.0">
<!-- Servlets -->
<!-- Servlet for injected tools actions -->

1
core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/crash/bsa/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/local/bsa/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/production/bsa/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml vendored
View File

@@ -11,7 +11,6 @@
</manual-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml vendored
View File

@@ -11,7 +11,6 @@
</manual-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/qa/bsa/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml vendored
View File

@@ -15,7 +15,6 @@
</automatic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/sandbox/bsa/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml vendored
View File

@@ -11,7 +11,6 @@
</manual-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml vendored
View File

@@ -11,7 +11,6 @@
</manual-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

1
core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml vendored
View File

@@ -12,7 +12,6 @@
</basic-scaling>
<system-properties>
<property name="appengine.use.EE8" value="true"/>
<property name="java.util.logging.config.file"
value="WEB-INF/logging.properties"/>
<property name="google.registry.environment"

4
core/src/main/java/google/registry/export/ExportPremiumTermsAction.java
View File

@@ -18,9 +18,9 @@ import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.isNullOrEmpty;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static google.registry.request.Action.Method.POST;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;

4
core/src/main/java/google/registry/export/ExportReservedTermsAction.java
View File

@@ -17,9 +17,9 @@ package google.registry.export;
import static com.google.common.base.Strings.isNullOrEmpty;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static google.registry.request.Action.Method.POST;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.flogger.FluentLogger;
import com.google.common.net.MediaType;

4
core/src/main/java/google/registry/export/SyncGroupMembersAction.java
View File

@@ -20,8 +20,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
import static google.registry.request.Action.Method.POST;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.RegistrarUtils.normalizeRegistrarId;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

2
core/src/main/java/google/registry/export/sheet/SheetModule.java
View File

@@ -19,8 +19,8 @@ import static com.google.common.base.Strings.emptyToNull;
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
/** Dagger module for the sheet package. */
@Module

8
core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
View File

@@ -16,10 +16,10 @@ package google.registry.export.sheet;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.flogger.FluentLogger;
import google.registry.config.RegistryConfig.Config;

2
core/src/main/java/google/registry/flows/CheckApiAction.java
View File

@@ -58,10 +58,10 @@ import google.registry.request.Parameter;
import google.registry.request.RequestParameters;
import google.registry.request.Response;
import google.registry.request.auth.Auth;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Map;
import java.util.Optional;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
/**

4
core/src/main/java/google/registry/flows/EppRequestHandler.java
View File

@@ -17,9 +17,9 @@ package google.registry.flows;
import static google.registry.flows.FlowUtils.marshalWithLenientRetry;
import static google.registry.model.eppoutput.Result.Code.SUCCESS_AND_CLOSE;
import static google.registry.xml.XmlTransformer.prettyPrint;
import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.flogger.FluentLogger;
import com.google.common.net.MediaType;

2
core/src/main/java/google/registry/flows/EppTlsAction.java
View File

@@ -18,8 +18,8 @@ import google.registry.request.Action;
import google.registry.request.Action.Method;
import google.registry.request.Payload;
import google.registry.request.auth.Auth;
import jakarta.servlet.http.HttpSession;
import javax.inject.Inject;
import javax.servlet.http.HttpSession;
/**
* Establishes a transport for EPP+TLS over HTTP. All commands and responses are EPP XML according

2
core/src/main/java/google/registry/flows/EppToolAction.java
View File

@@ -25,8 +25,8 @@ import google.registry.request.Action;
import google.registry.request.Action.Method;
import google.registry.request.Parameter;
import google.registry.request.auth.Auth;
import jakarta.servlet.http.HttpServletRequest;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
/** Runs EPP commands directly without logging in, verifying an XSRF token from the tool. */
@Action(

2
core/src/main/java/google/registry/flows/HttpSessionMetadata.java
View File

@@ -18,9 +18,9 @@ import static com.google.common.base.MoreObjects.toStringHelper;
import static google.registry.util.CollectionUtils.nullToEmpty;
import com.google.common.base.Joiner;
import jakarta.servlet.http.HttpSession;
import java.util.Optional;
import java.util.Set;
import javax.servlet.http.HttpSession;
/** A metadata class that is a wrapper around {@link HttpSession}. */
public class HttpSessionMetadata implements SessionMetadata {

2
core/src/main/java/google/registry/flows/TlsCredentials.java
View File

@@ -34,11 +34,11 @@ import google.registry.request.Header;
import google.registry.util.CidrAddressBlock;
import google.registry.util.ProxyHttpHeaders;
import google.registry.util.RegistryEnvironment;
import jakarta.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.security.MessageDigest;
import java.util.Optional;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
/**
* Container and validation for TLS certificate and IP-allow-listing.

4
core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java
View File

@@ -15,8 +15,8 @@
package google.registry.groups;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import com.google.api.client.googleapis.json.GoogleJsonError;
import com.google.api.client.googleapis.json.GoogleJsonResponseException;

2
core/src/main/java/google/registry/loadtest/LoadTestModule.java
View File

@@ -20,7 +20,7 @@ import static google.registry.request.RequestParameters.extractRequiredParameter
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.joda.time.Minutes;
/**

6
core/src/main/java/google/registry/module/ServletBase.java
View File

@@ -19,12 +19,12 @@ import com.google.monitoring.metrics.MetricReporter;
import dagger.Lazy;
import google.registry.request.RequestHandler;
import google.registry.util.SystemClock;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Security;
import java.util.concurrent.TimeoutException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.joda.time.DateTime;

6
core/src/main/java/google/registry/rdap/RdapActionBase.java
View File

@@ -19,9 +19,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.net.HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN;
import static google.registry.request.Actions.getPathForAction;
import static google.registry.util.DomainNameUtils.canonicalizeHostname;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.flogger.FluentLogger;
import com.google.common.net.MediaType;

2
core/src/main/java/google/registry/rdap/RdapModule.java
View File

@@ -23,8 +23,8 @@ import google.registry.request.RequestParameters;
import google.registry.request.auth.AuthResult;
import google.registry.request.auth.AuthenticatedRegistrarAccessor;
import google.registry.request.auth.UserAuthInfo;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
/** Dagger module for the RDAP package. */
@Module

2
core/src/main/java/google/registry/rde/RdeModule.java
View File

@@ -27,8 +27,8 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
/**

6
core/src/main/java/google/registry/rde/RdeStagingAction.java
View File

@@ -20,10 +20,10 @@ import static google.registry.request.Action.Method.GET;
import static google.registry.request.Action.Method.POST;
import static google.registry.xml.ValidationMode.LENIENT;
import static google.registry.xml.ValidationMode.STRICT;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.util.function.Function.identity;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;

2
core/src/main/java/google/registry/reporting/ReportingModule.java
View File

@@ -27,8 +27,8 @@ import google.registry.request.HttpException.BadRequestException;
import google.registry.request.Parameter;
import google.registry.util.Clock;
import google.registry.util.GoogleCredentialsBundle;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
import org.joda.time.YearMonth;

2
core/src/main/java/google/registry/reporting/billing/BillingModule.java
View File

@@ -21,10 +21,10 @@ import dagger.Module;
import dagger.Provides;
import google.registry.config.RegistryConfig.Config;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import javax.inject.Qualifier;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.YearMonth;
/** Module for dependencies required by monthly billing actions. */

4
core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java
View File

@@ -16,8 +16,8 @@ package google.registry.reporting.billing;
import static com.google.common.base.Throwables.getRootCause;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.cloud.storage.BlobId;
import com.google.common.base.Splitter;

4
core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java
View File

@@ -16,8 +16,8 @@ package google.registry.reporting.billing;
import static google.registry.beam.BeamUtils.createJobName;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;

8
core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java
View File

@@ -16,10 +16,10 @@ package google.registry.reporting.billing;
import static google.registry.reporting.ReportingModule.PARAM_YEAR_MONTH;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.Job;

2
core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java
View File

@@ -25,9 +25,9 @@ import dagger.Provides;
import google.registry.bigquery.BigqueryConnection;
import google.registry.request.HttpException.BadRequestException;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.inject.Named;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.Duration;
/** Module for dependencies required by ICANN monthly transactions/activity reporting. */

4
core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java
View File

@@ -18,8 +18,8 @@ import static com.google.common.base.Throwables.getRootCause;
import static google.registry.reporting.icann.IcannReportingModule.PARAM_REPORT_TYPES;
import static google.registry.reporting.icann.IcannReportingModule.PARAM_SUBDIR;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;

2
core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java
View File

@@ -17,7 +17,7 @@ package google.registry.reporting.icann;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.cloud.storage.BlobId;
import com.google.common.collect.ImmutableMap;

4
core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
View File

@@ -16,8 +16,8 @@ package google.registry.reporting.spec11;
import static google.registry.beam.BeamUtils.createJobName;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;

8
core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
View File

@@ -17,10 +17,10 @@ package google.registry.reporting.spec11;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static google.registry.reporting.ReportingModule.PARAM_DATE;
import static google.registry.request.Action.Method.POST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
import com.google.api.services.dataflow.Dataflow;
import com.google.api.services.dataflow.model.Job;

2
core/src/main/java/google/registry/request/FullServletPath.java
View File

@@ -22,7 +22,7 @@ import javax.inject.Qualifier;
/**
* Dagger qualifier for the HTTP servlet path, prepended with scheme, host and port.
*
* See {@link javax.servlet.http.HttpServletRequest#getServletPath}
* <p>See {@link jakarta.servlet.http.HttpServletRequest#getServletPath}
*/
@Qualifier
@Documented

2
core/src/main/java/google/registry/request/HttpException.java
View File

@@ -17,9 +17,9 @@ package google.registry.request;
import static com.google.common.html.HtmlEscapers.htmlEscaper;
import com.google.common.flogger.FluentLogger;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.logging.Level;
import javax.servlet.http.HttpServletResponse;
/** Base for exceptions that cause an HTTP error response. */
public abstract class HttpException extends RuntimeException {

12
core/src/main/java/google/registry/request/RequestHandler.java
View File

@@ -16,10 +16,10 @@ package google.registry.request;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import com.google.common.flogger.FluentLogger;
import google.registry.request.auth.AuthResult;
@@ -27,12 +27,12 @@ import google.registry.request.auth.RequestAuthenticator;
import google.registry.util.NonFinalForTesting;
import google.registry.util.SystemClock;
import google.registry.util.TypeUtils.TypeInstantiator;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Optional;
import javax.annotation.Nullable;
import javax.inject.Provider;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.joda.time.DateTime;
import org.joda.time.Duration;

2
core/src/main/java/google/registry/request/RequestMethod.java
View File

@@ -20,7 +20,7 @@ import javax.inject.Qualifier;
/**
* Dagger qualifier for the HTTP request method.
*
* @see javax.servlet.http.HttpServletRequest#getMethod()
* @see jakarta.servlet.http.HttpServletRequest#getMethod()
*/
@Qualifier
@Documented

6
core/src/main/java/google/registry/request/RequestModule.java
View File

@@ -43,12 +43,12 @@ import google.registry.request.auth.AuthResult;
import google.registry.request.lock.LockHandler;
import google.registry.request.lock.LockHandlerImpl;
import google.registry.tools.GsonUtils;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.util.Map;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.json.simple.JSONValue;
import org.json.simple.parser.ParseException;

2
core/src/main/java/google/registry/request/RequestParameters.java
View File

@@ -24,9 +24,9 @@ import com.google.common.base.Ascii;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableSet;
import google.registry.request.HttpException.BadRequestException;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
/** Utilities for extracting parameters from HTTP requests. */

2
core/src/main/java/google/registry/request/RequestPath.java
View File

@@ -20,7 +20,7 @@ import javax.inject.Qualifier;
/**
* Dagger qualifier for the HTTP request path.
*
* @see javax.servlet.http.HttpServletRequest#getRequestURI()
* @see jakarta.servlet.http.HttpServletRequest#getRequestURI()
*/
@Qualifier
@Documented

2
core/src/main/java/google/registry/request/RequestUrl.java
View File

@@ -23,7 +23,7 @@ import javax.inject.Qualifier;
/**
* Dagger qualifier for the HTTP request URL.
*
* @see javax.servlet.http.HttpServletRequest#getRequestURL()
* @see jakarta.servlet.http.HttpServletRequest#getRequestURL()
*/
@Retention(RUNTIME)
@Qualifier

4
core/src/main/java/google/registry/request/Response.java
View File

@@ -15,8 +15,8 @@
package google.registry.request;
import com.google.common.net.MediaType;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
import org.joda.time.DateTime;
/**

4
core/src/main/java/google/registry/request/ResponseImpl.java
View File

@@ -15,10 +15,10 @@
package google.registry.request;
import com.google.common.net.MediaType;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import javax.inject.Inject;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import org.joda.time.DateTime;
/** HTTP response object. */

2
core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java
View File

@@ -14,7 +14,7 @@
package google.registry.request.auth;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* A particular way to authenticate an HTTP request, returning an {@link AuthResult}.

2
core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java
View File

@@ -23,8 +23,8 @@ import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN;
import com.google.appengine.api.users.UserService;
import com.google.common.collect.ImmutableSet;
import google.registry.security.XsrfTokenManager;
import jakarta.servlet.http.HttpServletRequest;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
/**
* Authentication mechanism for legacy cookie-based App Engine authentication.

2
core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java
View File

@@ -27,10 +27,10 @@ import google.registry.request.auth.AuthModule.RegularOidc;
import google.registry.request.auth.AuthModule.RegularOidcFallback;
import google.registry.request.auth.AuthSettings.AuthLevel;
import google.registry.util.RegistryEnvironment;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
/**
* An authenticam mechanism that verifies the OIDC token.

2
core/src/main/java/google/registry/request/auth/RequestAuthenticator.java
View File

@@ -24,9 +24,9 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import com.google.common.flogger.FluentLogger;
import google.registry.request.auth.AuthSettings.AuthMethod;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
/** Top-level authentication/authorization class; calls authentication mechanisms as needed. */
public class RequestAuthenticator {

4
core/src/main/java/google/registry/security/JsonHttp.java
View File

@@ -22,13 +22,13 @@ import static org.json.simple.JSONValue.writeJSONString;
import com.google.common.flogger.FluentLogger;
import com.google.common.net.MediaType;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.Map;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONValue;
import org.json.simple.parser.ParseException;

2
core/src/main/java/google/registry/tmch/Marksdb.java
View File

@@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import static google.registry.request.UrlConnectionUtils.getResponseBytes;
import static google.registry.request.UrlConnectionUtils.setBasicAuth;
import static google.registry.util.HexDumper.dumpHex;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.collect.ImmutableList;
import com.google.common.flogger.FluentLogger;

2
core/src/main/java/google/registry/tmch/NordnUploadAction.java
View File

@@ -24,8 +24,8 @@ import static google.registry.tmch.LordnTaskUtils.COLUMNS_CLAIMS;
import static google.registry.tmch.LordnTaskUtils.COLUMNS_SUNRISE;
import static google.registry.tmch.LordnTaskUtils.getCsvLineForClaimsDomain;
import static google.registry.tmch.LordnTaskUtils.getCsvLineForSunriseDomain;
import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
import com.google.api.client.http.HttpMethods;
import com.google.cloud.tasks.v2.Task;

4
core/src/main/java/google/registry/tmch/NordnVerifyAction.java
View File

@@ -15,9 +15,9 @@
package google.registry.tmch;
import static google.registry.request.UrlConnectionUtils.getResponseBytes;
import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.flogger.FluentLogger;

2
core/src/main/java/google/registry/tmch/TmchModule.java
View File

@@ -23,9 +23,9 @@ import dagger.Provides;
import google.registry.keyring.api.KeyModule.Key;
import google.registry.request.HttpException.BadRequestException;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.net.MalformedURLException;
import java.net.URL;
import javax.servlet.http.HttpServletRequest;
import org.bouncycastle.openpgp.PGPPublicKey;
/** Dagger module for TMCH package. */

2
core/src/main/java/google/registry/tools/server/CreateGroupsAction.java
View File

@@ -16,8 +16,8 @@ package google.registry.tools.server;
import static google.registry.export.SyncGroupMembersAction.getGroupEmailAddressForContactType;
import static google.registry.request.Action.Method.POST;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.util.Arrays.asList;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import com.google.common.flogger.FluentLogger;
import google.registry.config.RegistryConfig.Config;

2
core/src/main/java/google/registry/tools/server/ToolsServerModule.java
View File

@@ -23,8 +23,8 @@ import static google.registry.request.RequestParameters.extractRequiredParameter
import dagger.Module;
import dagger.Provides;
import google.registry.request.Parameter;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
/**
* Dagger module for the tools package.

2
core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java
View File

@@ -20,9 +20,9 @@ import com.google.api.client.http.HttpStatusCodes;
import google.registry.model.console.User;
import google.registry.security.XsrfTokenManager;
import google.registry.ui.server.registrar.ConsoleApiParams;
import jakarta.servlet.http.Cookie;
import java.util.Arrays;
import java.util.Optional;
import javax.servlet.http.Cookie;
/** Base class for handling Console API requests */
public abstract class ConsoleApiAction implements Runnable {

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